diff -Nru midori-0.4.9/ChangeLog midori-0.5.0/ChangeLog --- midori-0.4.9/ChangeLog 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/ChangeLog 2013-04-04 20:31:20.000000000 +0000 @@ -1,5 +1,47 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.5.0: + Store --execute arguments in string array + Prevent overlay frame from being caught by show_all + Unconditionally show Toolbar Style preference + Duplicate current URI when reloading Midori.View + Update tabs being closable on setting change in Granite + Check default_search before setting SearchAction default + Populate application chooser button in idle + Bail out of completion resizing if cell height is 0 + Pass proxy to bookmark dialog when editing via menu + Tweak bookmark dialog, button to buttons, toggles side by side + Move 'Flash windows' option into History List + Use light window for Clear Private Data with Granite + Use GtkFontButton with filter func with GTK+ 3.2 + Implement 'Run in debugger' button in diagnostic dialog + Add Win32 work-around to History List for modifiers + Make toolbar drag/ drop work in GTK+3 + Check if active form element is input before getting search text + Implement direction-based mouse gesture configuration + Implement mouse movement, load-failed, crashed, search in WebKit2 + Add 'Show last crash log' button to diagnostic dialog + Make invalid actions fail; exit on error in new process only + Accept setting=value and extension=true/ false in --execute + Merged cookie permissions as of 2013-03-08 + Gray out webGL preference if context is unavailable + Use browser API to Close Other in view menu item + Fix periods to ellipsis in Custom/ Customize Shortcuts + Support Colorful Tabs in History List + Add Midori.Tab.fg/ bg_color and Midori.View.set_colors + Fix word-wrap, #decription and #message in about.css + Set view scroll policy to Never to avoid flickering + Use XDG_RUNTIME_DIR for temporary files + Build Vala and C parts of core separately + Don't provide default value for enable-scripts + Respect Open new pages: window for Web Search and Open Image + enable-javascript in WebKit1/ 2, macro for (Web)Settings + Fix MIDORI_*_VERSION to be integers + Fix .desktop file validation unit test and fix errors + 'New tab behavior' preference: about:dial/ new/ search/ home alias URLs + Use stripped down XBEL variant for session and trash + Allow any proxies supported by libproxy; list supported types in preferences + v0.4.9: Let non-Granite security window behave like a window Disable Contractor support in Granite for now diff -Nru midori-0.4.9/data/about.css midori-0.5.0/data/about.css --- midori-0.4.9/data/about.css 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/data/about.css 2013-04-04 20:31:20.000000000 +0000 @@ -61,10 +61,11 @@ padding: 2px 1px; } -message { +#message { font-size: 1.1em; + word-wrap: break-word; } -description { +#description { font-size: 1em; } diff -Nru midori-0.4.9/data/faq.html midori-0.5.0/data/faq.html --- midori-0.4.9/data/faq.html 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/data/faq.html 2013-04-04 20:31:20.000000000 +0000 @@ -5,7 +5,7 @@ midori:faq - + @@ -240,7 +240,7 @@

-Midori >= 0.4.7 supports http://git.gnome.org/browse/gcr/tree/gcr for certificate display and management, you can click the lock in the urlbar to see detailed information. Earlier versions, or one without gcr will not handle certificates beyond the lock icon in the urlbar. +Midori >= 0.4.7 supports gcr for certificate display and management, you can click the lock in the urlbar to see detailed information. Earlier versions, or one without gcr will not handle certificates beyond the lock icon in the urlbar.

@@ -299,9 +299,10 @@

-nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can't cresh the whole browser and Flash, which is GTK+2 can run in GTK+3. +nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can't crash the whole browser and Flash, which is GTK+2 can run in GTK+3.

-
sudo apt-get install nspluginwrapper
+
sudo apt-get install flashplugin-installer
+sudo apt-get install nspluginwrapper
 sudo nspluginwrapper -i /usr/lib/flashplugin-installer/libflashplayer.so
 nspluginwrapper -v -a -n -i
@@ -484,7 +485,7 @@
-

Open magnet:, irc:, apt: and friends with an application

+

Open magnet:, irc:, apt:, bitcoin: with an application

@@ -505,6 +506,10 @@ Note that incomplete .desktop files will silently fail and it will look as if it doesn't exist.

+

+For bitcoin:, try Electrum or Multibit. +

+

Spell check

@@ -579,12 +584,12 @@

- +

Privacy

- +

Blacklist cookies

@@ -610,7 +615,7 @@

- +

Adblock

@@ -619,12 +624,12 @@

- +

Modes

- +

Web Applications

@@ -645,7 +650,7 @@

- +

Private Browsing

@@ -671,7 +676,7 @@

- +

Portable mode/ Win32

@@ -680,7 +685,7 @@

- +

Kiosk mode

@@ -712,7 +717,7 @@

- +

Always open Midori in Fullscreen

@@ -745,7 +750,7 @@

- +

Proxy servers

@@ -829,7 +834,7 @@
- +

Keyboard Hotkeys

@@ -911,7 +916,7 @@

- +

Mouse Gestures

@@ -941,7 +946,7 @@

- +

User scripts and styles

@@ -1002,7 +1007,7 @@

- +

User styles

@@ -1064,6 +1069,6 @@ }
- + diff -Nru midori-0.4.9/data/midori-private.desktop.in midori-0.5.0/data/midori-private.desktop.in --- midori-0.4.9/data/midori-private.desktop.in 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/data/midori-private.desktop.in 2013-04-04 20:31:20.000000000 +0000 @@ -9,7 +9,7 @@ Icon=midori Terminal=false StartupNotify=true -NotShowIn=Pantheon +NotShowIn=Pantheon; X-Osso-Type=application/x-executable X-Osso-Service=midori diff -Nru midori-0.4.9/data/midori.desktop.in midori-0.5.0/data/midori.desktop.in --- midori-0.4.9/data/midori.desktop.in 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/data/midori.desktop.in 2013-04-04 20:31:20.000000000 +0000 @@ -15,20 +15,17 @@ StartupNotify=true X-Osso-Type=application/x-executable X-Osso-Service=midori -Actions=TabNew;WindowNew;Private +Actions=TabNew;WindowNew;Private; [Desktop Action TabNew] _Name=New Tab Exec=midori -e TabNew -TargetEnvironment=Unity [Desktop Action WindowNew] _Name=New Window Exec=midori -e WindowNew -TargetEnvironment=Unity [Desktop Action Private] _Name=New Private Browsing Window Exec=midori --private -TargetEnvironment=Unity diff -Nru midori-0.4.9/debian/changelog midori-0.5.0/debian/changelog --- midori-0.4.9/debian/changelog 2013-03-09 20:42:59.000000000 +0000 +++ midori-0.5.0/debian/changelog 2013-04-20 09:47:10.000000000 +0000 @@ -1,3 +1,9 @@ +midori (0.5.0-1~precise~ppa1) precise; urgency=low + + * New upstream release. + + -- cartes Sat, 20 Apr 2013 11:34:13 +0200 + midori (0.4.9-1~precise~ppa1) precise; urgency=low * New upstream release. diff -Nru midori-0.4.9/extensions/colorful-tabs.c midori-0.5.0/extensions/colorful-tabs.c --- midori-0.4.9/extensions/colorful-tabs.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/colorful-tabs.c 2013-04-04 20:31:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Christian Dywan + Copyright (C) 2009-2013 Christian Dywan Copyright (C) 2010 Samuel Creshal This library is free software; you can redistribute it and/or @@ -13,38 +13,16 @@ #include static void -colorful_tabs_modify_fg (GtkWidget* label, - GdkColor* color) -{ - GList* children = gtk_container_get_children (GTK_CONTAINER (label)); - for (; children != NULL; children = g_list_next (children)) - { - if (GTK_IS_LABEL (children->data)) - { - gtk_widget_modify_fg (children->data, GTK_STATE_ACTIVE, color); - gtk_widget_modify_fg (children->data, GTK_STATE_NORMAL, color); - /* Also modify the label itself, for Tab Panel */ - gtk_widget_modify_fg (label, GTK_STATE_NORMAL, color); - break; - } - } - g_list_free (children); -} - -static void colorful_tabs_view_notify_uri_cb (MidoriView* view, GParamSpec* pspec, MidoriExtension* extension) { - GtkWidget* label; gchar* hostname; gchar* colorstr; GdkColor color; GdkColor fgcolor; GdkPixbuf* icon; - label = midori_view_get_proxy_tab_label (view); - if (!midori_uri_is_blank (midori_view_get_display_uri (view)) && (hostname = midori_uri_parse_hostname (midori_view_get_display_uri (view), NULL)) && midori_view_get_icon_uri (view) != NULL) @@ -89,11 +67,6 @@ else gdk_color_parse ("#000", &fgcolor); - gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE); - - colorful_tabs_modify_fg (label, &fgcolor); - gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color); - if (color.red < 10000) color.red = 5000; else @@ -107,14 +80,10 @@ else color.green -= 5000; - gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, &color); + midori_view_set_colors (view, &fgcolor, &color); } else - { - gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); - colorful_tabs_modify_fg (label, NULL); - } + midori_view_set_colors (view, NULL, NULL); } static void @@ -150,11 +119,7 @@ children = midori_browser_get_tabs (MIDORI_BROWSER (browser)); for (; children; children = g_list_next (children)) { - GtkWidget* label = midori_view_get_proxy_tab_label (children->data); - gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), FALSE); - gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); - colorful_tabs_modify_fg (label, NULL); + midori_view_set_colors (children->data, NULL, NULL); g_signal_handlers_disconnect_by_func ( children->data, colorful_tabs_view_notify_uri_cb, extension); } diff -Nru midori-0.4.9/extensions/cookie-permissions/cookie-permission-manager-preferences-window.c midori-0.5.0/extensions/cookie-permissions/cookie-permission-manager-preferences-window.c --- midori-0.4.9/extensions/cookie-permissions/cookie-permission-manager-preferences-window.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/cookie-permissions/cookie-permission-manager-preferences-window.c 2013-04-04 20:31:20.000000000 +0000 @@ -189,7 +189,7 @@ checkAsciiDomain++; } - /* If we have not reached the trimmed end of string something must have gone wrong + /* If we have not reached the trimmed end of string something must have gone wrong * and domain entered is invalid. If domain name entered excluding dots is longer * than 255 character it is also invalid. */ @@ -282,21 +282,19 @@ { CookiePermissionManagerPreferencesWindowPrivate *priv=self->priv; CookiePermissionManager *manager=COOKIE_PERMISSION_MANAGER(inUserData); - sqlite3 *database; + const gchar *databaseFilename; /* Close connection to any open database */ if(priv->database) sqlite3_close(priv->database); priv->database=NULL; /* Get pointer to new database and open database */ - g_object_get(manager, "database", &database, NULL); - if(database) + g_object_get(manager, "database-filename", &databaseFilename, NULL); + if(databaseFilename) { - const gchar *databaseFile; gint success; - databaseFile=sqlite3_db_filename(database, NULL); - success=sqlite3_open(databaseFile, &priv->database); + success=sqlite3_open(databaseFilename, &priv->database); if(success!=SQLITE_OK) { g_warning(_("Could not open database of extenstion: %s"), sqlite3_errmsg(priv->database)); @@ -465,6 +463,27 @@ _cookie_permission_manager_preferences_window_fill(self); } +/* Sorting callbacks */ +static gint _cookie_permission_manager_preferences_sort_string_callback(GtkTreeModel *inModel, + GtkTreeIter *inLeft, + GtkTreeIter *inRight, + gpointer inUserData) +{ + gchar *left, *right; + gint column=GPOINTER_TO_INT(inUserData); + gint result; + + gtk_tree_model_get(inModel, inLeft, column, &left, -1); + gtk_tree_model_get(inModel, inRight, column, &right, -1); + + result=g_strcmp0(left, right); + + g_free(left); + g_free(right); + + return(result); +} + /* IMPLEMENTATION: GObject */ /* Finalize this object */ @@ -527,16 +546,18 @@ { priv->manager=g_object_ref(manager); - priv->signalManagerChangedDatabaseID=g_signal_connect_swapped(priv->manager, - "notify::database", - G_CALLBACK(_cookie_permission_manager_preferences_window_manager_database_changed), - self); - priv->signalManagerAskForUnknownPolicyID=g_signal_connect_swapped(priv->manager, - "notify::ask-for-unknown-policy", - G_CALLBACK(_cookie_permission_manager_preferences_window_manager_ask_for_unknown_policy_changed), - self); - + priv->signalManagerChangedDatabaseID= + g_signal_connect_swapped(priv->manager, + "notify::database-filename", + G_CALLBACK(_cookie_permission_manager_preferences_window_manager_database_changed), + self); _cookie_permission_manager_preferences_window_manager_database_changed(self, NULL, priv->manager); + + priv->signalManagerAskForUnknownPolicyID= + g_signal_connect_swapped(priv->manager, + "notify::ask-for-unknown-policy", + G_CALLBACK(_cookie_permission_manager_preferences_window_manager_ask_for_unknown_policy_changed), + self); _cookie_permission_manager_preferences_window_manager_ask_for_unknown_policy_changed(self, NULL, priv->manager); } break; @@ -598,6 +619,7 @@ static void cookie_permission_manager_preferences_window_init(CookiePermissionManagerPreferencesWindow *self) { CookiePermissionManagerPreferencesWindowPrivate *priv; + GtkTreeSortable *sortableList; GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkWidget *widget; @@ -654,6 +676,19 @@ G_TYPE_STRING, /* DOMAIN_COLUMN */ G_TYPE_STRING /* POLICY_COLUMN */); + sortableList=GTK_TREE_SORTABLE(priv->listStore); + gtk_tree_sortable_set_sort_func(sortableList, + DOMAIN_COLUMN, + (GtkTreeIterCompareFunc)_cookie_permission_manager_preferences_sort_string_callback, + GINT_TO_POINTER(DOMAIN_COLUMN), + NULL); + gtk_tree_sortable_set_sort_func(sortableList, + POLICY_COLUMN, + (GtkTreeIterCompareFunc)_cookie_permission_manager_preferences_sort_string_callback, + GINT_TO_POINTER(POLICY_COLUMN), + NULL); + gtk_tree_sortable_set_sort_column_id(sortableList, DOMAIN_COLUMN, GTK_SORT_ASCENDING); + /* Set up domain addition widgets */ #ifdef HAVE_GTK3 hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); @@ -706,6 +741,7 @@ renderer, "text", DOMAIN_COLUMN, NULL); + gtk_tree_view_column_set_sort_column_id(column, DOMAIN_COLUMN); gtk_tree_view_append_column(GTK_TREE_VIEW(priv->list), column); renderer=gtk_cell_renderer_text_new(); @@ -713,6 +749,7 @@ renderer, "text", POLICY_COLUMN, NULL); + gtk_tree_view_column_set_sort_column_id(column, POLICY_COLUMN); gtk_tree_view_append_column(GTK_TREE_VIEW(priv->list), column); scrolled=gtk_scrolled_window_new(NULL, NULL); diff -Nru midori-0.4.9/extensions/cookie-permissions/cookie-permission-manager.c midori-0.5.0/extensions/cookie-permissions/cookie-permission-manager.c --- midori-0.4.9/extensions/cookie-permissions/cookie-permission-manager.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/cookie-permissions/cookie-permission-manager.c 2013-04-04 20:31:20.000000000 +0000 @@ -13,6 +13,9 @@ #include +/* Remove next line if we found a way to show details in infobar */ +#define NO_INFOBAR_DETAILS + /* Define this class in GObject system */ G_DEFINE_TYPE(CookiePermissionManager, cookie_permission_manager, @@ -27,9 +30,9 @@ PROP_APPLICATION, PROP_DATABASE, + PROP_DATABASE_FILENAME, PROP_ASK_FOR_UNKNOWN_POLICY, - PROP_LAST }; @@ -45,12 +48,9 @@ MidoriExtension *extension; MidoriApp *application; sqlite3 *database; + gchar *databaseFilename; gboolean askForUnknownPolicy; - /* Session related */ - void(*oldRequestQueued)(SoupSessionFeature *inFeature, SoupSession *inSession, SoupMessage *inMessage); - void(*oldRequestUnqueued)(SoupSessionFeature *inFeature, SoupSession *inSession, SoupMessage *inMessage); - /* Cookie jar related */ SoupSession *session; SoupCookieJar *cookieJar; @@ -68,6 +68,14 @@ N_COLUMN }; +struct _CookiePermissionManagerModalInfobar +{ + GMainLoop *mainLoop; + gint response; +}; + +typedef struct _CookiePermissionManagerModalInfobar CookiePermissionManagerModalInfobar; + /* IMPLEMENTATION: Private variables and methods */ /* Show common error dialog */ @@ -105,7 +113,6 @@ { CookiePermissionManagerPrivate *priv=self->priv; const gchar *configDir; - gchar *databaseFile; gchar *error=NULL; gint success; sqlite3_stmt *statement=NULL; @@ -113,21 +120,21 @@ /* Close any open database */ if(priv->database) { + g_free(priv->databaseFilename); + priv->databaseFilename=NULL; + sqlite3_close(priv->database); priv->database=NULL; + g_object_notify_by_pspec(G_OBJECT(self), CookiePermissionManagerProperties[PROP_DATABASE]); + g_object_notify_by_pspec(G_OBJECT(self), CookiePermissionManagerProperties[PROP_DATABASE_FILENAME]); } /* Build path to database file */ configDir=midori_extension_get_config_dir(priv->extension); if(!configDir) - { - g_warning(_("Could not get path to configuration of extension: path is NULL")); - - _cookie_permission_manager_error(self, _("Could not get path to configuration of extension.")); return; - } - + if(katze_mkdir_with_parents(configDir, 0700)) { g_warning(_("Could not create configuration folder for extension: %s"), g_strerror(errno)); @@ -137,13 +144,15 @@ } /* Open database */ - databaseFile=g_build_filename(configDir, COOKIE_PERMISSION_DATABASE, NULL); - success=sqlite3_open(databaseFile, &priv->database); - g_free(databaseFile); + priv->databaseFilename=g_build_filename(configDir, COOKIE_PERMISSION_DATABASE, NULL); + success=sqlite3_open(priv->databaseFilename, &priv->database); if(success!=SQLITE_OK) { g_warning(_("Could not open database of extenstion: %s"), sqlite3_errmsg(priv->database)); + g_free(priv->databaseFilename); + priv->databaseFilename=NULL; + if(priv->database) sqlite3_close(priv->database); priv->database=NULL; @@ -188,6 +197,9 @@ sqlite3_free(error); } + g_free(priv->databaseFilename); + priv->databaseFilename=NULL; + sqlite3_close(priv->database); priv->database=NULL; return; @@ -237,6 +249,7 @@ sqlite3_finalize(statement); g_object_notify_by_pspec(G_OBJECT(self), CookiePermissionManagerProperties[PROP_DATABASE]); + g_object_notify_by_pspec(G_OBJECT(self), CookiePermissionManagerProperties[PROP_DATABASE_FILENAME]); } /* Get policy for cookies from domain */ @@ -361,6 +374,8 @@ return(sortedList); } +/* FIXME: Find a way to add "details" widget */ +#ifndef NO_INFOBAR_DETAILS static void _cookie_permission_manager_when_ask_expander_changed(CookiePermissionManager *self, GParamSpec *inSpec, gpointer inUserData) @@ -369,26 +384,84 @@ midori_extension_set_boolean(self->priv->extension, "show-details-when-ask", gtk_expander_get_expanded(expander)); } +#endif + +static gboolean _cookie_permission_manager_on_infobar_webview_navigate(WebKitWebView *inView, + WebKitWebFrame *inFrame, + WebKitNetworkRequest *inRequest, + WebKitWebNavigationAction *inAction, + WebKitWebPolicyDecision *inDecision, + gpointer inUserData) +{ + /* Destroy info bar - that calls another callback which quits main loop */ + GtkWidget *infobar=GTK_WIDGET(inUserData); + + gtk_widget_destroy(infobar); + + /* Let the default handler decide */ + return(FALSE); +} + +static void _cookie_permission_manager_on_infobar_destroy(GtkWidget* inInfobar, + gpointer inUserData) +{ + CookiePermissionManagerModalInfobar *modalInfo=(CookiePermissionManagerModalInfobar*)inUserData; + + /* Quit main loop */ + if(g_main_loop_is_running(modalInfo->mainLoop)) g_main_loop_quit(modalInfo->mainLoop); +} + +static void _cookie_permission_manager_on_infobar_policy_decision(GtkWidget* inInfobar, + gint inResponse, + gpointer inUserData) +{ + CookiePermissionManagerModalInfobar *modalInfo; + + /* Get modal info struct */ + modalInfo=(CookiePermissionManagerModalInfobar*)g_object_get_data(G_OBJECT(inInfobar), "cookie-permission-manager-infobar-data"); + + /* Store response */ + modalInfo->response=inResponse; + + /* Quit main loop */ + if(g_main_loop_is_running(modalInfo->mainLoop)) g_main_loop_quit(modalInfo->mainLoop); +} static gint _cookie_permission_manager_ask_for_policy(CookiePermissionManager *self, + MidoriView *inView, + SoupMessage *inMessage, GSList *inUnknownCookies) { - CookiePermissionManagerPrivate *priv=self->priv; - GtkWidget *dialog; - GtkWidget *widget; - GtkWidget *contentArea; - GtkWidget *vbox, *hbox; - GtkWidget *expander; - GtkListStore *listStore; - GtkTreeIter listIter; - GtkWidget *scrolled; - GtkWidget *list; - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - gchar *text; - gint numberDomains, numberCookies; - gint response; - GSList *sortedCookies, *cookies; + /* Ask user for policy of unkndown domains in an undistracting way. + * The idea is to put the message not in a modal window but into midori's info bar. + * Then we'll set up our own GMainLoop to simulate a modal info bar. We need to + * connect to all possible signals of info bar, web view and so on to handle user's + * decision and to get out of our own GMainLoop. After that webkit resumes processing + * data. + */ + CookiePermissionManagerPrivate *priv=self->priv; + GtkWidget *infobar; +/* FIXME: Find a way to add "details" widget */ +#ifndef NO_INFOBAR_DETAILS + GtkWidget *widget; + GtkWidget *contentArea; + GtkWidget *vbox, *hbox; + GtkWidget *expander; + GtkListStore *listStore; + GtkTreeIter listIter; + GtkWidget *scrolled; + GtkWidget *list; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; +#endif + gchar *text; + gint numberDomains, numberCookies; + GSList *sortedCookies, *cookies; + WebKitWebView *webkitView; + CookiePermissionManagerModalInfobar modalInfo; + + /* Get webkit view of midori view */ + webkitView=WEBKIT_WEB_VIEW(midori_view_get_web_view(inView)); /* Create a copy of cookies and sort them */ sortedCookies=_cookie_permission_manager_get_number_domains_and_cookies(self, @@ -396,6 +469,8 @@ &numberDomains, &numberCookies); +/* FIXME: Find a way to add "details" widget */ +#ifndef NO_INFOBAR_DETAILS /* Create list model and fill in data */ listStore=gtk_list_store_new(N_COLUMN, G_TYPE_STRING, /* DOMAIN_COLUMN */ @@ -409,7 +484,8 @@ SoupCookie *cookie=(SoupCookie*)cookies->data; SoupDate *cookieDate=soup_cookie_get_expires(cookie); - text=soup_date_to_string(cookieDate, SOUP_DATE_HTTP); + if(cookieDate) text=soup_date_to_string(cookieDate, SOUP_DATE_HTTP); + else text=g_strdup(_("Till session end")); gtk_list_store_append(listStore, &listIter); gtk_list_store_set(listStore, @@ -423,40 +499,15 @@ g_free(text); } - - /* Create dialog with text, icon, title and so on */ - dialog=gtk_dialog_new(); - - gtk_window_set_title(GTK_WINDOW(dialog), _("Confirm storing cookie")); - gtk_window_set_icon_name(GTK_WINDOW (dialog), "midori"); - - /* Get content area and layout widgets */ - contentArea=gtk_dialog_get_content_area(GTK_DIALOG(dialog)); - -#ifdef HAVE_GTK3 - vbox=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE); -#else - vbox=gtk_vbox_new(FALSE, 0); #endif /* Create description text */ -#ifdef HAVE_GTK3 - hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE); -#else - hbox=gtk_hbox_new(FALSE, 0); -#endif - - widget=gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 4); - if(numberDomains==1) { const gchar *cookieDomain=soup_cookie_get_domain((SoupCookie*)sortedCookies->data); if(*cookieDomain=='.') cookieDomain++; - + if(numberCookies>1) text=g_strdup_printf(_("The website %s wants to store %d cookies."), cookieDomain, numberCookies); else @@ -467,17 +518,33 @@ text=g_strdup_printf(_("Multiple websites want to store %d cookies in total."), numberCookies); } - widget=gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(widget), text); - gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 4); + /* Create info bar message and buttons */ + infobar=midori_view_add_info_bar(inView, + GTK_MESSAGE_QUESTION, + text, + G_CALLBACK(_cookie_permission_manager_on_infobar_policy_decision), + NULL, + _("_Accept"), COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT, + _("Accept for this _session"), COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT_FOR_SESSION, + _("De_ny"), COOKIE_PERMISSION_MANAGER_POLICY_BLOCK, + _("Deny _this time"), COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED, + NULL); g_free(text); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4); + /* midori_view_add_info_bar() in version 0.4.8 expects a GObject as user data + * but I don't want to create an GObject just for a simple struct. So set object + * data by our own + */ + g_object_set_data(G_OBJECT(infobar), "cookie-permission-manager-infobar-data", &modalInfo); - /* Create expander for details */ - expander=gtk_expander_new_with_mnemonic(_("_Details")); - gtk_box_pack_start(GTK_BOX(vbox), expander, TRUE, TRUE, 5); +/* FIXME: Find a way to add "details" widget */ +#ifndef NO_INFOBAR_DETAILS + /* Get content area of infobar */ +#if HAVE_GTK_INFO_BAR + contentArea=gtk_info_bar_get_content_area(GTK_INFO_BAR(infobar)); +#else + contentArea=infobar; +#endif /* Create list and set up columns of list */ list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(listStore)); @@ -540,25 +607,36 @@ gtk_expander_set_expanded(GTK_EXPANDER(expander), midori_extension_get_boolean(priv->extension, "show-details-when-ask")); g_signal_connect_swapped(expander, "notify::expanded", G_CALLBACK(_cookie_permission_manager_when_ask_expander_changed), self); +#endif + + /* Show all widgets of info bar */ + gtk_widget_show_all(infobar); + + /* Connect signals to quit main loop */ + g_signal_connect(webkitView, "navigation-policy-decision-requested", G_CALLBACK(_cookie_permission_manager_on_infobar_webview_navigate), infobar); + g_signal_connect(infobar, "destroy", G_CALLBACK(_cookie_permission_manager_on_infobar_destroy), &modalInfo); - /* Create buttons for dialog */ - widget=gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Accept"), COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT); - gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_stock(GTK_STOCK_APPLY, GTK_ICON_SIZE_BUTTON)); + /* Let info bar be modal and set response to default */ + modalInfo.response=COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED; + modalInfo.mainLoop=g_main_loop_new(NULL, FALSE); - gtk_dialog_add_button(GTK_DIALOG(dialog), _("Accept for this _session"), COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT_FOR_SESSION); + GDK_THREADS_LEAVE(); + g_main_loop_run(modalInfo.mainLoop); + GDK_THREADS_ENTER(); - widget=gtk_dialog_add_button(GTK_DIALOG(dialog), _("De_ny"), COOKIE_PERMISSION_MANAGER_POLICY_BLOCK); - gtk_button_set_image(GTK_BUTTON(widget), gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON)); + g_main_loop_unref(modalInfo.mainLoop); - /* Show confirmation dialog and wait for response of user */ - response=gtk_dialog_run(GTK_DIALOG(dialog)); + modalInfo.mainLoop=NULL; + + /* Disconnect signal handler to webkit's web view */ + g_signal_handlers_disconnect_by_func(webkitView, G_CALLBACK(_cookie_permission_manager_on_infobar_webview_navigate), infobar); /* Store user's decision in database if it is not a temporary block. * We use the already sorted list of cookies to prevent multiple * updates of database for the same domain. This sorted list is a copy * to avoid a reorder of cookies */ - if(response>=0) + if(modalInfo.response!=COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED) { const gchar *lastDomain=NULL; @@ -579,7 +657,7 @@ sql=sqlite3_mprintf("INSERT OR REPLACE INTO policies (domain, value) VALUES ('%q', %d);", cookieDomain, - response); + modalInfo.response); success=sqlite3_exec(priv->database, sql, NULL, NULL, &error); if(success!=SQLITE_OK) g_warning(_("SQL fails: %s"), error); if(error) sqlite3_free(error); @@ -592,10 +670,10 @@ /* Free up allocated resources */ g_slist_free(sortedCookies); - gtk_widget_destroy(dialog); - /* Return user's selection */ - return(response>=0 ? response : COOKIE_PERMISSION_MANAGER_POLICY_BLOCK); + /* Return response */ + return(modalInfo.response==COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED ? + COOKIE_PERMISSION_MANAGER_POLICY_BLOCK : modalInfo.response); } /* A cookie was changed outside a request (e.g. Javascript) */ @@ -604,9 +682,6 @@ SoupCookie *inNewCookie, SoupCookieJar *inCookieJar) { - GSList *newCookies; - gint newCookiePolicy; - /* Do not check changed cookies because they must have been allowed before. * Also do not check removed cookies because they are removed ;) */ @@ -615,33 +690,30 @@ /* New cookie is a new cookie so check */ switch(_cookie_permission_manager_get_policy(self, inNewCookie)) { - case COOKIE_PERMISSION_MANAGER_POLICY_BLOCK: - soup_cookie_jar_delete_cookie(inCookieJar, inNewCookie); + case COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT: + case COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT_FOR_SESSION: break; case COOKIE_PERMISSION_MANAGER_POLICY_UNDETERMINED: - newCookies=g_slist_prepend(NULL, inNewCookie); - newCookiePolicy=_cookie_permission_manager_ask_for_policy(self, newCookies); - if(newCookiePolicy==COOKIE_PERMISSION_MANAGER_POLICY_BLOCK) - { - /* Free cookie because it should be blocked */ - soup_cookie_jar_delete_cookie(inCookieJar, inNewCookie); - } - else - { - /* Cookie was accept so do nothing (it is already added) */ - } - g_slist_free(newCookies); - break; + /* Fallthrough! + * The problem here is that we don't know the view to ask user + * for policy to follow for this cookie domain. Therefore we + * delete the cookie from jar and assume that we will be asked + * again in _cookie_permission_manager_on_response_received(). + */ - case COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT: - case COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT_FOR_SESSION: + default: + soup_cookie_jar_delete_cookie(inCookieJar, inNewCookie); break; } } /* We received the HTTP headers of the request and it contains cookie-managing headers */ -static void _cookie_permission_manager_process_set_cookie_header(SoupMessage *inMessage, gpointer inUserData) +static void _cookie_permission_manager_on_response_received(WebKitWebView *inView, + WebKitWebFrame *inFrame, + WebKitWebResource *inResource, + WebKitNetworkResponse *inResponse, + gpointer inUserData) { g_return_if_fail(IS_COOKIE_PERMISSION_MANAGER(inUserData)); @@ -652,18 +724,23 @@ SoupURI *firstParty; SoupCookieJarAcceptPolicy cookiePolicy; gint unknownCookiesPolicy; + SoupMessage *message; /* If policy is to deny all cookies return immediately */ cookiePolicy=soup_cookie_jar_get_accept_policy(priv->cookieJar); if(cookiePolicy==SOUP_COOKIE_JAR_ACCEPT_NEVER) return; + /* Get SoupMessage */ + message=webkit_network_response_get_message(inResponse); + if(!message || !SOUP_IS_MESSAGE(message)) return; + /* Iterate through cookies in response and check if they should be * blocked (remove from cookies list) or accepted (added to cookie jar). * If we could not determine what to do collect these cookies and * ask user */ - newCookies=soup_cookies_from_response(inMessage); - firstParty=soup_message_get_first_party(inMessage); + newCookies=soup_cookies_from_response(message); + firstParty=soup_message_get_first_party(message); for(cookie=newCookies; cookie; cookie=cookie->next) { switch(_cookie_permission_manager_get_policy(self, cookie->data)) @@ -712,7 +789,13 @@ */ if(g_slist_length(unknownCookies)>0) { - unknownCookiesPolicy=_cookie_permission_manager_ask_for_policy(self, unknownCookies); + /* Get view */ + MidoriView *view; + + view=MIDORI_VIEW(g_object_get_data(G_OBJECT(inView), "midori-view")); + + /* Ask for user's decision */ + unknownCookiesPolicy=_cookie_permission_manager_ask_for_policy(self, view, message, unknownCookies); if(unknownCookiesPolicy==COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT || unknownCookiesPolicy==COOKIE_PERMISSION_MANAGER_POLICY_ACCEPT_FOR_SESSION) { @@ -744,33 +827,51 @@ g_slist_free(newCookies); } -/* A request was started and is in queue now */ -static void _cookie_permission_manager_request_queued(SoupSessionFeature *inFeature, SoupSession *inSession, SoupMessage *inMessage) +/* A tab to a browser was added */ +static void _cookie_permission_manager_on_add_tab(CookiePermissionManager *self, MidoriView *inView, gpointer inUserData) { - /* Get class instance */ - CookiePermissionManager *manager=g_object_get_data(G_OBJECT(inFeature), "cookie-permission-manager"); + /* Listen to starting network requests */ + WebKitWebView *webkitView=WEBKIT_WEB_VIEW(midori_view_get_web_view(inView)); - /* Listen to "got-headers" signals and register handlers for - * checking cookie-managing headers in HTTP stream - */ - soup_message_add_header_handler(inMessage, - "got-headers", - "Set-Cookie", - G_CALLBACK(_cookie_permission_manager_process_set_cookie_header), - manager); - - soup_message_add_header_handler(inMessage, - "got-headers", - "Set-Cookie2", - G_CALLBACK(_cookie_permission_manager_process_set_cookie_header), - manager); + g_object_set_data(G_OBJECT(webkitView), "midori-view", inView); + g_signal_connect(webkitView, "resource-response-received", G_CALLBACK(_cookie_permission_manager_on_response_received), self); } -/* Request has loaded and was unqueued */ -static void _cookie_permission_manager_request_unqueued(SoupSessionFeature *inFeature, SoupSession *inSession, SoupMessage *inMessage) +/* A browser window was added */ +static void _cookie_permission_manager_on_add_browser(CookiePermissionManager *self, + MidoriBrowser *inBrowser, + gpointer inUserData) { - /* Stop listening to HTTP stream */ - g_signal_handlers_disconnect_by_func(inMessage, _cookie_permission_manager_process_set_cookie_header, inFeature); + GList *tabs, *iter; + + /* Set up all current available tabs in browser */ + tabs=midori_browser_get_tabs(inBrowser); + for(iter=tabs; iter; iter=g_list_next(iter)) + { + _cookie_permission_manager_on_add_tab(self, iter->data, inBrowser); + } + g_list_free(tabs); + + /* Listen to new tabs opened in browser and existing ones closed */ + g_signal_connect_swapped(inBrowser, "add-tab", G_CALLBACK(_cookie_permission_manager_on_add_tab), self); +} + +/* Application property has changed */ +static void _cookie_permission_manager_on_application_changed(CookiePermissionManager *self) +{ + CookiePermissionManagerPrivate *priv=COOKIE_PERMISSION_MANAGER(self)->priv; + GList *browsers, *iter; + + /* Set up all current open browser windows */ + browsers=midori_app_get_browsers(priv->application); + for(iter=browsers; iter; iter=g_list_next(iter)) + { + _cookie_permission_manager_on_add_browser(self, MIDORI_BROWSER(iter->data), priv->application); + } + g_list_free(browsers); + + /* Listen to new browser windows opened and existing ones closed */ + g_signal_connect_swapped(priv->application, "add-browser", G_CALLBACK(_cookie_permission_manager_on_add_browser), self); } /* IMPLEMENTATION: GObject */ @@ -778,9 +879,20 @@ /* Finalize this object */ static void cookie_permission_manager_finalize(GObject *inObject) { - CookiePermissionManagerPrivate *priv=COOKIE_PERMISSION_MANAGER(inObject)->priv; + CookiePermissionManager *self=COOKIE_PERMISSION_MANAGER(inObject); + CookiePermissionManagerPrivate *priv=self->priv; + GList *browsers, *browser; + GList *tabs, *tab; + WebKitWebView *webkitView; /* Dispose allocated resources */ + if(priv->databaseFilename) + { + g_free(priv->databaseFilename); + priv->databaseFilename=NULL; + g_object_notify_by_pspec(inObject, CookiePermissionManagerProperties[PROP_DATABASE_FILENAME]); + } + if(priv->database) { sqlite3_close(priv->database); @@ -789,11 +901,24 @@ } g_signal_handler_disconnect(priv->cookieJar, priv->cookieJarChangedID); + g_object_steal_data(G_OBJECT(priv->cookieJar), "cookie-permission-manager"); - priv->featureIface->request_queued=priv->oldRequestQueued; - priv->featureIface->request_unqueued=priv->oldRequestUnqueued; + g_signal_handlers_disconnect_by_data(priv->application, self); - g_object_steal_data(G_OBJECT(priv->cookieJar), "cookie-permission-manager"); + browsers=midori_app_get_browsers(priv->application); + for(browser=browsers; browser; browser=g_list_next(browser)) + { + g_signal_handlers_disconnect_by_data(browser->data, self); + + tabs=midori_browser_get_tabs(MIDORI_BROWSER(browser->data)); + for(tab=tabs; tab; tab=g_list_next(tab)) + { + webkitView=WEBKIT_WEB_VIEW(midori_view_get_web_view(MIDORI_VIEW(tab->data))); + g_signal_handlers_disconnect_by_data(webkitView, self); + } + g_list_free(tabs); + } + g_list_free(browsers); /* Call parent's class finalize method */ G_OBJECT_CLASS(cookie_permission_manager_parent_class)->finalize(inObject); @@ -806,7 +931,7 @@ GParamSpec *inSpec) { CookiePermissionManager *self=COOKIE_PERMISSION_MANAGER(inObject); - + switch(inPropID) { /* Construct-only properties */ @@ -817,6 +942,7 @@ case PROP_APPLICATION: self->priv->application=g_value_get_object(inValue); + _cookie_permission_manager_on_application_changed(self); break; case PROP_ASK_FOR_UNKNOWN_POLICY: @@ -850,6 +976,10 @@ g_value_set_pointer(outValue, self->priv->database); break; + case PROP_DATABASE_FILENAME: + g_value_set_string(outValue, self->priv->databaseFilename); + break; + case PROP_ASK_FOR_UNKNOWN_POLICY: g_value_set_boolean(outValue, self->priv->askForUnknownPolicy); break; @@ -896,6 +1026,13 @@ _("Pointer to sqlite database instance used by this extension"), G_PARAM_READABLE); + CookiePermissionManagerProperties[PROP_DATABASE_FILENAME]= + g_param_spec_string("database-filename", + _("Database path"), + _("Path to sqlite database instance used by this extension"), + NULL, + G_PARAM_READABLE); + CookiePermissionManagerProperties[PROP_ASK_FOR_UNKNOWN_POLICY]= g_param_spec_boolean("ask-for-unknown-policy", _("Ask for unknown policy"), @@ -918,6 +1055,7 @@ /* Set up default values */ priv->database=NULL; + priv->databaseFilename=NULL; priv->askForUnknownPolicy=TRUE; /* Hijack session's cookie jar to handle cookies requests on our own in HTTP streams @@ -928,12 +1066,6 @@ priv->featureIface=SOUP_SESSION_FEATURE_GET_CLASS(priv->cookieJar); g_object_set_data(G_OBJECT(priv->cookieJar), "cookie-permission-manager", self); - priv->oldRequestQueued=priv->featureIface->request_queued; - priv->oldRequestUnqueued=priv->featureIface->request_unqueued; - - priv->featureIface->request_queued=_cookie_permission_manager_request_queued; - priv->featureIface->request_unqueued=_cookie_permission_manager_request_unqueued; - /* Listen to changed cookies set or changed by other sources like javascript */ priv->cookieJarChangedID=g_signal_connect_swapped(priv->cookieJar, "changed", G_CALLBACK(_cookie_permission_manager_on_cookie_changed), self); } diff -Nru midori-0.4.9/extensions/feed-panel/feed-panel.c midori-0.5.0/extensions/feed-panel/feed-panel.c --- midori-0.4.9/extensions/feed-panel/feed-panel.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/feed-panel/feed-panel.c 2013-04-04 20:31:20.000000000 +0000 @@ -376,15 +376,15 @@ text = g_strdup_printf ( "feed" "

%s

%s", - parent->uri, last_updated); + katze_item_get_uri (KATZE_ITEM (parent)), last_updated); g_free (pretty); g_free (last_updated); } else { text = g_strdup_printf ( - "feed" - "

%s

", parent->uri); + "feed" + "

%s

", katze_item_get_uri (KATZE_ITEM (parent))); } } webkit_web_view_load_html_string ( diff -Nru midori-0.4.9/extensions/history-list.vala midori-0.5.0/extensions/history-list.vala --- midori-0.4.9/extensions/history-list.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/history-list.vala 2013-04-04 20:31:20.000000000 +0000 @@ -18,6 +18,8 @@ enum TabTreeCells { TREE_CELL_PIXBUF, TREE_CELL_STRING, + TREE_CELL_FG, + TREE_CELL_BG, TREE_CELL_POINTER, TREE_CELL_COUNT } @@ -83,6 +85,8 @@ store.append (out iter); store.set (iter, TabTreeCells.TREE_CELL_PIXBUF, icon, TabTreeCells.TREE_CELL_STRING, title, + TabTreeCells.TREE_CELL_FG, view.fg_color, + TabTreeCells.TREE_CELL_BG, view.bg_color, TabTreeCells.TREE_CELL_POINTER, view); } } @@ -109,7 +113,8 @@ this.hbox.pack_start (sw, true, true, 0); var store = new Gtk.ListStore (TabTreeCells.TREE_CELL_COUNT, - typeof (Gdk.Pixbuf), typeof (string), typeof (void*)); + typeof (Gdk.Pixbuf), typeof (string), + typeof (Gdk.Color), typeof (Gdk.Color), typeof (void*)); this.insert_rows (store); @@ -123,10 +128,13 @@ this.treeview.insert_column_with_attributes ( -1, "Icon", - new CellRendererPixbuf (), "pixbuf", TabTreeCells.TREE_CELL_PIXBUF); + new CellRendererPixbuf (), "pixbuf", TabTreeCells.TREE_CELL_PIXBUF, + "cell-background-gdk", TabTreeCells.TREE_CELL_BG); this.treeview.insert_column_with_attributes ( -1, "Title", - new CellRendererText (), "text", TabTreeCells.TREE_CELL_STRING); + new CellRendererText (), "text", TabTreeCells.TREE_CELL_STRING, + "foreground-gdk", TabTreeCells.TREE_CELL_FG, + "cell-background-gdk", TabTreeCells.TREE_CELL_BG); Requisition requisition; int height; @@ -304,6 +312,12 @@ table.attach_defaults (this.closing_behavior, 1, 2, 0, 1); +#if !HAVE_WIN32 + var proxy = Katze.property_proxy (this.hl_manager.get_app ().settings, "flash-window-on-new-bg-tabs", null); + (proxy as Gtk.Button).label = _("Flash window on background tabs"); + table.attach_defaults (proxy, 0, 2, 1, 2); +#endif + #if HAVE_GTK3 (get_content_area() as Gtk.Box).pack_start (table, false, true, 0); #else @@ -331,15 +345,27 @@ this.closing_behavior = this.get_integer ("TabClosingBehavior"); } + public bool is_key_a_modifier (Gdk.EventKey event_key) { +#if HAVE_WIN32 + /* On win is_modifier check does not seem to work */ + if (event_key.keyval == Gdk.keyval_from_name("Control_L")) + return true; +#else + if (event_key.is_modifier > 0) + return true; +#endif + return false; + } + public bool key_press (Gdk.EventKey event_key) { - if (event_key.is_modifier > 0) { + if (is_key_a_modifier (event_key)) { this.modifier_count++; } return false; } public bool key_release (Gdk.EventKey event_key, Browser browser) { - if (event_key.is_modifier > 0) { + if (is_key_a_modifier (event_key)) { this.modifier_count--; } if (this.modifier_count == 0 || event_key.keyval == this.escKeyval) { diff -Nru midori-0.4.9/extensions/mouse-gestures.c midori-0.5.0/extensions/mouse-gestures.c --- midori-0.4.9/extensions/mouse-gestures.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/mouse-gestures.c 2013-04-04 20:31:20.000000000 +0000 @@ -11,49 +11,207 @@ */ #include +#include typedef struct _MouseGesture MouseGesture; typedef enum _MouseButton MouseButton; -enum _MouseButton { +enum _MouseButton +{ MOUSE_BUTTON_LEFT = 1, MOUSE_BUTTON_RIGHT = 3, MOUSE_BUTTON_MIDDLE = 2, MOUSE_BUTTON_UNSET = 0 }; -struct MouseGestureNode { +/* equivalent to the angle measured anticlockwise from east, divided by 45 or pi/4 */ +typedef enum +{ + STROKE_EAST = 0, + STROKE_NORTHEAST, + STROKE_NORTH, + STROKE_NORTHWEST, + STROKE_WEST, + STROKE_SOUTHWEST, + STROKE_SOUTH, + STROKE_SOUTHEAST, + STROKE_NONE, +} MouseGestureDirection; + +static const gchar* direction_names[]= +{ + "E", + "NE", + "N", + "NW", + "W", + "SW", + "S", + "SE", + "NONE", +}; + +#define N_DIRECTIONS 8 + +#define DEVIANCE (15 * M_PI / 180) +#define MINLENGTH 30 + +char** config_actions = NULL; +MouseGestureDirection** config_gestures = NULL; + +const char* default_actions[]= +{ + "TabClose", + "Reload", + "TabNew", + "Stop", + "Forward", + "Back", + NULL +}; + +const MouseGestureDirection default_gesture_strokes[] = +{ + STROKE_SOUTH, STROKE_EAST, STROKE_NONE, + STROKE_SOUTH, STROKE_WEST, STROKE_NONE, + STROKE_SOUTH, STROKE_NONE, + STROKE_NORTH, STROKE_NONE, + STROKE_EAST, STROKE_NONE, + STROKE_WEST, STROKE_NONE, + STROKE_NONE, +}; + +const MouseGestureDirection* default_gestures[] = +{ + &default_gesture_strokes[0], + &default_gesture_strokes[3], + &default_gesture_strokes[6], + &default_gesture_strokes[8], + &default_gesture_strokes[10], + &default_gesture_strokes[12], + &default_gesture_strokes[14], +}; + +static gboolean +parse_direction (const char* str, MouseGestureDirection* dir) +{ + int i; + for (i = 0; i < N_DIRECTIONS; i++) + { + if(!strcmp(str, direction_names[i])) + { + *dir = i; + return TRUE; + } + } + return FALSE; +} + +static gboolean +strokes_equal (const MouseGestureDirection* a, const MouseGestureDirection* b) +{ + int i; + for (i = 0; a[i] != STROKE_NONE && b[i] != STROKE_NONE; i++) + { + if(a[i] != b[i]) + return FALSE; + } + return a[i] == b[i]; +} + +struct MouseGestureNode +{ double x; double y; }; -struct _MouseGesture { +static guint +dist_sqr (guint x1, guint y1, guint x2, guint y2) +{ + guint xdiff = abs(x1 - x2); + guint ydiff = abs(y1 - y2); + return xdiff * xdiff + ydiff * ydiff; +} + +static float +get_angle_for_direction (MouseGestureDirection direction) +{ + return direction * 2 * M_PI / N_DIRECTIONS; +} + +static MouseGestureDirection +nearest_direction_for_angle (float angle) +{ + /* move halfway to the next direction so we can floor to round */ + angle += M_PI / N_DIRECTIONS; + + /* ensure we stay within [0, 2pi) */ + if (angle >= 2 * M_PI) + angle -= 2 * M_PI; + + return (MouseGestureDirection)((angle * N_DIRECTIONS) / (2* M_PI)); +} + +static gboolean +vector_follows_direction (float angle, float distance, MouseGestureDirection direction) +{ + if (direction == STROKE_NONE) + return distance < MINLENGTH / 2; + + float dir_angle = get_angle_for_direction (direction); + if (fabsf(angle - dir_angle) < DEVIANCE || fabsf(angle - dir_angle + 2 * M_PI) < DEVIANCE) + return TRUE; + + if(distance < MINLENGTH / 2) + return TRUE; + + return FALSE; +} + +/* returns the angle in the range [0, 2pi) (anticlockwise from east) from point 1 to 2 */ +static float +get_angle_between_points (guint x1, guint y1, guint x2, guint y2) +{ + float distance = sqrtf (dist_sqr (x1, y1, x2, y2)); + + /* compute the angle of the vector from a to b */ + float cval=((signed int)x2 - (signed int)x1) / distance; + float angle = acosf (cval); + if(y2 > y1) + angle = 2 * M_PI - angle; + + return angle; +} + +#define N_NODES 8 + +struct _MouseGesture +{ MouseButton button; - struct MouseGestureNode start; - struct MouseGestureNode middle; - struct MouseGestureNode end; + MouseGestureDirection strokes[N_NODES + 1]; + struct MouseGestureNode locations[N_NODES]; + struct MouseGestureNode last_pos; + float last_distance; + /* the index of the location to be filled next */ + guint count; MouseButton last; }; -#define DEVIANCE 20 -#define MINLENGTH 50 - MouseGesture *gesture = NULL; -void mouse_gesture_clear (MouseGesture *g) +static void +mouse_gesture_clear (MouseGesture *g) { - g->start.x = 0; - g->start.y = 0; - g->middle.x = 0; - g->middle.y = 0; - g->end.x = 0; - g->end.y = 0; + memset(g->locations, 0, sizeof(g->locations)); + g->strokes[0] = STROKE_NONE; + g->count = 0; + g->last_distance = 0; g->last = MOUSE_BUTTON_UNSET; } MouseGesture* mouse_gesture_new (void) { - MouseGesture* g = g_new (MouseGesture, 1); + MouseGesture* g = g_slice_new (MouseGesture); mouse_gesture_clear (g); return g; @@ -68,10 +226,11 @@ { /* If the gesture was previously cleaned, start a new gesture and coordinates. */ - if (gesture->last == MOUSE_BUTTON_UNSET) + if (gesture->count == MOUSE_BUTTON_UNSET) { - gesture->start.x = event->button.x; - gesture->start.y = event->button.y; + gesture->locations[gesture->count].x = event->button.x; + gesture->locations[gesture->count].y = event->button.y; + gesture->last_pos = gesture->locations[gesture->count]; gesture->last = event->button.button; } return TRUE; @@ -85,27 +244,58 @@ GdkEvent* event, MidoriBrowser* browser) { + /* wait until a button has been pressed */ if (gesture->last != MOUSE_BUTTON_UNSET) { - guint x, y; + guint x, y, oldx, oldy; + float angle, distance; + MouseGestureDirection old_direction, new_direction; x = event->motion.x; y = event->motion.y; + oldx = gesture->locations[gesture->count].x; + oldy = gesture->locations[gesture->count].y; + + old_direction = gesture->strokes[gesture->count]; - if ((gesture->start.x - x < DEVIANCE && gesture->start.x - x > -DEVIANCE) || - (gesture->start.y - y < DEVIANCE && gesture->start.y - y > -DEVIANCE)) + angle = get_angle_between_points (oldx, oldy, x, y); + distance = sqrtf (dist_sqr (oldx, oldy, x, y)); + + /* wait until minimum distance has been reached to set an initial direction. */ + if (old_direction == STROKE_NONE) { - gesture->middle.x = x; - gesture->middle.y = y; - return TRUE; + if (distance >= MINLENGTH) + { + gesture->strokes[gesture->count] = nearest_direction_for_angle (angle); + if(midori_debug ("adblock:match")) + g_debug ("detected %s\n", direction_names[gesture->strokes[gesture->count]]); + } } - else if ((gesture->middle.x - x < DEVIANCE && gesture->middle.x - x > -DEVIANCE) || - (gesture->middle.y - y < DEVIANCE && gesture->middle.y - y > -DEVIANCE)) + else if (!vector_follows_direction (angle, distance, old_direction) + || distance < gesture->last_distance) { - gesture->end.x = x; - gesture->end.y = y; - return TRUE; + /* if path curves or we've reversed our movement, try to detect a new direction */ + angle = get_angle_between_points (gesture->last_pos.x, gesture->last_pos.y, x, y); + new_direction = nearest_direction_for_angle (angle); + + if (new_direction != old_direction && gesture->count + 1 < N_NODES) + { + /* record this node and return to an indeterminate direction */ + gesture->count++; + gesture->strokes[gesture->count] = STROKE_NONE; + gesture->locations[gesture->count].x = x; + gesture->locations[gesture->count].y = y; + gesture->last_distance = 0; + } } + else if(distance > gesture->last_distance) + { + /* if following the same direction, store the progress along it for later divergence checks */ + gesture->last_pos.x = x; + gesture->last_pos.y = y; + gesture->last_distance = distance; + } + return TRUE; } return FALSE; @@ -125,69 +315,31 @@ GdkEventButton* event, MidoriView* view) { - /* All mouse gestures will use this mouse button */ - if (gesture->last == gesture->button) + int i; + + if (gesture->strokes[gesture->count] != STROKE_NONE) { - /* The initial horizontal move is between the bounds */ - if ((gesture->middle.x - gesture->start.x < DEVIANCE) && - (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 - we moved right more than MINLENGTH pixels */ - if ((gesture->middle.y - gesture->end.y < DEVIANCE) && - (gesture->middle.y - gesture->end.y > -DEVIANCE) && - (gesture->end.x > gesture->middle.x + MINLENGTH)) - /* We moved down then right: close the tab */ - return mouse_gestures_activate_action (view, "TabClose"); - /* Then we the final vertical move is between the bounds and - we moved left more than MINLENGTH pixels */ - else if ((gesture->middle.y - gesture->end.y < DEVIANCE) && - (gesture->middle.y - gesture->end.y > -DEVIANCE) && - (gesture->end.x + MINLENGTH < gesture->middle.x)) - /* We moved down then left: reload */ - return mouse_gestures_activate_action (view, "Reload"); - /* The end node was never updated, we only did a vertical move */ - else if(gesture->end.y == 0 && gesture->end.x == 0) - /* We moved down then: create a new tab */ - return mouse_gestures_activate_action (view, "TabNew"); - } - /* We initially moved up more than MINLENGTH pixels */ - 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) - /* We moved up: stop */ - return mouse_gestures_activate_action (view, "Stop"); - } - } - /* The initial horizontal move is between the bounds */ - else if ((gesture->middle.y - gesture->start.y < DEVIANCE) && - (gesture->middle.y - gesture->start.y > -DEVIANCE)) + gesture->count++; + gesture->strokes[gesture->count] = STROKE_NONE; + } + + const MouseGestureDirection** gestures = config_gestures ? + (const MouseGestureDirection**)config_gestures : + default_gestures; + const gchar** actions = config_actions ? (const char**)config_actions : default_actions; + + for(i = 0; gestures[i][0] != STROKE_NONE; i++) + { + if(strokes_equal (gesture->strokes, gestures[i])) { - /* We initially moved right more than MINLENGTH pixels */ - if (gesture->middle.x > gesture->start.x + MINLENGTH) - { - /* The end node was never updated, we only did an horizontal move */ - if (gesture->end.x == 0 && gesture->end.y == 0) - /* We moved right: forward */ - return mouse_gestures_activate_action (view, "Forward"); - } - /* 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) - /* We moved left: back */ - return mouse_gestures_activate_action (view, "Back"); - } + mouse_gesture_clear (gesture); + return mouse_gestures_activate_action (view, actions[i]); } - mouse_gesture_clear (gesture); } - if (MIDORI_EVENT_CONTEXT_MENU (event)) + mouse_gesture_clear (gesture); + + if (MIDORI_EVENT_CONTEXT_MENU (event) && 0) { GtkWidget* menu = gtk_menu_new (); midori_view_populate_popup (view, menu, TRUE); @@ -200,6 +352,62 @@ } static void +mouse_gestures_load_config (MidoriExtension* extension) +{ + int i; + gchar* config_file; + gsize n_keys; + gchar** keys; + GKeyFile* keyfile; + + config_file = g_build_filename (midori_extension_get_config_dir (extension), + "gestures", NULL); + keyfile = g_key_file_new (); + g_key_file_load_from_file (keyfile, config_file, G_KEY_FILE_NONE, NULL); + g_free (config_file); + + if (!keyfile) + return; + + keys = g_key_file_get_keys (keyfile, "gestures", &n_keys, NULL); + if (!keys) + return; + + if(config_gestures) + { + g_strfreev ((gchar**)config_gestures); + g_strfreev (config_actions); + } + config_gestures = g_malloc ((n_keys + 1) * sizeof (MouseGestureDirection*)); + config_actions = g_malloc (n_keys * sizeof (gchar*)); + + for(i = 0; keys[i]; i++) + { + gsize n_strokes; + int j; + gchar** stroke_strings = g_key_file_get_string_list (keyfile, "gestures", keys[i], &n_strokes, + NULL); + + config_gestures[i] = g_malloc ((n_strokes + 1) * sizeof (MouseGestureDirection)); + + for (j = 0; j < n_strokes; j++) + { + if (!parse_direction (stroke_strings[j], &config_gestures[i][j])) + g_warning ("mouse-gestures: failed to parse direction \"%s\"\n", stroke_strings[j]); + } + config_gestures[i][j] = STROKE_NONE; + + config_actions[i] = keys[i]; + g_strfreev (stroke_strings); + } + config_gestures[i] = g_malloc (sizeof (MouseGestureDirection)); + config_gestures[i][0] = STROKE_NONE; + + g_free (keys); + g_key_file_free (keyfile); +} + +static void mouse_gestures_add_tab_cb (MidoriBrowser* browser, MidoriView* view, MidoriExtension* extension) @@ -268,7 +476,14 @@ for (; tabs; tabs = g_list_next (tabs)) mouse_gestures_deactivate_tabs (tabs->data, browser); g_list_free (tabs); - g_free (gesture); + g_slice_free (MouseGesture, gesture); + if(config_gestures) + { + g_strfreev ((gchar**)config_gestures); + config_gestures = NULL; + g_strfreev (config_actions); + config_actions = NULL; + } } static void @@ -280,6 +495,7 @@ gesture = mouse_gesture_new (); gesture->button = midori_extension_get_integer (extension, "button"); + mouse_gestures_load_config (extension); browsers = katze_object_get_object (app, "browsers"); KATZE_ARRAY_FOREACH_ITEM (browser, browsers) @@ -296,9 +512,10 @@ MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Mouse Gestures"), "description", _("Control Midori by moving the mouse"), - "version", "0.1" MIDORI_VERSION_SUFFIX, + "version", "0.2" MIDORI_VERSION_SUFFIX, "authors", "Matthias Kruk ", NULL); midori_extension_install_integer (extension, "button", MOUSE_BUTTON_RIGHT); + midori_extension_install_integer (extension, "actions", MOUSE_BUTTON_RIGHT); g_signal_connect (extension, "activate", G_CALLBACK (mouse_gestures_activate_cb), NULL); diff -Nru midori-0.4.9/extensions/nsplugin-manager.vala midori-0.5.0/extensions/nsplugin-manager.vala --- midori-0.4.9/extensions/nsplugin-manager.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/nsplugin-manager.vala 2013-04-04 20:31:20.000000000 +0000 @@ -57,6 +57,9 @@ public Katze.Array? extension_init () { #if HAVE_WEBKIT_1_3_8 + if (!Midori.WebSettings.has_plugin_support ()) + return null; + var extensions = new Katze.Array( typeof (Midori.Extension)); WebKit.WebPluginDatabase pdb = WebKit.get_web_plugin_database (); SList plugins = pdb.get_plugins (); diff -Nru midori-0.4.9/extensions/shortcuts.c midori-0.5.0/extensions/shortcuts.c --- midori-0.4.9/extensions/shortcuts.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/shortcuts.c 2013-04-04 20:31:20.000000000 +0000 @@ -272,7 +272,7 @@ { GtkWidget* menuitem; - menuitem = gtk_menu_item_new_with_mnemonic (_("Customize Sh_ortcuts...")); + menuitem = gtk_menu_item_new_with_mnemonic (_("Customize Sh_ortcuts…")); g_signal_connect (menuitem, "activate", G_CALLBACK (shortcuts_menu_configure_shortcuts_activate_cb), extension); gtk_widget_show (menuitem); diff -Nru midori-0.4.9/extensions/statusbar-features.c midori-0.5.0/extensions/statusbar-features.c --- midori-0.4.9/extensions/statusbar-features.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/statusbar-features.c 2013-04-04 20:31:20.000000000 +0000 @@ -116,7 +116,7 @@ GtkWidget* button; GtkWidget* image; if (!strcmp (property, "auto-load-images") - || !strcmp (property, "enable-scripts") + || !strcmp (property, "enable-javascript") || !strcmp (property, "enable-plugins")) kind = "toggle"; else if (!strcmp (property, "identify-as")) @@ -157,7 +157,7 @@ g_signal_connect (toolbar, "notify::toolbar-style", G_CALLBACK (statusbar_features_toolbar_notify_toolbar_style_cb), button); } - if (!strcmp (property, "enable-scripts")) + if (!strcmp (property, "enable-javascript")) { g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts")); image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU); @@ -218,7 +218,7 @@ { button = statusbar_features_property_proxy (settings, "auto-load-images", toolbar); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); - button = statusbar_features_property_proxy (settings, "enable-scripts", toolbar); + button = statusbar_features_property_proxy (settings, "enable-javascript", toolbar); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); button = statusbar_features_property_proxy (settings, "enable-plugins", toolbar); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); diff -Nru midori-0.4.9/extensions/tab-panel.c midori-0.5.0/extensions/tab-panel.c --- midori-0.4.9/extensions/tab-panel.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/tab-panel.c 2013-04-04 20:31:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2009 Christian Dywan + Copyright (C) 2008-2013 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -354,13 +354,14 @@ { GtkTreeModel* model = tab_panel_get_model_for_browser (browser); GtkTreeIter iter; - GtkWidget* label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); - GtkStyle* style = gtk_widget_get_style (label); + GdkColor* fg = midori_tab_get_fg_color (MIDORI_TAB (view)); + GdkColor* bg = midori_tab_get_bg_color (MIDORI_TAB (view)); + if (tab_panel_get_iter_for_view (model, &iter, view)) gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 3, icon, - 6, &style->bg[GTK_STATE_NORMAL], - 7, &style->fg[GTK_STATE_NORMAL], + 6, bg, + 7, fg, -1); } } @@ -383,11 +384,15 @@ { GtkTreeModel* model = tab_panel_get_model_for_browser (browser); GtkTreeIter iter; + GdkColor* fg = midori_tab_get_fg_color (MIDORI_TAB (view)); + GdkColor* bg = midori_tab_get_bg_color (MIDORI_TAB (view)); if (tab_panel_get_iter_for_view (model, &iter, view)) { gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 4, title, 5, midori_view_get_label_ellipsize (MIDORI_VIEW (view)), + 6, bg, + 7, fg, -1); } } @@ -449,10 +454,12 @@ GtkTreeIter iter; gboolean buttons = katze_object_get_boolean (settings, "close-buttons-on-tabs"); gint ellipsize = midori_view_get_label_ellipsize (MIDORI_VIEW (view)); + GdkColor* fg = midori_tab_get_fg_color (MIDORI_TAB (view)); + GdkColor* bg = midori_tab_get_bg_color (MIDORI_TAB (view)); gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter, NULL, page, 0, view, 1, GTK_STOCK_CLOSE, 2, buttons, - 3, icon, 4, title, 5, ellipsize, 6, NULL, 7, NULL, -1); + 3, icon, 4, title, 5, ellipsize, 6, bg, 7, fg, -1); } if (!g_signal_handler_find (view, G_SIGNAL_MATCH_FUNC, diff -Nru midori-0.4.9/extensions/toolbar-editor.c midori-0.5.0/extensions/toolbar-editor.c --- midori-0.4.9/extensions/toolbar-editor.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/toolbar-editor.c 2013-04-04 20:31:20.000000000 +0000 @@ -276,16 +276,15 @@ gint x, gint y, GtkSelectionData *data, guint info, guint ltime, TBEditorWidget *tbw) { -#if !GTK_CHECK_VERSION(3,0,0) /* TODO */ GtkTreeView *tree = GTK_TREE_VIEW(widget); gboolean del = FALSE; - if (data->length >= 0 && data->format == 8) + if (gtk_selection_data_get_length (data) >= 0 && gtk_selection_data_get_format (data) == 8) { gboolean is_sep; gchar *text = NULL; - text = (gchar*) data->data; + text = (gchar*) gtk_selection_data_get_data (data); /* We allow re-ordering the Location item but not removing it from the list. */ if (g_strcmp0(text, "Location") == 0 && widget != tbw->drag_source) @@ -334,7 +333,6 @@ tbw->drag_source = NULL; /* reset the value just to be sure */ tb_editor_free_path(tbw); gtk_drag_finish(context, TRUE, del, ltime); -#endif } diff -Nru midori-0.4.9/extensions/wscript_build midori-0.5.0/extensions/wscript_build --- midori-0.4.9/extensions/wscript_build 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/extensions/wscript_build 2013-04-04 20:31:20.000000000 +0000 @@ -31,10 +31,6 @@ if bld.env['HAVE_WEBKIT2'] and target not in ['tab-panel', 'statusbar-features', 'shortcuts', 'status-clock', 'tab-minimized', 'toolbar-editor']: continue - # Don't install unstable extensions - if Options.commands['install'] and target in ['cookie-permissions']: - continue - obj = bld.new_task_gen ('cc', 'shlib') obj.target = target obj.includes = '.. ../katze ../midori' diff -Nru midori-0.4.9/katze/katze-separatoraction.c midori-0.5.0/katze/katze-separatoraction.c --- midori-0.4.9/katze/katze-separatoraction.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/katze-separatoraction.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -/* - 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 "katze-separatoraction.h" - -struct _KatzeSeparatorAction -{ - GtkAction parent_instance; -}; - -struct _KatzeSeparatorActionClass -{ - GtkActionClass parent_class; -}; - -G_DEFINE_TYPE (KatzeSeparatorAction, katze_separator_action, GTK_TYPE_ACTION); - -static void -katze_separator_action_finalize (GObject* object); - -static void -katze_separator_action_activate (GtkAction* object); - -static GtkWidget* -katze_separator_action_create_tool_item (GtkAction* action); - -static GtkWidget* -katze_separator_action_create_menu_item (GtkAction* action); - -static void -katze_separator_action_connect_proxy (GtkAction* action, - GtkWidget* proxy); - -static void -katze_separator_action_disconnect_proxy (GtkAction* action, - GtkWidget* proxy); - -static void -katze_separator_action_class_init (KatzeSeparatorActionClass* class) -{ - GObjectClass* gobject_class; - GtkActionClass* action_class; - - gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = katze_separator_action_finalize; - - action_class = GTK_ACTION_CLASS (class); - action_class->activate = katze_separator_action_activate; - action_class->create_menu_item = katze_separator_action_create_menu_item; - action_class->create_tool_item = katze_separator_action_create_tool_item; - action_class->connect_proxy = katze_separator_action_connect_proxy; - action_class->disconnect_proxy = katze_separator_action_disconnect_proxy; -} - -static void -katze_separator_action_init (KatzeSeparatorAction* separator_action) -{ - /* Nothing to do. */ -} - -static void -katze_separator_action_finalize (GObject* object) -{ - G_OBJECT_CLASS (katze_separator_action_parent_class)->finalize (object); -} - -static void -katze_separator_action_activate (GtkAction* action) -{ - GSList* proxies; - - proxies = gtk_action_get_proxies (action); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - - } - while ((proxies = g_slist_next (proxies))); - - if (GTK_ACTION_CLASS (katze_separator_action_parent_class)->activate) - GTK_ACTION_CLASS (katze_separator_action_parent_class)->activate (action); -} - -static GtkWidget* -katze_separator_action_create_menu_item (GtkAction* action) -{ - GtkWidget* menuitem; - - menuitem = gtk_separator_menu_item_new (); - return menuitem; -} - -static GtkWidget* -katze_separator_action_create_tool_item (GtkAction* action) -{ - GtkWidget* toolitem; - - toolitem = GTK_WIDGET (gtk_separator_tool_item_new ()); - return toolitem; -} - -static void -katze_separator_action_connect_proxy (GtkAction* action, - GtkWidget* proxy) -{ - GTK_ACTION_CLASS (katze_separator_action_parent_class)->connect_proxy ( - action, proxy); - - if (GTK_IS_TOOL_ITEM (proxy)) - { - } - else if (GTK_IS_MENU_ITEM (proxy)) - { - } -} - -static void -katze_separator_action_disconnect_proxy (GtkAction* action, - GtkWidget* proxy) -{ - GTK_ACTION_CLASS (katze_separator_action_parent_class)->disconnect_proxy - (action, proxy); -} diff -Nru midori-0.4.9/katze/katze-separatoraction.h midori-0.5.0/katze/katze-separatoraction.h --- midori-0.4.9/katze/katze-separatoraction.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/katze-separatoraction.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - 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 __KATZE_SEPARATOR_ACTION_H__ -#define __KATZE_SEPARATOR_ACTION_H__ - -#include - -G_BEGIN_DECLS - -#define KATZE_TYPE_SEPARATOR_ACTION \ - (katze_separator_action_get_type ()) -#define KATZE_SEPARATOR_ACTION(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_SEPARATOR_ACTION, \ - KatzeSeparatorAction)) -#define KATZE_SEPARATOR_ACTION_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_SEPARATOR_ACTION, \ - KatzeSeparatorActionClass)) -#define KATZE_IS_SEPARATOR_ACTION(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_SEPARATOR_ACTION)) -#define KATZE_IS_SEPARATOR_ACTION_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_SEPARATOR_ACTION)) -#define KATZE_SEPARATOR_ACTION_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_SEPARATOR_ACTION, \ - KatzeSeparatorActionClass)) - -typedef struct _KatzeSeparatorAction KatzeSeparatorAction; -typedef struct _KatzeSeparatorActionClass KatzeSeparatorActionClass; - -GType -katze_separator_action_get_type (void) G_GNUC_CONST; - -G_END_DECLS - -#endif /* __KATZE_SEPARATOR_ACTION_H__ */ diff -Nru midori-0.4.9/katze/katze-separatoraction.vala midori-0.5.0/katze/katze-separatoraction.vala --- midori-0.4.9/katze/katze-separatoraction.vala 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.5.0/katze/katze-separatoraction.vala 2013-04-04 20:31:20.000000000 +0000 @@ -0,0 +1,28 @@ +/* + Copyright (C) 2009-2013 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +namespace Katze { + public class SeparatorAction : Gtk.Action { + Gtk.MenuItem? menuitem = null; + Gtk.ToolItem? toolitem = null; + + public override unowned Gtk.Widget create_menu_item () { + menuitem = new Gtk.SeparatorMenuItem (); + return menuitem; + } + + public override unowned Gtk.Widget create_tool_item () { + toolitem = new Gtk.SeparatorToolItem (); + return toolitem; + } + } +} + diff -Nru midori-0.4.9/katze/katze-throbber.c midori-0.5.0/katze/katze-throbber.c --- midori-0.4.9/katze/katze-throbber.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/katze-throbber.c 2013-04-04 20:31:20.000000000 +0000 @@ -229,7 +229,7 @@ flags)); g_object_class_install_property (gobject_class, - PROP_PIXBUF, + PROP_STATIC_PIXBUF, g_param_spec_object ( "static-pixbuf", "Static Pixbuf", diff -Nru midori-0.4.9/katze/katze-utils.c midori-0.5.0/katze/katze-utils.c --- midori-0.4.9/katze/katze-utils.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/katze-utils.c 2013-04-04 20:31:20.000000000 +0000 @@ -70,6 +70,24 @@ g_object_set (object, property, file, NULL); } +#if GTK_CHECK_VERSION (3, 2, 0) +static void +proxy_font_chooser_font_activated_cb (GtkFontChooser* chooser, + const gchar* font_name, + GObject* object) +{ + gtk_font_chooser_set_font (chooser, font_name); +} + +static gboolean +proxy_font_chooser_filter_monospace_cb (PangoFontFamily* family, + PangoFontFace* face, + gpointer data) +{ + gboolean monospace = GPOINTER_TO_INT (data); + return monospace == pango_font_family_is_monospace (family); +} +#else static void proxy_combo_box_text_changed_cb (GtkComboBoxText* button, GObject* object) @@ -79,6 +97,7 @@ g_object_set (object, property, text, NULL); g_free (text); } +#endif static const gchar* katze_app_info_get_commandline (GAppInfo* info) @@ -316,10 +335,11 @@ GList* all_apps = g_app_info_get_all (); #endif GList* apps = NULL; - guint i = 0; GAppInfo* info; - while ((info = g_list_nth_data (all_apps, i++))) + GList* app; + for (app = apps; app; app = g_list_next (app)) { + GAppInfo* info = app->data; #ifdef GDK_WINDOWING_X11 gchar* filename = g_strconcat ("applications/", g_app_info_get_id (info), NULL); GKeyFile* file = g_key_file_new (); @@ -343,6 +363,92 @@ return apps; } +static gboolean +proxy_populate_apps (GtkWidget* widget) +{ + const gchar* property = g_object_get_data (G_OBJECT (widget), "property"); + GObject* object = g_object_get_data (G_OBJECT (widget), "object"); + gchar* string = katze_object_get_string (object, property); + if (!g_strcmp0 (string, "")) + katze_assign (string, NULL); + GtkSettings* settings = gtk_widget_get_settings (widget); + gint icon_width = 16; + if (settings == NULL) + settings = gtk_settings_get_for_screen (gdk_screen_get_default ()); + gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, + &icon_width, NULL); + + GtkComboBox* combo = GTK_COMBO_BOX (widget); + GtkListStore* model = GTK_LIST_STORE (gtk_combo_box_get_model (combo)); + GtkTreeIter iter_none; + gtk_list_store_insert_with_values (model, &iter_none, 0, + 0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1); + + const gchar* app_type = g_object_get_data (G_OBJECT (widget), "app-type"); + GList* apps = g_app_info_get_all_for_type (app_type); + GAppInfo* info; + if (!apps) + apps = katze_app_info_get_all_for_category (app_type); + if (apps != NULL) + { + GList* app; + for (app = apps; app; app = g_list_next (app)) + { + GAppInfo* info = app->data; + const gchar* name = g_app_info_get_name (info); + GIcon* icon = g_app_info_get_icon (info); + gchar* icon_name; + GtkTreeIter iter; + + if (!g_app_info_should_show (info)) + continue; + + icon_name = icon ? g_icon_to_string (icon) : NULL; + gtk_list_store_insert_with_values (model, &iter, G_MAXINT, + 0, info, 1, icon_name, 2, name, 3, icon_width, -1); + if (string && !strcmp (katze_app_info_get_commandline (info), string)) + gtk_combo_box_set_active_iter (combo, &iter); + + g_free (icon_name); + } + g_list_free (apps); + } + + info = g_app_info_create_from_commandline ("", + "", G_APP_INFO_CREATE_NONE, NULL); + gtk_list_store_insert_with_values (model, NULL, G_MAXINT, + 0, info, 1, NULL, 2, _("Custom…"), 3, icon_width, -1); + g_object_unref (info); + + if (gtk_combo_box_get_active (combo) == -1) + { + if (string) + { + GtkWidget* entry; + const gchar* exe; + + info = g_app_info_create_from_commandline (string, + NULL, G_APP_INFO_CREATE_NONE, NULL); + entry = gtk_entry_new (); + exe = g_app_info_get_executable (info); + if (exe && *exe && strcmp (exe, "%f")) + gtk_entry_set_text (GTK_ENTRY (entry), string); + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (combo), entry); + g_object_unref (info); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_entry_focus_out_event_cb), object); + g_object_set_data_full (G_OBJECT (entry), "property", + g_strdup (property), g_free); + } + else + gtk_combo_box_set_active_iter (combo, &iter_none); + } + g_signal_connect (widget, "changed", + G_CALLBACK (proxy_combo_box_apps_changed_cb), object); + return G_SOURCE_REMOVE; +} + /** * katze_property_proxy: * @object: a #GObject @@ -497,30 +603,40 @@ else if (type == G_TYPE_PARAM_STRING && (_hint == I_("font") || _hint == I_("font-monospace"))) { + string = katze_object_get_string (object, property); + if (!string) + string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); + /* 'sans' and 'sans-serif' are presumably the same */ + if (!g_strcmp0 (string, "sans-serif")) + katze_assign (string, g_strdup ("sans")); + gboolean monospace = _hint == I_("font-monospace"); + + #if GTK_CHECK_VERSION (3, 2, 0) + widget = gtk_font_button_new (); + gtk_font_button_set_show_size (GTK_FONT_BUTTON (widget), FALSE); + gtk_font_chooser_set_font (GTK_FONT_CHOOSER (widget), string); + g_signal_connect (widget, "font-activated", + G_CALLBACK (proxy_font_chooser_font_activated_cb), object); + gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (widget), + (GtkFontFilterFunc)proxy_font_chooser_filter_monospace_cb, GINT_TO_POINTER (monospace), NULL); + #else GtkComboBox* combo; gint n_families, i; PangoContext* context; PangoFontFamily** families; - gboolean monospace = _hint == I_("font-monospace"); - string = katze_object_get_string (object, property); widget = gtk_combo_box_text_new (); combo = GTK_COMBO_BOX (widget); context = gtk_widget_get_pango_context (widget); pango_context_list_families (context, &families, &n_families); - if (!string) - string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); - /* 'sans' and 'sans-serif' are presumably the same */ - if (!g_strcmp0 (string, "sans-serif")) - katze_assign (string, g_strdup ("sans")); if (string) { gint j = 0; for (i = 0; i < n_families; i++) { - const gchar* font = pango_font_family_get_name (families[i]); if (monospace != pango_font_family_is_monospace (families[i])) continue; + const gchar* font = pango_font_family_get_name (families[i]); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), font); if (!g_ascii_strcasecmp (font, string)) gtk_combo_box_set_active (combo, j); @@ -532,22 +648,13 @@ g_signal_connect (widget, "changed", G_CALLBACK (proxy_combo_box_text_changed_cb), object); g_free (families); + #endif } else if (type == G_TYPE_PARAM_STRING && hint && g_str_has_prefix (hint, "application-")) { GtkListStore* model; GtkCellRenderer* renderer; - GtkComboBox* combo; - GList* apps; const gchar* app_type = &hint[12]; - GtkSettings* settings; - gint icon_width = 16; - GtkTreeIter iter_none; - GAppInfo* info; - - settings = gtk_settings_get_for_screen (gdk_screen_get_default ()); - gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, - &icon_width, NULL); model = gtk_list_store_new (4, G_TYPE_APP_INFO, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); @@ -559,77 +666,10 @@ renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, "text", 2); - combo = GTK_COMBO_BOX (widget); - apps = g_app_info_get_all_for_type (app_type); - if (!apps) - apps = katze_app_info_get_all_for_category (app_type); - - string = katze_object_get_string (object, property); - if (!g_strcmp0 (string, "")) - katze_assign (string, NULL); - - gtk_list_store_insert_with_values (model, &iter_none, 0, - 0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1); - - if (apps != NULL) - { - gint i = 0; - - while ((info = g_list_nth_data (apps, i++))) - { - const gchar* name = g_app_info_get_name (info); - GIcon* icon = g_app_info_get_icon (info); - gchar* icon_name; - GtkTreeIter iter; - - if (!g_app_info_should_show (info)) - continue; - - icon_name = icon ? g_icon_to_string (icon) : NULL; - gtk_list_store_insert_with_values (model, &iter, G_MAXINT, - 0, info, 1, icon_name, 2, name, 3, icon_width, -1); - if (string && !strcmp (katze_app_info_get_commandline (info), string)) - gtk_combo_box_set_active_iter (combo, &iter); - - g_free (icon_name); - } - g_list_free (apps); - } - { - info = g_app_info_create_from_commandline ("", - "", G_APP_INFO_CREATE_NONE, NULL); - gtk_list_store_insert_with_values (model, NULL, G_MAXINT, - 0, info, 1, NULL, 2, _("Custom..."), 3, icon_width, -1); - g_object_unref (info); - - if (gtk_combo_box_get_active (combo) == -1) - { - if (string) - { - GtkWidget* entry; - const gchar* exe; - - info = g_app_info_create_from_commandline (string, - NULL, G_APP_INFO_CREATE_NONE, NULL); - entry = gtk_entry_new (); - exe = g_app_info_get_executable (info); - if (exe && *exe && strcmp (exe, "%f")) - gtk_entry_set_text (GTK_ENTRY (entry), string); - gtk_widget_show (entry); - gtk_container_add (GTK_CONTAINER (combo), entry); - g_object_unref (info); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (proxy_entry_focus_out_event_cb), object); - g_object_set_data_full (G_OBJECT (entry), "property", - g_strdup (property), g_free); - } - else - gtk_combo_box_set_active_iter (combo, &iter_none); - } - } - g_signal_connect (widget, "changed", - G_CALLBACK (proxy_combo_box_apps_changed_cb), object); + g_object_set_data_full (G_OBJECT (widget), "app-type", g_strdup (app_type), g_free); + g_object_set_data_full (G_OBJECT (widget), "object", g_object_ref (object), g_object_unref); + g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc)proxy_populate_apps, widget, NULL); } else if (type == G_TYPE_PARAM_STRING) { @@ -667,7 +707,8 @@ } else if (type == G_TYPE_PARAM_FLOAT) { - gfloat value = katze_object_get_float (object, property); + gfloat value; + g_object_get (object, property, &value, NULL); widget = gtk_spin_button_new_with_range ( G_PARAM_SPEC_FLOAT (pspec)->minimum, @@ -781,45 +822,6 @@ return widget; } -/** - * katze_property_label: - * @object: a #GObject - * @property: the name of a property - * - * Create a label widget displaying the name of the specified object's property. - * - * Return value: a new label widget - * - * Since 0.2.1 the label will be empty if the property proxy for the - * same property would contain a label already. - **/ -GtkWidget* -katze_property_label (gpointer object, - const gchar* property) -{ - GObjectClass* class; - GParamSpec* pspec; - const gchar* nick; - GtkWidget* widget; - - g_return_val_if_fail (G_IS_OBJECT (object), NULL); - - class = G_OBJECT_GET_CLASS (object); - pspec = g_object_class_find_property (class, property); - if (!pspec) - { - g_warning (_("Property '%s' is invalid for %s"), - property, G_OBJECT_CLASS_NAME (class)); - return gtk_label_new (property); - } - - nick = g_param_spec_get_nick (pspec); - widget = gtk_label_new (nick); - gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); - - return widget; -} - typedef struct { GtkWidget* widget; @@ -955,59 +957,6 @@ } /** - * katze_pixbuf_new_from_buffer: - * @buffer: Buffer with image data - * @length: Length of the buffer - * @mime_type: a MIME type, or %NULL - * @error: return location for a #GError, or %NULL - * - * Creates a new #GdkPixbuf out of the specified buffer. - * - * You can specify a MIME type if looking at the buffer - * is not enough to determine the right type. - * - * Return value: A newly-allocated #GdkPixbuf - **/ -GdkPixbuf* -katze_pixbuf_new_from_buffer (const guchar* buffer, - gsize length, - const gchar* mime_type, - GError** error) -{ - /* Proposed for inclusion in GdkPixbuf - See http://bugzilla.gnome.org/show_bug.cgi?id=74291 */ - GdkPixbufLoader* loader; - GdkPixbuf* pixbuf; - - g_return_val_if_fail (buffer != NULL, NULL); - g_return_val_if_fail (length > 0, NULL); - - if (mime_type) - { - loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error); - if (!loader) - return NULL; - } - else - loader = gdk_pixbuf_loader_new (); - if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) - { - g_object_unref (loader); - return NULL; - } - if (!gdk_pixbuf_loader_close (loader, error)) - { - g_object_unref (loader); - return NULL; - } - - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - g_object_ref (pixbuf); - g_object_unref (loader); - return pixbuf; -} - -/** * katze_tree_view_get_selected_iter: * @treeview: a #GtkTreeView * @model: a pointer to store the model, or %NULL @@ -1139,29 +1088,6 @@ } /** - * katze_object_has_property: - * @object: a #GObject - * @property: the name of the property - * - * Determine if @object has a property with the specified name. - * - * Return value: a boolean - * - * Since: 0.1.2 - **/ -gboolean -katze_object_has_property (gpointer object, - const gchar* property) -{ - GObjectClass* class; - - g_return_val_if_fail (G_IS_OBJECT (object), FALSE); - - class = G_OBJECT_GET_CLASS (object); - return g_object_class_find_property (class, property) != NULL; -} - -/** * katze_object_get_boolean: * @object: a #GObject * @property: the name of the property to get @@ -1206,28 +1132,6 @@ } /** - * katze_object_get_float: - * @object: a #GObject - * @property: the name of the property to get - * - * Retrieve the float value of the specified property. - * - * Return value: a float - **/ -gfloat -katze_object_get_float (gpointer object, - const gchar* property) -{ - gfloat value = -1.0f; - - g_return_val_if_fail (G_IS_OBJECT (object), -1.0f); - /* FIXME: Check value type */ - - g_object_get (object, property, &value, NULL); - return value; -} - -/** * katze_object_get_enum: * @object: a #GObject * @property: the name of the property to get diff -Nru midori-0.4.9/katze/katze-utils.h midori-0.5.0/katze/katze-utils.h --- midori-0.4.9/katze/katze-utils.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/katze-utils.h 2013-04-04 20:31:20.000000000 +0000 @@ -20,15 +20,6 @@ G_BEGIN_DECLS /** - * KATZE_OBJECT_NAME: - * @object: an object - * - * Return the name of an object's class structure's type. - **/ -#define KATZE_OBJECT_NAME(object) \ - G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) - -/** * katze_assign: * @lvalue: a pointer * @rvalue: the new value @@ -77,10 +68,6 @@ const gchar* property, const gchar* hint); -GtkWidget* -katze_property_label (gpointer object, - const gchar* property); - typedef enum { KATZE_MENU_POSITION_CURSOR = 0, KATZE_MENU_POSITION_LEFT, @@ -96,12 +83,6 @@ GtkWidget* katze_image_menu_item_new_ellipsized (const gchar* label); -GdkPixbuf* -katze_pixbuf_new_from_buffer (const guchar* buffer, - gsize length, - const gchar* mime_type, - GError** error); - gboolean katze_tree_view_get_selected_iter (GtkTreeView* treeview, GtkTreeModel** model, @@ -118,10 +99,6 @@ const gchar* katze_skip_whitespace (const gchar* str); -gboolean -katze_object_has_property (gpointer object, - const gchar* property); - gint katze_object_get_boolean (gpointer object, const gchar* property); @@ -130,10 +107,6 @@ katze_object_get_int (gpointer object, const gchar* property); -gfloat -katze_object_get_float (gpointer object, - const gchar* property); - gint katze_object_get_enum (gpointer object, const gchar* property); @@ -150,9 +123,6 @@ katze_mkdir_with_parents (const gchar* pathname, int mode); -gboolean -katze_widget_has_touchscreen_mode (GtkWidget* widget); - GtkWidget* katze_uri_entry_new (GtkWidget* other_widget); diff -Nru midori-0.4.9/katze/katze.h midori-0.5.0/katze/katze.h --- midori-0.4.9/katze/katze.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/katze.h 2013-04-04 20:31:20.000000000 +0000 @@ -20,7 +20,6 @@ #include "katze-item.h" #include "katze-array.h" #include "katze-arrayaction.h" -#include "katze-separatoraction.h" #include "katze-net.h" #include "katze-preferences.h" diff -Nru midori-0.4.9/katze/katze.vapi midori-0.5.0/katze/katze.vapi --- midori-0.4.9/katze/katze.vapi 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/katze.vapi 2013-04-04 20:31:20.000000000 +0000 @@ -4,6 +4,7 @@ [CCode (cprefix = "Katze", lower_case_cprefix = "katze_")] namespace Katze { static void assert_str_equal (string input, string result, string? expected); + static unowned Gtk.Widget property_proxy (void* object, string property, string? hint); [CCode (cheader_filename = "katze/katze.h")] public class Array : Katze.Item { diff -Nru midori-0.4.9/katze/midori-paths.vala midori-0.5.0/katze/midori-paths.vala --- midori-0.4.9/katze/midori-paths.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/katze/midori-paths.vala 2013-04-04 20:31:20.000000000 +0000 @@ -35,6 +35,7 @@ namespace Paths { static string? exec_path = null; static string[] command_line = null; + static string? runtime_dir = null; static RuntimeMode mode = RuntimeMode.UNDEFINED; static string? config_dir = null; @@ -74,6 +75,28 @@ return mode; } + public static unowned string get_runtime_dir () { + if (runtime_dir != null) + return runtime_dir; + + #if HAVE_WIN32 + runtime_dir = Environment.get_variable ("XDG_RUNTIME_DIR"); + if (runtime_dir == null || runtime_dir == "") + runtime_dir = Environment.get_user_data_dir (); + #else + runtime_dir = Environment.get_variable ("XDG_RUNTIME_DIR"); + if (runtime_dir == null || runtime_dir == "") { + runtime_dir = Path.build_path (Path.DIR_SEPARATOR_S, + Environment.get_tmp_dir (), PACKAGE_NAME + "-" + Environment.get_user_name ()); + mkdir_with_parents (runtime_dir); + return runtime_dir; + } + #endif + runtime_dir = Path.build_path (Path.DIR_SEPARATOR_S, runtime_dir, PACKAGE_NAME); + mkdir_with_parents (runtime_dir); + return runtime_dir; + } + public static void init (RuntimeMode new_mode, string? config) { assert (mode == RuntimeMode.UNDEFINED); assert (new_mode != RuntimeMode.UNDEFINED); @@ -98,8 +121,7 @@ cache_dir_for_reading = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir (), PACKAGE_NAME); user_data_dir_for_reading = Environment.get_user_data_dir (); - tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ()); + tmp_dir = get_runtime_dir (); } else { string? real_config = config != null && !Path.is_absolute (config) @@ -109,8 +131,7 @@ cache_dir = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir (), PACKAGE_NAME); user_data_dir = Environment.get_user_data_dir (); - tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ()); + tmp_dir = get_runtime_dir (); } #if !HAVE_WEBKIT2 #if HAVE_WEBKIT_1_3_13 @@ -292,7 +313,8 @@ assert (command_line != null); if (for_display) return string.joinv (" ", command_line).replace (Environment.get_home_dir (), "~"); - return string.joinv (" ", command_line).replace ("--debug", "").replace ("-g", ""); + return string.joinv (" ", command_line).replace ("--debug", "").replace ("-g", "") + .replace ("--diagnostic-dialog", "").replace ("-d", ""); } public static string get_lib_path (string package) { diff -Nru midori-0.4.9/midori/main.c midori-0.5.0/midori/main.c --- midori-0.4.9/midori/main.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/main.c 2013-04-04 20:31:20.000000000 +0000 @@ -78,7 +78,7 @@ gboolean debug = FALSE; gboolean run; gchar* snapshot; - gboolean execute; + gchar** execute; gboolean help_execute; gboolean version; gchar** uris; @@ -106,7 +106,7 @@ N_("Run the specified filename as javascript"), NULL }, { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot, N_("Take a snapshot of the specified URI"), NULL }, - { "execute", 'e', 0, G_OPTION_ARG_NONE, &execute, + { "execute", 'e', 0, G_OPTION_ARG_STRING_ARRAY, &execute, N_("Execute the specified command"), NULL }, { "help-execute", 0, 0, G_OPTION_ARG_NONE, &help_execute, N_("List available commands to execute with -e/ --execute"), NULL }, @@ -132,7 +132,7 @@ plain = FALSE; run = FALSE; snapshot = NULL; - execute = FALSE; + execute = NULL; help_execute = FALSE; version = FALSE; uris = NULL; @@ -143,19 +143,10 @@ if (debug) { gchar* gdb = g_find_program_in_path ("gdb"); - gchar* args = midori_paths_get_command_line_str (FALSE); - gchar* cmd = g_strdup_printf ( - "--batch -ex 'set print thread-events off' -ex run " - "-ex 'set logging on %s' -ex 'bt' --return-child-result " - "--args %s", - "/tmp/midori-gdb.bt", args); - if (gdb != NULL) - sokoke_spawn_program (gdb, TRUE, cmd, FALSE, TRUE); - else - g_print (_("Error: \"gdb\" can't be found\n")); + if (gdb == NULL) + midori_error (_("Error: \"gdb\" can't be found\n")); + sokoke_spawn_gdb (gdb, TRUE); g_free (gdb); - g_free (cmd); - g_free (args); return 0; } @@ -192,14 +183,16 @@ GtkActionGroup* action_group = midori_browser_get_action_group (browser); GList* actions = gtk_action_group_list_actions (action_group); GList* temp = actions; + GObjectClass* class = G_OBJECT_GET_CLASS (midori_browser_get_settings (browser)); + guint i, n_properties; + GParamSpec** pspecs = g_object_class_list_properties (class, &n_properties); guint length = 1; gchar* space; for (; temp; temp = g_list_next (temp)) - { - GtkAction* action = temp->data; - length = MAX (length, 1 + strlen (gtk_action_get_name (action))); - } + length = MAX (length, 1 + strlen (gtk_action_get_name (temp->data))); + for (i = 0; i < n_properties; i++) + length = MAX (length, 1 + strlen (g_param_spec_get_name (pspecs[i]))); space = g_strnfill (length, ' '); for (; actions; actions = g_list_next (actions)) @@ -217,8 +210,45 @@ g_free (label); g_free (stripped); } - g_free (space); g_list_free (actions); + g_print ("\n"); + + for (i = 0; i < n_properties; i++) + { + GParamSpec* pspec = pspecs[i]; + if (!(pspec->flags & G_PARAM_WRITABLE)) + continue; + const gchar* property = g_param_spec_get_name (pspec); + gchar* padding = g_strndup (space, strlen (space) - strlen (property)); + GType type = G_PARAM_SPEC_TYPE (pspec); + const gchar* tname; + GString* tname_string = NULL; + if (type == G_TYPE_PARAM_STRING) + tname = "string"; + else if (type == G_TYPE_PARAM_BOOLEAN) + tname = "true/ false"; + else if (type == G_TYPE_PARAM_ENUM) + { + GEnumClass* enum_class = G_ENUM_CLASS (g_type_class_peek (pspec->value_type)); + gint j = 0; + tname_string = g_string_new (""); + for (j = 0; j < enum_class->n_values; j++) + { + g_string_append (tname_string, enum_class->values[j].value_name); + g_string_append (tname_string, j == 2 ? "\n " : " "); + } + tname = tname_string->str; + } + else + tname = "number"; + g_print ("%s%s%s\n", property, padding, tname); + if (tname_string != NULL) + g_string_free (tname_string, TRUE); + g_free (padding); + } + g_free (pspecs); + + g_free (space); gtk_widget_destroy (GTK_WIDGET (browser)); return 0; } @@ -266,7 +296,7 @@ g_signal_connect (web_view, "load-finished", G_CALLBACK (snapshot_load_finished_cb), filename); #endif - uri = sokoke_prepare_uri (snapshot); + uri = sokoke_magic_uri (snapshot, FALSE, TRUE); webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri); g_free (uri); gtk_main (); @@ -281,8 +311,8 @@ GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL); #endif GtkWidget* web_view = webkit_web_view_new (); - gchar* uri = sokoke_prepare_uri ( - (uris != NULL && uris[0]) ? uris[0] : "http://www.example.com"); + gchar* uri = sokoke_magic_uri ( + (uris != NULL && uris[0]) ? uris[0] : "http://www.example.com", FALSE, TRUE); katze_window_set_sensible_default_size (GTK_WINDOW (window)); #ifndef HAVE_WEBKIT2 @@ -344,7 +374,7 @@ if (private) { MidoriBrowser* browser = midori_private_app_new (config, webapp, - execute ? NULL : uris, execute ? uris : NULL, inactivity_reset, block_uris); + uris, execute, inactivity_reset, block_uris); g_signal_connect (browser, "destroy", G_CALLBACK (gtk_main_quit), NULL); g_signal_connect (browser, "quit", G_CALLBACK (gtk_main_quit), NULL); gtk_main (); @@ -354,7 +384,7 @@ if (webapp) { MidoriBrowser* browser = midori_web_app_new (config, webapp, - execute ? NULL : uris, execute ? uris : NULL, inactivity_reset, block_uris); + uris, execute, inactivity_reset, block_uris); g_signal_connect (browser, "destroy", G_CALLBACK (gtk_main_quit), NULL); g_signal_connect (browser, "quit", G_CALLBACK (gtk_main_quit), NULL); gtk_main (); @@ -363,7 +393,7 @@ MidoriApp* app = midori_normal_app_new (config, portable ? "portable" : "normal", diagnostic_dialog, webapp, - execute ? NULL : uris, execute ? uris : NULL, inactivity_reset, block_uris); + uris, execute, inactivity_reset, block_uris); if (app == NULL) return 0; if (app == (void*)0xdeadbeef) diff -Nru midori-0.4.9/midori/midori-app.c midori-0.5.0/midori/midori-app.c --- midori-0.4.9/midori/midori-app.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-app.c 2013-04-04 20:31:20.000000000 +0000 @@ -508,8 +508,7 @@ { 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_add_uri (browser, "about:home"); midori_browser_activate_action (browser, "Location"); gtk_widget_show (GTK_WIDGET (browser)); midori_app_raise_window (GTK_WINDOW (browser), screen); @@ -572,15 +571,11 @@ } else if (g_str_equal (command, "command")) { - guint i = 0; - if (!uris || !app->browser) return FALSE; - while (uris[i] != NULL) - { + gint i; + for (i = 0; uris && uris[i]; i++) midori_browser_activate_action (app->browser, uris[i]); - i++; - } return TRUE; } @@ -793,7 +788,7 @@ app->search_engines = NULL; app->history = NULL; app->speeddial = NULL; - app->extensions = NULL; + app->extensions = katze_array_new (KATZE_TYPE_ARRAY); app->browsers = katze_array_new (MIDORI_TYPE_BROWSER); app->instance = MidoriAppInstanceNull; @@ -935,6 +930,25 @@ return g_object_new (MIDORI_TYPE_APP, "name", name, NULL); } +/** + * midori_app_new_proxy: + * @app: a #MidoriApp, or %NULL + * + * Instantiates a proxy #MidoriApp that can be passed to untrusted code + * or for sensitive use cases. Properties can be freely changed. + * + * Return value: a new #MidoriApp + * + * Since: 0.5.0 + **/ +MidoriApp* +midori_app_new_proxy (MidoriApp* app) +{ + g_return_val_if_fail (MIDORI_IS_APP (app) || !app, NULL); + + return midori_app_new (NULL); +} + static gboolean instance_is_not_running = FALSE; static gboolean instance_is_running = FALSE; @@ -1072,7 +1086,7 @@ int i = 0; while (uris[i] != NULL) { - gchar* new_uri = sokoke_prepare_uri (uris[i]); + gchar* new_uri = sokoke_magic_uri (uris[i], TRUE, TRUE); gchar* escaped_uri = g_uri_escape_string (new_uri, NULL, FALSE); g_free (new_uri); katze_assign (uris[i], escaped_uri); @@ -1118,20 +1132,15 @@ g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); g_return_val_if_fail (command != NULL, FALSE); - if (midori_app_instance_is_running (app)) + if (!midori_app_instance_is_running (app)) { MidoriBrowser* browser = midori_browser_new (); int i; for (i=0; command && command[i]; i++) - { - gboolean action_known = (gtk_action_group_get_action (midori_browser_get_action_group (browser), command[i]) != NULL); - if (!action_known) - g_warning (_("Unexpected action '%s'."), command[i]); - } + midori_browser_assert_action (browser, command[i]); gtk_widget_destroy (GTK_WIDGET (browser)); - } - else return midori_app_command_received (app, "command", command, NULL); + } #if HAVE_UNIQUE if (app->instance) @@ -1440,7 +1449,20 @@ g_object_unref (factory); if (!success) - g_error ("%s - %s", _("Midori"), error->message); + midori_error (error->message); +} + +void +midori_error (const gchar* format, + ...) +{ + g_printerr ("%s - ", _("Midori")); + va_list args; + va_start (args, format); + g_vfprintf (stderr, format, args); + va_end (args); + g_printerr ("\n"); + exit (1); } gboolean diff -Nru midori-0.4.9/midori/midori-app.h midori-0.5.0/midori/midori-app.h --- midori-0.4.9/midori/midori-app.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-app.h 2013-04-04 20:31:20.000000000 +0000 @@ -41,6 +41,9 @@ MidoriApp* midori_app_new (const gchar* name); +MidoriApp* +midori_app_new_proxy (MidoriApp* app); + const gchar* midori_app_get_name (MidoriApp* app); @@ -96,6 +99,10 @@ gboolean midori_debug (const gchar* token); +void +midori_error (const gchar* format, + ...); + G_END_DECLS #endif /* __MIDORI_APP_H__ */ diff -Nru midori-0.4.9/midori/midori-array.c midori-0.5.0/midori/midori-array.c --- midori-0.4.9/midori/midori-array.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-array.c 2013-04-04 20:31:20.000000000 +0000 @@ -35,7 +35,8 @@ xmlNodePtr cur); static gchar* -katze_item_metadata_to_xbel (KatzeItem* item); +katze_item_metadata_to_xbel (KatzeItem* item, + gboolean tiny_xbel); #if HAVE_LIBXML static KatzeItem* @@ -50,9 +51,17 @@ while (cur) { if (katze_str_equal ((gchar*)cur->name, "title")) - item->name = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + { + gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + katze_item_set_name (item, value); + xmlFree (value); + } else if (katze_str_equal ((gchar*)cur->name, "desc")) - item->text = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + { + gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + katze_item_set_text (item, value); + xmlFree (value); + } else if (katze_str_equal ((gchar*)cur->name, "info")) katze_xbel_parse_info (item, cur); cur = cur->next; @@ -86,9 +95,17 @@ while (cur) { if (katze_str_equal ((gchar*)cur->name, "title")) - ((KatzeItem*)array)->name = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + { + gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + katze_item_set_text (KATZE_ITEM (array), value); + xmlFree (value); + } else if (katze_str_equal ((gchar*)cur->name, "desc")) - ((KatzeItem*)array)->text = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + { + gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur)); + katze_item_set_name (KATZE_ITEM (array), value); + xmlFree (value); + } else if (katze_str_equal ((gchar*)cur->name, "info")) katze_xbel_parse_info ((KatzeItem*)array, cur); else if (katze_str_equal ((gchar*)cur->name, "folder")) @@ -187,6 +204,7 @@ /* Loads the contents from an xmlNodePtr into an array. */ static gboolean katze_array_from_xmlDocPtr (KatzeArray* array, + gboolean tiny_xbel, xmlDocPtr doc) { xmlNodePtr cur; @@ -205,17 +223,17 @@ gchar* value; value = (gchar*)xmlGetProp (cur, (xmlChar*)"version"); - if (!value || !katze_str_equal (value, "1.0")) + if (!tiny_xbel && (!value || !katze_str_equal (value, "1.0"))) g_warning ("XBEL version is not 1.0."); - g_free (value); + xmlFree (value); value = (gchar*)xmlGetProp (cur, (xmlChar*)"title"); katze_item_set_name (KATZE_ITEM (array), value); - g_free (value); + xmlFree (value); value = (gchar*)xmlGetProp (cur, (xmlChar*)"desc"); katze_item_set_text (KATZE_ITEM (array), value); - g_free (value); + xmlFree (value); } else if (katze_str_equal ((gchar*)cur->name, "RDF")) { @@ -227,21 +245,28 @@ if (katze_str_equal ((gchar*)cur->name, "item")) { xmlNodePtr cur_item; - item = katze_item_new (); cur_item = cur->xmlChildrenNode; while (cur_item) { if (katze_str_equal ((gchar*)cur_item->name, "title")) - item->name = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); + { + gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); + katze_item_set_name (item, value); + xmlFree (value); + } else if (katze_str_equal ((gchar*)cur_item->name, "link")) - item->uri = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); + { + gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); + katze_item_set_uri (item, value); + xmlFree (value); + } else if (katze_str_equal ((gchar*)cur_item->name, "subject")) { gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur_item)); /* FIXME: Create a folder according to the tag */ - g_free (value); + xmlFree (value); } cur_item = cur_item->next; } @@ -378,7 +403,11 @@ if (item && katze_str_equal (element[1], "DD")) { if (element[2]) - item->text = katze_unescape_html (element[2]); + { + gchar* text = katze_unescape_html (element[2]); + katze_item_set_text (item, text); + g_free (text); + } item = NULL; } /* end of current folder, level-up */ @@ -459,16 +488,16 @@ if (parts && parts[0] && parts[1]) { if (katze_str_equal (parts[0], "NAME")) - item->name = g_strdup (parts[1]); + katze_item_set_name (item, parts[1]); else if (katze_str_equal (parts[0], "URL")) - item->uri = g_strdup (parts[1]); + katze_item_set_uri (item, parts[1]); else if (katze_str_equal (parts[0], "DESCRIPTION")) - item->text = g_strdup (parts[1]); + katze_item_set_text (item, parts[1]); else if (katze_str_equal (parts[0], "CREATED")) - item->added = g_ascii_strtoull (parts[1], NULL, 10); + katze_item_set_added (item, g_ascii_strtoull (parts[1], NULL, 10)); /* FIXME: Implement visited time else if (katze_str_equal (parts[0], "VISITED")) - item->visited = g_ascii_strtoull (parts[1], NULL, 10); */ + katze_item_set_visited (item, g_ascii_strtoull (parts[1], NULL, 10)); */ else if (katze_str_equal (parts[0], "ON PERSONALBAR")) katze_item_set_meta_integer (item, "toolbar", katze_str_equal (parts[1], "YES") ? 1 : -1); @@ -597,6 +626,7 @@ /* XBEL */ if (katze_str_equal (format, "xbel") + || katze_str_equal (format, "xbel-tiny") || !*format) { xmlDocPtr doc; @@ -610,7 +640,7 @@ return FALSE; } - if (!katze_array_from_xmlDocPtr (array, doc)) + if (!katze_array_from_xmlDocPtr (array, katze_str_equal (format, "xbel-tiny"), doc)) { /* Parsing failed */ xmlFreeDoc (doc); @@ -701,13 +731,14 @@ static void string_append_item (GString* string, - KatzeItem* item) + KatzeItem* item, + gboolean tiny_xbel) { gchar* metadata; g_return_if_fail (KATZE_IS_ITEM (item)); - metadata = katze_item_metadata_to_xbel (item); + metadata = katze_item_metadata_to_xbel (item, tiny_xbel); if (KATZE_IS_ARRAY (item)) { KatzeItem* _item; @@ -719,7 +750,7 @@ string_append_xml_element (string, "title", katze_item_get_name (item)); string_append_xml_element (string, "desc", katze_item_get_text (item)); KATZE_ARRAY_FOREACH_ITEM_L (_item, array, list) - string_append_item (string, _item); + string_append_item (string, _item, tiny_xbel); g_string_append (string, metadata); g_string_append (string, "\n"); g_list_free (list); @@ -777,7 +808,7 @@ string_append_escaped (string, katze_item_get_name (item)); g_string_append (string, "\n"); - if (item->text && g_strcmp0 (item->text, "")) + if (g_strcmp0 (katze_str_non_null (katze_item_get_text (item)), "")) { g_string_append (string, "\t
"); string_append_escaped (string, katze_item_get_text (item)); @@ -787,7 +818,8 @@ } static gchar* -katze_item_metadata_to_xbel (KatzeItem* item) +katze_item_metadata_to_xbel (KatzeItem* item, + gboolean tiny_xbel) { GList* keys = katze_item_get_meta_keys (item); GString* markup; @@ -817,7 +849,7 @@ string_append_escaped (markdown, value); g_string_append_printf (markdown, "\n", key); } - else if (namespace) + else if (namespace || tiny_xbel) { g_string_append_printf (markup, " %s=\"", key); string_append_escaped (markup, value); @@ -830,7 +862,7 @@ g_string_append_c (markup, '\"'); } } - if (!namespace) + if (!namespace && !tiny_xbel) { namespace_uri = "http://www.twotoasts.de"; g_string_append_printf (markup, " owner=\"%s\"", namespace_uri); @@ -845,25 +877,27 @@ static gchar* katze_array_to_xbel (KatzeArray* array, + gboolean tiny_xbel, GError** error) { - gchar* metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array)); + gchar* metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array), tiny_xbel); KatzeItem* item; GList* list; - GString* markup = g_string_new ( - "\n" - "\n" - "\n"); + GString* markup = g_string_new ("\n"); + if (tiny_xbel) + g_string_append (markup, "\n"); + else + g_string_append (markup, + "\n" + "\n"); string_append_xml_element (markup, "title", katze_item_get_name (KATZE_ITEM (array))); string_append_xml_element (markup, "desc", katze_item_get_text (KATZE_ITEM (array))); g_string_append (markup, metadata ? metadata : ""); KATZE_ARRAY_FOREACH_ITEM_L (item, array, list) - string_append_item (markup, item); + string_append_item (markup, item, tiny_xbel); g_string_append (markup, "\n"); g_free (metadata); @@ -909,7 +943,9 @@ gboolean success; if (!g_strcmp0 (format, "xbel")) - data = katze_array_to_xbel (array, error); + data = katze_array_to_xbel (array, FALSE, error); + else if (!g_strcmp0 (format, "xbel-tiny")) + data = katze_array_to_xbel (array, TRUE, error); else if (!g_strcmp0 (format, "netscape")) data = katze_array_to_netscape_html (array, error); else @@ -944,6 +980,7 @@ g_return_val_if_fail (!error || !*error, FALSE); if (!g_strcmp0 (format, "xbel") + || !g_strcmp0 (format, "xbel-tiny") || !g_strcmp0 (format, "netscape")) return midori_array_to_file_format (array, filename, format, error); @@ -966,19 +1003,19 @@ const unsigned char* uri; uri = sqlite3_column_text (stmt, column); if (uri && uri[0] && uri[0] != '(') - item->uri = g_strdup ((gchar*)uri); + katze_item_set_uri (item, (gchar*)uri); } else if (g_str_equal (name, "title") || g_str_equal (name, "name")) { const unsigned char* title; title = sqlite3_column_text (stmt, column); - item->name = g_strdup ((gchar*)title); + katze_item_set_name (item, (gchar*)title); } else if (g_str_equal (name, "date") || g_str_equal (name, "created")) { gint date; date = sqlite3_column_int64 (stmt, column); - item->added = date; + katze_item_set_added (item, date); } else if (g_str_equal (name, "day") || g_str_equal (name, "app") || g_str_equal (name, "toolbar") || g_str_equal (name, "id") @@ -994,7 +1031,7 @@ { const unsigned char* text; text = sqlite3_column_text (stmt, column); - item->text = g_strdup ((gchar*)text); + katze_item_set_text (item, (gchar*)text); } else if (g_str_equal (name, "nick")) { @@ -1125,7 +1162,7 @@ katze_item_get_meta_integer (item, "id")); KatzeArray* subarray = midori_array_query_recursive (bookmarks, fields, "parentid=%q", parentid, TRUE); - katze_item_set_name (KATZE_ITEM (subarray), item->name); + katze_item_set_name (KATZE_ITEM (subarray), katze_item_get_name (item)); katze_array_add_item (array, subarray); g_free (parentid); diff -Nru midori-0.4.9/midori/midori-browser.c midori-0.5.0/midori/midori-browser.c --- midori-0.4.9/midori/midori-browser.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-browser.c 2013-04-04 20:31:20.000000000 +0000 @@ -14,6 +14,7 @@ #include "midori-browser.h" #include "midori-app.h" +#include "midori-extension.h" #include "midori-array.h" #include "midori-view.h" #include "midori-preferences.h" @@ -96,9 +97,7 @@ gboolean show_navigationbar; gboolean show_statusbar; guint maximum_history_age; - gchar* location_entry_search; guint last_web_search; - gchar* news_aggregator; }; G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) @@ -492,10 +491,10 @@ zeitgeist_event_new_full (inter, ZEITGEIST_ZG_USER_ACTIVITY, "application://midori.desktop", zeitgeist_subject_new_full ( - item->uri, + katze_item_get_uri (item), strstr (type, "bookmark") ? ZEITGEIST_NFO_BOOKMARK : ZEITGEIST_NFO_WEBSITE, - zeitgeist_manifestation_for_uri (item->uri), - katze_item_get_meta_string (item, "mime-type"), NULL, item->name, NULL), + zeitgeist_manifestation_for_uri (katze_item_get_uri (item)), + katze_item_get_meta_string (item, "mime-type"), NULL, katze_item_get_name (item), NULL), NULL), NULL); #endif @@ -531,15 +530,129 @@ midori_browser_update_history (item, "website", "access"); } +/** + * midori_browser_assert_action: + * @browser: a #MidoriBrowser + * @name: action, setting=value expression or extension=true|false + * + * Assert that @name is a valid action or setting expression, + * if it fails the program will terminate with an error. + * To be used with command line interfaces. + * + * Since: 0.5.0 + **/ +void +midori_browser_assert_action (MidoriBrowser* browser, + const gchar* name) +{ + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (name != NULL); + + if (strchr (name, '=')) + { + gchar** parts = g_strsplit (name, "=", 0); + GObjectClass* class = G_OBJECT_GET_CLASS (browser->settings); + GParamSpec* pspec = g_object_class_find_property (class, parts[0]); + if (pspec != NULL) + { + GType type = G_PARAM_SPEC_TYPE (pspec); + if (!( + (type == G_TYPE_PARAM_BOOLEAN && (!strcmp (parts[1], "true") || !strcmp (parts[1], "false"))) + || type == G_TYPE_PARAM_STRING + || type == G_TYPE_PARAM_INT + || type == G_TYPE_PARAM_FLOAT + || type == G_TYPE_PARAM_ENUM)) + midori_error (_("Value '%s' is invalid for %s"), parts[1], parts[0]); + } + else + { + gchar* extension_path = midori_paths_get_lib_path (PACKAGE_NAME); + GObject* extension = midori_extension_load_from_file (extension_path, parts[0], FALSE, FALSE); + g_free (extension_path); + if (!extension || (strcmp (parts[1], "true") && strcmp (parts[1], "false"))) + midori_error (_("Unexpected setting '%s'"), name); + } + g_strfreev (parts); + } + else + { + GtkAction* action = _action_by_name (browser, name); + if (!action) + midori_error (_("Unexpected action '%s'."), name); + } +} + +void +midori_app_set_browsers (MidoriApp* app, + KatzeArray* browsers, + MidoriBrowser* browser); + static void _midori_browser_activate_action (MidoriBrowser* browser, const gchar* name) { - GtkAction* action = _action_by_name (browser, name); - if (action) - gtk_action_activate (action); + g_return_if_fail (name != NULL); + + if (strchr (name, '=')) + { + gchar** parts = g_strsplit (name, "=", 0); + GObjectClass* class = G_OBJECT_GET_CLASS (browser->settings); + GParamSpec* pspec = g_object_class_find_property (class, parts[0]); + if (pspec != NULL) + { + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_BOOLEAN && !strcmp ("true", parts[1])) + g_object_set (browser->settings, parts[0], TRUE, NULL); + else if (type == G_TYPE_PARAM_BOOLEAN && !strcmp ("false", parts[1])) + g_object_set (browser->settings, parts[0], FALSE, NULL); + else if (type == G_TYPE_PARAM_STRING) + g_object_set (browser->settings, parts[0], parts[1], NULL); + else if (type == G_TYPE_PARAM_INT || type == G_TYPE_PARAM_UINT) + g_object_set (browser->settings, parts[0], atoi (parts[1]), NULL); + else if (type == G_TYPE_PARAM_FLOAT) + g_object_set (browser->settings, parts[0], g_ascii_strtod (parts[1], NULL), NULL); + else if (type == G_TYPE_PARAM_ENUM) + { + GEnumClass* enum_class = G_ENUM_CLASS (g_type_class_peek (pspec->value_type)); + GEnumValue* enum_value = g_enum_get_value_by_name (enum_class, parts[1]); + if (enum_value != NULL) + g_object_set (browser->settings, parts[0], enum_value->value, NULL); + else + g_warning (_("Value '%s' is invalid for %s"), parts[1], parts[0]); + } + else + g_warning (_("Value '%s' is invalid for %s"), parts[1], parts[0]); + } + else + { + gchar* extension_path = midori_paths_get_lib_path (PACKAGE_NAME); + GObject* extension = midori_extension_load_from_file (extension_path, parts[0], TRUE, FALSE); + MidoriApp* app = midori_app_new_proxy (NULL); + g_object_set (app, + "settings", browser->settings, + NULL); + /* FIXME: tabs of multiple windows */ + KatzeArray* browsers = katze_array_new (MIDORI_TYPE_BROWSER); + katze_array_add_item (browsers, browser); + midori_app_set_browsers (app, browsers, browser); + g_free (extension_path); + if (extension && !strcmp (parts[1], "true")) + midori_extension_activate (extension, parts[0], TRUE, app); + else if (extension && !strcmp (parts[1], "false")) + midori_extension_deactivate (MIDORI_EXTENSION (extension)); + else + g_warning (_("Unexpected setting '%s'"), name); + } + g_strfreev (parts); + } else - g_warning (_("Unexpected action '%s'."), name); + { + GtkAction* action = _action_by_name (browser, name); + if (action) + gtk_action_activate (action); + else + g_warning (_("Unexpected action '%s'."), name); + } } static void @@ -559,18 +672,15 @@ GParamSpec* pspec, MidoriBrowser* browser) { - MidoriView* view = MIDORI_VIEW (widget); - MidoriLoadStatus load_status = midori_view_get_load_status (view); - const gchar* uri; - GtkAction* action; - - uri = midori_view_get_display_uri (view); - action = _action_by_name (browser, "Location"); - if (widget == midori_browser_get_current_tab (browser)) { + MidoriView* view = MIDORI_VIEW (widget); + MidoriLoadStatus load_status = midori_view_get_load_status (view); + if (load_status == MIDORI_LOAD_COMMITTED) { + const gchar* uri = midori_view_get_display_uri (view); + GtkAction* action = _action_by_name (browser, "Location"); midori_location_action_set_text ( MIDORI_LOCATION_ACTION (action), uri); g_object_notify (G_OBJECT (browser), "uri"); @@ -579,8 +689,7 @@ _midori_browser_update_interface (browser, view); _midori_browser_set_statusbar_text (browser, view, NULL); - /* This is a hack to ensure that the address entry is focussed - with speed dial open. */ + /* Focus the urlbar on blank pages */ if (midori_view_is_blank (view)) midori_browser_activate_action (browser, "Location"); } @@ -889,7 +998,7 @@ entry_title = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); value = katze_item_get_name (bookmark); - gtk_entry_set_text (GTK_ENTRY (entry_title), value ? value : ""); + gtk_entry_set_text (GTK_ENTRY (entry_title), katze_str_non_null (value)); midori_browser_edit_bookmark_title_changed_cb (GTK_ENTRY (entry_title), GTK_DIALOG (dialog)); g_signal_connect (entry_title, "changed", @@ -920,13 +1029,15 @@ label = gtk_button_new_with_mnemonic (_("Add to _Speed Dial")); g_signal_connect (label, "clicked", G_CALLBACK (midori_browser_edit_bookmark_add_speed_dial_cb), bookmark); - gtk_container_add (GTK_CONTAINER (content_area), label); + gtk_dialog_add_action_widget (GTK_DIALOG (dialog), label, GTK_RESPONSE_HELP); } + hbox = gtk_hbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar), katze_item_get_meta_boolean (bookmark, "toolbar")); - gtk_container_add (GTK_CONTAINER (content_area), check_toolbar); + gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, FALSE, FALSE, 0); check_app = NULL; if (!is_folder) @@ -934,7 +1045,7 @@ check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app), katze_item_get_meta_boolean (bookmark, "app")); - gtk_container_add (GTK_CONTAINER (content_area), check_app); + gtk_box_pack_start (GTK_BOX (hbox), check_app, FALSE, FALSE, 0); } gtk_widget_show_all (content_area); @@ -1617,7 +1728,7 @@ which is indicated by the proxy array having been unset. */ if (katze_array_is_empty (browser->proxy_array)) { - midori_browser_add_uri (browser, ""); + midori_browser_add_uri (browser, "about:new"); midori_browser_set_current_page (browser, 0); } @@ -2317,14 +2428,14 @@ _action_window_new_activate (GtkAction* action, MidoriBrowser* browser) { - midori_view_new_window_cb (NULL, "", browser); + midori_view_new_window_cb (NULL, "about:home", browser); } static void _action_tab_new_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* view = midori_browser_add_uri (browser, ""); + GtkWidget* view = midori_browser_add_uri (browser, "about:new"); midori_browser_set_current_tab (browser, view); } @@ -2347,9 +2458,6 @@ GtkWidget* dialog; GtkWidget* view; - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - dialog = (GtkWidget*)midori_file_chooser_dialog_new (_("Open file"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN); @@ -2455,7 +2563,8 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* browser, const gchar* uri) { - if (browser->news_aggregator && *browser->news_aggregator) + const gchar* news_aggregator = midori_settings_get_news_aggregator (MIDORI_SETTINGS (browser->settings)); + if (news_aggregator && *news_aggregator) { /* Thunderbird only accepts feed://, Liferea doesn't mind */ gchar* feed = g_strdup (uri); @@ -2467,11 +2576,11 @@ feed[3] = 'd'; } /* Special-case Liferea because a helper script may be required */ - if (g_str_equal (browser->news_aggregator, "liferea") + if (g_str_equal (news_aggregator, "liferea") && g_find_program_in_path ("liferea-add-feed")) sokoke_spawn_program ("liferea-add-feed", FALSE, feed, TRUE, FALSE); else - sokoke_spawn_program (browser->news_aggregator, TRUE, feed, TRUE, FALSE); + sokoke_spawn_program (news_aggregator, TRUE, feed, TRUE, FALSE); g_free (feed); } else @@ -2513,9 +2622,6 @@ "AddDesktopShortcut", "AddNewsFeed" }; guint i; - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - dialog = g_object_new (GTK_TYPE_DIALOG, "transient-for", browser, "title", _("Add a new bookmark"), NULL); @@ -2561,21 +2667,15 @@ _action_print_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* view; - - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - - if (!(view = midori_browser_get_current_tab (browser))) - return; + GtkWidget* view = midori_browser_get_current_tab (browser); #if 0 // def HAVE_GRANITE /* FIXME: Blacklist/ custom contract doesn't work gchar* blacklisted_contracts[] = { "print", NULL }; */ /* FIXME: granite: should return GtkWidget* like GTK+ */ - GtkWidget* dialog = (GtkWidget*)granite_widgets_pop_over_new (); - GtkWidget* content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + GtkWidget* dialog = (GtkWidget*)granite_widgets_light_window_new (_("Share this page")); /* FIXME: granite: should return GtkWidget* like GTK+ */ + GtkWidget* content_area = (GtkWidget*)granite_widgets_decorated_window_get_box (GRANITE_WIDGETS_DECORATED_WINDOW (dialog)); gchar* filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL); const gchar* mime_type = katze_item_get_meta_string ( midori_view_get_proxy_item (MIDORI_VIEW (view)), "mime-type"); @@ -2590,9 +2690,8 @@ gtk_container_add (GTK_CONTAINER (content_area), contractor); gtk_widget_show (contractor); gtk_widget_show (dialog); - if (gtk_widget_get_visible (browser->navigationbar)) - granite_widgets_pop_over_move_to_widget ( - GRANITE_WIDGETS_POP_OVER (dialog), browser->navigationbar, TRUE); + /* FIXME: granite: "box" isn't visible by default */ + gtk_widget_show_all (dialog); #else midori_view_print (MIDORI_VIEW (view)); #endif @@ -2946,7 +3045,7 @@ return; /* Imported bookmarks may lack a protocol */ - uri_fixed = sokoke_magic_uri (uri); + uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE); if (!uri_fixed) uri_fixed = g_strdup (uri); @@ -3189,9 +3288,6 @@ { static GtkWidget* dialog = NULL; - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - if (!dialog) { dialog = midori_preferences_new (GTK_WINDOW (browser), browser->settings); @@ -3308,12 +3404,8 @@ _action_reload_stop_activate (GtkAction* action, MidoriBrowser* browser) { + GtkWidget* view = midori_browser_get_current_tab (browser); gchar* stock_id; - GtkWidget* view; - - if (!(view = midori_browser_get_current_tab (browser))) - return; - g_object_get (action, "stock-id", &stock_id, NULL); /* Refresh or stop, depending on the stock id */ @@ -3344,8 +3436,6 @@ MidoriBrowser* browser) { GtkWidget* view = midori_browser_get_current_tab (browser); - if (!view) - return; if (g_str_equal (gtk_action_get_name (action), "ZoomIn")) midori_view_set_zoom_level (MIDORI_VIEW (view), @@ -3363,8 +3453,6 @@ MidoriBrowser* browser) { GtkWidget* view = midori_browser_get_current_tab (browser); - if (view) - { const gchar* name; GtkWidget* web_view; @@ -3393,7 +3481,6 @@ g_assert_not_reached (); g_object_set (web_view, "custom-encoding", encoding, NULL); } - } } static void @@ -3439,9 +3526,6 @@ gint response; GtkWidget* dialog; - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - if (!katze_object_get_boolean (browser->settings, "enable-caret-browsing")) { dialog = gtk_message_dialog_new (GTK_WINDOW (browser), @@ -3525,8 +3609,6 @@ const gchar* name; view = midori_browser_get_current_tab (browser); - if (!view) - return; web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view))); name = gtk_action_get_name (action); #ifndef HAVE_WEBKIT2 @@ -3550,9 +3632,6 @@ gchar* stylesheet; gint i; - if (!view) - return; - filename = midori_paths_get_res_filename ("faq.css"); stylesheet = NULL; if (!g_file_get_contents (filename, &stylesheet, NULL, NULL)) @@ -3615,9 +3694,6 @@ middle_click = FALSE; tab = midori_browser_get_current_tab (browser); - if (!tab) - return FALSE; - view = MIDORI_VIEW (tab); name = gtk_action_get_name (action); @@ -3692,17 +3768,14 @@ } else if (g_str_equal (name, "Homepage")) { - g_object_get (browser->settings, "homepage", &uri, NULL); - if (middle_click) { - GtkWidget* view = midori_browser_add_uri (browser, uri); + GtkWidget* view = midori_browser_add_uri (browser, "about:home"); midori_browser_set_current_tab_smartly (browser, view); } else - midori_view_set_uri (view, uri); + midori_view_set_uri (view, "about:home"); - g_free (uri); return TRUE; } #endif @@ -3747,12 +3820,8 @@ _action_location_reset_uri (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* view; - if ((view = midori_browser_get_current_tab (browser))) - { - midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), - midori_view_get_display_uri (MIDORI_VIEW (view))); - } + midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), + midori_browser_get_current_uri (browser)); } #ifndef HAVE_WEBKIT2 @@ -3836,7 +3905,7 @@ } uri = katze_skip_whitespace (uri); - new_uri = sokoke_magic_uri (uri); + new_uri = sokoke_magic_uri (uri, TRUE, FALSE); if (!new_uri) { const gchar* keywords = NULL; @@ -3858,7 +3927,8 @@ if (keywords == NULL) { keywords = uri; - search_uri = browser->location_entry_search; + search_uri = midori_settings_get_location_entry_search ( + MIDORI_SETTINGS (browser->settings)); } new_uri = midori_uri_for_search (search_uri, keywords); @@ -3915,10 +3985,7 @@ GtkWidget* widget, MidoriBrowser* browser) { - GtkWidget* view; - - if ((view = midori_browser_get_current_tab (browser))) - { + GtkWidget* view = midori_browser_get_current_tab (browser); const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); const gchar* feed; /* Clicking icon on blank is equal to Paste and Proceed */ @@ -3988,9 +4055,6 @@ else _action_location_submit_uri (action, uri, FALSE, browser); return TRUE; - } - - return FALSE; } static void @@ -4007,7 +4071,7 @@ if (item) url = katze_item_get_uri (item); else /* The location entry search is our fallback */ - url = browser->location_entry_search; + url = midori_settings_get_location_entry_search (MIDORI_SETTINGS (browser->settings)); search = midori_uri_for_search (url, keywords); if (item != NULL) @@ -4029,9 +4093,6 @@ MidoriBrowser* browser) { GSList* proxies = gtk_action_get_proxies (action); - const gchar* uri; - gchar* search; - for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { @@ -4040,12 +4101,8 @@ return; } - /* Load default search engine in current tab */ - uri = browser->location_entry_search; - search = midori_uri_for_search (uri ? uri : "", ""); - midori_browser_set_current_uri (browser, search); + midori_browser_set_current_uri (browser, "about:search"); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); - g_free (search); } static void @@ -4101,7 +4158,7 @@ const gchar* label, KatzeItem* item, gpointer callback, - MidoriBrowser* browser) + gpointer userdata) { const gchar* uri; GtkWidget* menuitem; @@ -4118,7 +4175,7 @@ else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE)) gtk_widget_set_sensitive (menuitem, uri != NULL); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - g_signal_connect (menuitem, "activate", G_CALLBACK (callback), browser); + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), userdata); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); } @@ -4176,17 +4233,16 @@ } static void -midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, - MidoriBrowser* browser) +midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, + GtkWidget* widget) { - KatzeItem* item; - - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + MidoriBrowser* browser = midori_browser_get_for_widget (widget); + KatzeItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); if (KATZE_ITEM_IS_BOOKMARK (item)) - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE, NULL); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE, widget); else - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE, NULL); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE, widget); } static void @@ -4228,7 +4284,7 @@ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL, - item, midori_browser_bookmark_edit_activate_cb, browser); + item, midori_browser_bookmark_edit_activate_cb, widget); midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, item, midori_browser_bookmark_delete_activate_cb, browser); @@ -4532,9 +4588,6 @@ { static GtkWidget* dialog = NULL; - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - if (!dialog) { dialog = midori_search_action_get_dialog ( @@ -4553,9 +4606,6 @@ { static GtkWidget* dialog = NULL; - if (!gtk_widget_get_visible (GTK_WIDGET (browser))) - return; - if (!dialog) { dialog = midori_private_data_get_dialog (browser); @@ -5014,7 +5064,7 @@ GtkWidget* view = midori_view_new_with_item (NULL, browser->settings); midori_view_set_tab (MIDORI_VIEW (view), tab); midori_browser_connect_tab (browser, view); - midori_view_set_uri (MIDORI_VIEW (view), ""); + midori_view_set_uri (MIDORI_VIEW (view), "about:new"); /* FIXME: signal add-tab */ _midori_browser_update_actions (browser); midori_browser_notebook_page_reordered_cb (GTK_WIDGET (notebook), @@ -5173,7 +5223,7 @@ if (/*(event->type == GDK_2BUTTON_PRESS && event->button == 1) || */(event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_NEW_TAB (event))) { - GtkWidget* view = midori_browser_add_uri (browser, ""); + GtkWidget* view = midori_browser_add_uri (browser, "about:new"); midori_browser_set_current_tab (browser, view); return TRUE; @@ -6443,8 +6493,6 @@ katze_object_assign (browser->history, NULL); katze_object_assign (browser->dial, NULL); - katze_assign (browser->news_aggregator, NULL); - G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } @@ -6763,9 +6811,6 @@ gboolean close_buttons_on_tabs; KatzeItem* item; - g_free (browser->location_entry_search); - g_free (browser->news_aggregator); - g_object_get (browser->settings, "remember-last-window-size", &remember_last_window_size, "last-window-width", &browser->last_window_width, @@ -6784,10 +6829,8 @@ "show-statusbar", &browser->show_statusbar, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, - "location-entry-search", &browser->location_entry_search, "close-buttons-on-tabs", &close_buttons_on_tabs, "maximum-history-age", &browser->maximum_history_age, - "news-aggregator", &browser->news_aggregator, NULL); #ifdef HAVE_GRANITE @@ -6831,19 +6874,17 @@ if (browser->search_engines) { + const gchar* default_search = midori_settings_get_location_entry_search ( + MIDORI_SETTINGS (browser->settings)); item = katze_array_get_nth_item (browser->search_engines, browser->last_web_search); if (item) midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); - KATZE_ARRAY_FOREACH_ITEM (item, browser->search_engines) - if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search)) - { - midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( + if ((item = katze_array_find_uri (browser->search_engines, default_search))) + midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); - break; - } } g_object_set (browser->panel, "show-titles", !compact_sidepanel, @@ -6917,16 +6958,13 @@ browser->show_statusbar = g_value_get_boolean (&value); _action_set_active (browser, "Statusbar", g_value_get_boolean (&value)); } - else if (name == g_intern_string ("location-entry-search")) - { - katze_assign (browser->location_entry_search, g_value_dup_string (&value)); - } else if (name == g_intern_string ("maximum-history-age")) browser->maximum_history_age = g_value_get_int (&value); - else if (name == g_intern_string ("news-aggregator")) - { - katze_assign (browser->news_aggregator, g_value_dup_string (&value)); - } + #ifdef HAVE_GRANITE + else if (name == g_intern_string ("close-buttons-on-tabs")) + granite_widgets_dynamic_notebook_set_tabs_closable ( + GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), g_value_get_boolean (&value)); + #endif else if (name == g_intern_string ("close-buttons-left")) { midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find), @@ -7174,18 +7212,16 @@ if (browser->search_engines) { + const gchar* default_search = midori_settings_get_location_entry_search ( + MIDORI_SETTINGS (browser->settings)); g_object_get (browser->settings, "last-web-search", &browser->last_web_search, NULL); item = katze_array_get_nth_item (browser->search_engines, browser->last_web_search); midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); - KATZE_ARRAY_FOREACH_ITEM (item, browser->search_engines) - if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search)) - { - midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( + if (default_search != NULL && (item = katze_array_find_uri (browser->search_engines, default_search))) + midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); - break; - } } break; } @@ -7432,9 +7468,9 @@ /** * midori_browser_activate_action: * @browser: a #MidoriBrowser - * @name: name of the action + * @name: action, setting=value expression or extension=true|false * - * Activates the specified action. + * Activates the specified action. See also midori_browser_assert_action(). **/ void midori_browser_activate_action (MidoriBrowser* browser, @@ -7555,15 +7591,10 @@ midori_browser_set_current_uri (MidoriBrowser* browser, const gchar* uri) { - GtkWidget* view; - g_return_if_fail (MIDORI_IS_BROWSER (browser)); g_return_if_fail (uri != NULL); - if ((view = midori_browser_get_current_tab (browser))) - midori_view_set_uri (MIDORI_VIEW (view), uri); - else - midori_browser_add_uri (browser, uri); + midori_view_set_uri (MIDORI_VIEW (midori_browser_get_current_tab (browser)), uri); } /** @@ -7579,13 +7610,10 @@ const gchar* midori_browser_get_current_uri (MidoriBrowser* browser) { - GtkWidget* view; - g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - if ((view = midori_browser_get_current_tab (browser))) - return midori_view_get_display_uri (MIDORI_VIEW (view)); - return NULL; + return midori_view_get_display_uri (MIDORI_VIEW ( + midori_browser_get_current_tab (browser))); } /** diff -Nru midori-0.4.9/midori/midori-browser.h midori-0.5.0/midori/midori-browser.h --- midori-0.4.9/midori/midori-browser.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-browser.h 2013-04-04 20:31:20.000000000 +0000 @@ -97,6 +97,10 @@ const gchar* name); void +midori_browser_assert_action (MidoriBrowser* browser, + const gchar* name); + +void midori_browser_block_action (MidoriBrowser* browser, GtkAction* action); diff -Nru midori-0.4.9/midori/midori-dialog.vala midori-0.5.0/midori/midori-dialog.vala --- midori-0.4.9/midori/midori-dialog.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-dialog.vala 2013-04-04 20:31:20.000000000 +0000 @@ -27,8 +27,9 @@ internal static uint test_max_timeout = 0; internal static string? test_first_try = null; public void grab_max_timeout () { + int seconds = (Environment.get_variable ("MIDORI_TIMEOUT") ?? "42").to_int (); test_first_try = "once"; - test_max_timeout = GLib.Timeout.add_seconds (21, ()=>{ + test_max_timeout = GLib.Timeout.add_seconds (seconds > 0 ? seconds / 2 : 0, ()=>{ stdout.printf ("Timed out %s%s\n", test_first_try, MainContext.default ().pending () ? " (loop)" : ""); if (test_first_try == "twice") diff -Nru midori-0.4.9/midori/midori-extension.c midori-0.5.0/midori/midori-extension.c --- midori-0.4.9/midori/midori-extension.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-extension.c 2013-04-04 20:31:20.000000000 +0000 @@ -580,10 +580,10 @@ typedef GObject* (*extension_init_func)(void); extension_init_func extension_init; static GHashTable* modules = NULL; + GObject* extension; - /* Ignore files which don't have the correct suffix */ - if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) - return NULL; + g_return_val_if_fail (extension_path != NULL, NULL); + g_return_val_if_fail (filename != NULL, NULL); if (strchr (filename, '/')) { @@ -594,30 +594,38 @@ else fullname = g_build_filename (extension_path, filename, NULL); + /* Ignore files which don't have the correct suffix */ + if (!g_str_has_suffix (fullname, G_MODULE_SUFFIX)) + { + g_free (fullname); + return NULL; + } + module = g_module_open (fullname, G_MODULE_BIND_LOCAL); g_free (fullname); /* GModule detects repeated loading but exposes no API to check it. Skip any modules that were loaded before. */ if (modules == NULL) - modules = g_hash_table_new (g_direct_hash, g_direct_equal); - if (g_hash_table_lookup (modules, module)) - return NULL; - - g_hash_table_insert (modules, module, g_strdup (filename)); + modules = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref); + if ((extension = g_hash_table_lookup (modules, module))) + return extension; if (module && g_module_symbol (module, "extension_init", (gpointer) &extension_init)) { typedef void (*extension_test_func)(void); extension_test_func extension_test; - GObject* extension = extension_init (); - if (test && extension && g_module_symbol (module, "extension_test", (gpointer) &extension_test)) - extension_test (); - return extension; + if ((extension = extension_init ())) + { + if (test && g_module_symbol (module, "extension_test", (gpointer) &extension_test)) + extension_test (); + g_object_set_data_full (G_OBJECT (extension), "filename", g_strdup (filename), g_free); + g_hash_table_insert (modules, module, extension); + } } - return NULL; + return extension; } void @@ -639,25 +647,34 @@ g_warning ("%s", g_module_error ()); katze_array_add_item (extensions, extension); g_object_unref (extensions); - } - - if (extension != NULL) g_object_unref (extension); + } } static void -midori_load_extension (MidoriApp* app, - MidoriExtension* extension, - const gchar* filename) +midori_extension_add_to_list (MidoriApp* app, + MidoriExtension* extension, + const gchar* filename) { + g_return_if_fail (MIDORI_IS_APP (app)); + g_return_if_fail (filename != NULL); KatzeArray* extensions = katze_object_get_object (app, "extensions"); - /* Signal that we want the extension to load and save */ - g_object_set_data_full (G_OBJECT (extension), "filename", - g_strdup (filename), g_free); - if (midori_extension_is_prepared (extension)) - midori_extension_get_config_dir (extension); + g_return_if_fail (KATZE_IS_ARRAY (extensions)); + if (katze_array_get_item_index (extensions, extension) >= 0) + return; + katze_array_add_item (extensions, extension); g_object_unref (extensions); + + if (midori_paths_is_readonly ()) + return; + + /* Signal that we want the extension to load and save */ + if (midori_extension_is_prepared (extension)) + { + g_warn_if_fail (extension->priv->config_dir == NULL); + extension->priv->config_dir = midori_paths_get_extension_config_dir (filename); + } } void @@ -669,28 +686,38 @@ if (MIDORI_IS_EXTENSION (extension)) { if (filename != NULL) - midori_load_extension (app, MIDORI_EXTENSION (extension), filename); + midori_extension_add_to_list (app, MIDORI_EXTENSION (extension), filename); if (activate) g_signal_emit_by_name (extension, "activate", app); } else if (KATZE_IS_ARRAY (extension)) { + gboolean success = FALSE; MidoriExtension* extension_item; KATZE_ARRAY_FOREACH_ITEM (extension_item, KATZE_ARRAY (extension)) if (MIDORI_IS_EXTENSION (extension_item)) { - gchar* key; - - if (filename != NULL) - midori_load_extension (app, extension_item, filename); - if (activate) + gchar* key = extension_item->priv->key; + g_return_if_fail (key != NULL); + if (filename != NULL && strchr (filename, '/')) { - key = katze_object_get_string (extension_item, "key"); - if (key && filename && strstr (filename, key)) - g_signal_emit_by_name (extension_item, "activate", app); - g_free (key); + gchar* clean = g_strndup (filename, strchr (filename, '/') - filename); + g_object_set_data_full (G_OBJECT (extension_item), "filename", clean, g_free); + midori_extension_add_to_list (app, extension_item, clean); + } + else if (filename != NULL) + { + midori_extension_add_to_list (app, extension_item, filename); + g_object_set_data_full (G_OBJECT (extension_item), "filename", g_strdup (filename), g_free); + } + if (activate && filename && strstr (filename, key)) + { + g_signal_emit_by_name (extension_item, "activate", app); + success = TRUE; } } + /* Passed a multi extension w/o key or non-existing key */ + g_warn_if_fail (!activate || success); } } @@ -827,15 +854,6 @@ g_return_val_if_fail (midori_extension_is_prepared (extension), NULL); - if (!extension->priv->config_dir) - { - gchar* filename = g_object_get_data (G_OBJECT (extension), "filename"); - if (filename != NULL) - extension->priv->config_dir = midori_paths_get_extension_config_dir (filename); - else - extension->priv->config_dir = NULL; - } - return extension->priv->config_dir; } diff -Nru midori-0.4.9/midori/midori-frontend.c midori-0.5.0/midori/midori-frontend.c --- midori-0.4.9/midori/midori-frontend.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-frontend.c 2013-04-04 20:31:20.000000000 +0000 @@ -45,6 +45,8 @@ gint inactivity_reset, const gchar* block_uris) { + guint i; + midori_paths_init (MIDORI_RUNTIME_MODE_APP, config); #ifndef HAVE_WEBKIT2 g_object_set_data (G_OBJECT (webkit_get_default_session ()), "pass-through-console", (void*)1); @@ -79,27 +81,27 @@ if (webapp != NULL) { - gchar* tmp_uri = sokoke_prepare_uri (webapp); + gchar* tmp_uri = sokoke_magic_uri (webapp, FALSE, TRUE); g_object_set (settings, "homepage", tmp_uri, NULL); midori_browser_add_uri (browser, tmp_uri); g_free (tmp_uri); } - else if (open_uris == NULL) + + for (i = 0; open_uris && open_uris[i]; i++) + { + gchar* new_uri = sokoke_magic_uri (open_uris[i], FALSE, TRUE); + midori_browser_add_uri (browser, new_uri); + g_free (new_uri); + } + if (midori_browser_get_n_pages (browser) == 0) midori_browser_add_uri (browser, "about:blank"); gtk_widget_show (GTK_WIDGET (browser)); - guint i; - if (open_uris != NULL) - for (i = 0; open_uris[i] != NULL; i++) - { - gchar* new_uri = sokoke_prepare_uri (open_uris[i]); - midori_browser_add_uri (browser, new_uri); - g_free (new_uri); - } - - if (execute_commands != NULL) - for (i = 0; execute_commands[i] != NULL; i++) - midori_browser_activate_action (browser, execute_commands[i]); + for (i = 0; execute_commands && execute_commands[i]; i++) + { + midori_browser_assert_action (browser, execute_commands[i]); + midori_browser_activate_action (browser, execute_commands[i]); + } return browser; } @@ -121,7 +123,7 @@ gchar* config_file = midori_paths_get_config_filename_for_writing ("tabtrash.xbel"); GError* error = NULL; midori_trash_add_item_no_save_cb (trash, item); - if (!midori_array_to_file (trash, config_file, "xbel", &error)) + if (!midori_array_to_file (trash, config_file, "xbel-tiny", &error)) { /* i18n: Trash, or wastebin, containing closed tabs */ g_warning (_("The trash couldn't be saved. %s"), error->message); @@ -145,6 +147,8 @@ gint inactivity_reset, const gchar* block_uris) { + guint i; + midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, config); #ifndef HAVE_WEBKIT2 g_object_set_data (G_OBJECT (webkit_get_default_session ()), "pass-through-console", (void*)1); @@ -206,27 +210,27 @@ if (webapp != NULL) { - gchar* tmp_uri = sokoke_prepare_uri (webapp); + gchar* tmp_uri = sokoke_magic_uri (webapp, FALSE, TRUE); g_object_set (settings, "homepage", tmp_uri, NULL); midori_browser_add_uri (browser, tmp_uri); g_free (tmp_uri); } - else if (open_uris == NULL) + + for (i = 0; open_uris && open_uris[i]; i++) + { + gchar* new_uri = sokoke_magic_uri (open_uris[i], FALSE, TRUE); + midori_browser_add_uri (browser, new_uri); + g_free (new_uri); + } + if (midori_browser_get_n_pages (browser) == 0) midori_browser_add_uri (browser, "about:private"); gtk_widget_show (GTK_WIDGET (browser)); - guint i; - if (open_uris != NULL) - for (i = 0; open_uris[i] != NULL; i++) - { - gchar* new_uri = sokoke_prepare_uri (open_uris[i]); - midori_browser_add_uri (browser, new_uri); - g_free (new_uri); - } - - if (execute_commands != NULL) - for (i = 0; execute_commands[i] != NULL; i++) - midori_browser_activate_action (browser, execute_commands[i]); + for (i = 0; execute_commands && execute_commands[i]; i++) + { + midori_browser_assert_action (browser, execute_commands[i]); + midori_browser_activate_action (browser, execute_commands[i]); + } return browser; } @@ -294,6 +298,27 @@ gtk_widget_destroy (dialog); } +static void +midori_frontend_crash_log_cb (GtkWidget* button, + gchar* crash_log) +{ + GError* error = NULL; + if (!sokoke_show_uri (gtk_widget_get_screen (button), crash_log, 0, &error)) + { + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("Could not run external program."), + error->message, FALSE); + g_error_free (error); + } +} + +static void +midori_frontend_debugger_cb (GtkWidget* button, + GtkDialog* dialog) +{ + gtk_dialog_response (dialog, GTK_RESPONSE_HELP); +} + static MidoriStartup midori_frontend_diagnostic_dialog (MidoriApp* app, MidoriWebSettings* settings, @@ -341,6 +366,29 @@ _("Show last tabs without loading"), MIDORI_STARTUP_DELAYED_PAGES, _("Show last open tabs"), MIDORI_STARTUP_LAST_OPEN_PAGES, NULL); + + gchar* crash_log = g_build_filename (midori_paths_get_runtime_dir (), "gdb.bt", NULL); + if (g_access (crash_log, F_OK) == 0) + { + GtkWidget* button = gtk_button_new_with_mnemonic (_("Show last crash _log")); + g_signal_connect_data (button, "clicked", + G_CALLBACK (midori_frontend_crash_log_cb), crash_log, + (GClosureNotify)g_free, 0); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + } + else + g_free (crash_log); + + gchar* gdb = g_find_program_in_path ("gdb"); + if (gdb != NULL) + { + GtkWidget* button = gtk_button_new_with_mnemonic (_("Run in _debugger")); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_frontend_debugger_cb), dialog); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + } gtk_dialog_set_default_response (GTK_DIALOG (dialog), load_on_startup == MIDORI_STARTUP_HOMEPAGE ? MIDORI_STARTUP_BLANK_PAGE : load_on_startup); @@ -364,6 +412,11 @@ gtk_widget_destroy (dialog); if (response == GTK_RESPONSE_DELETE_EVENT) response = G_MAXINT; + else if (response == GTK_RESPONSE_HELP) + { + sokoke_spawn_gdb (gdb, FALSE); + response = G_MAXINT; + } else if (response == MIDORI_STARTUP_BLANK_PAGE) katze_array_clear (session); return response; @@ -392,7 +445,7 @@ gboolean result = FALSE; GtkWidget* dialog; - if (execute_commands != NULL && midori_app_send_command (app, open_uris)) + if (execute_commands != NULL && midori_app_send_command (app, execute_commands)) return NULL; if (open_uris != NULL && midori_app_instance_send_uris (app, open_uris)) return NULL; @@ -445,7 +498,7 @@ { katze_assign (config_file, midori_paths_get_config_filename_for_reading ("session.xbel")); error = NULL; - if (!midori_array_from_file (session, config_file, "xbel", &error)) + if (!midori_array_from_file (session, config_file, "xbel-tiny", &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, @@ -461,7 +514,7 @@ G_CALLBACK (midori_trash_remove_item_cb), NULL); katze_assign (config_file, g_build_filename (config, "tabtrash.xbel", NULL)); error = NULL; - if (!midori_array_from_file (trash, config_file, "xbel", &error)) + if (!midori_array_from_file (trash, config_file, "xbel-tiny", &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, diff -Nru midori-0.4.9/midori/midori-locationaction.c midori-0.5.0/midori/midori-locationaction.c --- midori-0.4.9/midori/midori-locationaction.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-locationaction.c 2013-04-04 20:31:20.000000000 +0000 @@ -510,6 +510,8 @@ gtk_tree_view_column_cell_get_size ( gtk_tree_view_get_column (GTK_TREE_VIEW (action->treeview), 0), NULL, NULL, NULL, NULL, &height); + if (height == 0) + return; gtk_widget_style_get (action->treeview, "vertical-separator", &sep, NULL); height += sep; @@ -654,17 +656,17 @@ if (action->autocompleter == NULL) { - /* We use a proxy app to control what can be accessed */ + MidoriApp* app = midori_app_new_proxy (NULL); MidoriBrowser* browser = midori_browser_get_for_widget (action->entry); - GObject* app = g_object_new (MIDORI_TYPE_APP, + g_object_set (app, "history", action->history, "search-engines", action->search_engines, NULL); /* FIXME: tabs of multiple windows */ KatzeArray* browsers = katze_array_new (MIDORI_TYPE_BROWSER); katze_array_add_item (browsers, browser); - midori_app_set_browsers (MIDORI_APP (app), browsers, browser); - action->autocompleter = midori_autocompleter_new (app); + midori_app_set_browsers (app, browsers, browser); + action->autocompleter = midori_autocompleter_new (G_OBJECT (app)); g_signal_connect (action->autocompleter, "populated", G_CALLBACK (midori_location_action_populated_suggestions_cb), action); g_object_unref (app); diff -Nru midori-0.4.9/midori/midori-preferences.c midori-0.5.0/midori/midori-preferences.c --- midori-0.4.9/midori/midori-preferences.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-preferences.c 2013-04-04 20:31:20.000000000 +0000 @@ -298,7 +298,8 @@ { PAGE_NEW (GTK_STOCK_HOME, _("Startup")); FRAME_NEW (NULL); - label = katze_property_label (settings, "load-on-startup"); + label = gtk_label_new (_("When Midori starts:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); INDENTED_ADD (label); button = katze_property_proxy (settings, "load-on-startup", NULL); SPANNED_ADD (button); @@ -307,7 +308,7 @@ INDENTED_ADD (label); entry = katze_property_proxy (settings, "homepage", "address"); SPANNED_ADD (entry); - if (parent && katze_object_has_property (parent, "uri")) + if (parent && MIDORI_IS_BROWSER (parent)) { #if 0 button = gtk_button_new_with_mnemonic (_("Use _current page")); @@ -377,12 +378,26 @@ else g_free (enchant_path); } - button = katze_property_proxy (settings, "enable-scripts", NULL); + button = katze_property_proxy (settings, "enable-javascript", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); INDENTED_ADD (button); #if WEBKIT_CHECK_VERSION (1, 3, 8) button = katze_property_proxy (settings, "enable-webgl", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable WebGL support")); + #ifndef HAVE_WEBKIT2 + if (parent && MIDORI_IS_BROWSER (parent)) + { + GtkWidget* tab = midori_browser_get_current_tab (MIDORI_BROWSER (parent)); + WebKitWebView* web_view = midori_tab_get_web_view (MIDORI_TAB (tab)); + 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); + gchar* supports_web_gl = sokoke_js_script_eval (js_context, + "!!window.WebGLRenderingContext", NULL); + if (g_strcmp0 (supports_web_gl, "true")) + gtk_widget_set_sensitive (button, FALSE); + g_free (supports_web_gl); + } + #endif #else button = katze_property_proxy (settings, "enable-plugins", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable Netscape plugins")); @@ -396,15 +411,6 @@ gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups")); gtk_widget_set_tooltip_text (button, _("Whether scripts are allowed to open popup windows automatically")); SPANNED_ADD (button); - button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Middle click opens Selection")); - gtk_widget_set_tooltip_text (button, _("Load an address from the selection via middle click")); - INDENTED_ADD (button); - #ifndef G_OS_WIN32 - button = katze_property_proxy (settings, "flash-window-on-new-bg-tabs", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Flash window on background tabs")); - SPANNED_ADD (button); - #endif FRAME_NEW (NULL); button = gtk_label_new (_("Preferred languages")); @@ -421,18 +427,19 @@ /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing")); - if (!g_getenv ("DESKTOP_SESSION")) - { FRAME_NEW (NULL); - INDENTED_ADD (katze_property_label (settings, "toolbar-style")); + INDENTED_ADD (gtk_label_new (_("Toolbar Style:"))); button = katze_property_proxy (settings, "toolbar-style", NULL); SPANNED_ADD (button); - } FRAME_NEW (NULL); - label = katze_property_label (settings, "open-new-pages-in"); + label = gtk_label_new (_("Open new pages in:")); INDENTED_ADD (label); button = katze_property_proxy (settings, "open-new-pages-in", NULL); SPANNED_ADD (button); + label = gtk_label_new (_("New tab behavior:")); + INDENTED_ADD (label); + button = katze_property_proxy (settings, "new-tab-type", "custom-tabhome"); + SPANNED_ADD (button); button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Close Buttons on Tabs")); INDENTED_ADD (button); @@ -485,6 +492,27 @@ g_signal_connect (settings, "notify::proxy-type", G_CALLBACK (midori_preferences_notify_proxy_type_cb), entry); midori_preferences_notify_proxy_type_cb (settings, NULL, entry); + #if GLIB_CHECK_VERSION (2, 26, 0) + INDENTED_ADD (gtk_event_box_new ()); + label = gtk_label_new (NULL); + GString* proxy_types = g_string_new (NULL); + g_string_append (proxy_types, ""); + g_string_append (proxy_types, _("Supported proxy types:")); + g_string_append_c (proxy_types, ' '); + /* http is not implemented as a GIO extension */ + g_string_append (proxy_types, "http:// https://"); + GIOExtensionPoint* proxy_extension = g_io_extension_point_lookup ("gio-proxy"); + GList* proxies = g_io_extension_point_get_extensions (proxy_extension); + for (; proxies; proxies = g_list_next (proxies)) + g_string_append_printf (proxy_types, " %s://", g_io_extension_get_name (proxies->data)); + g_string_append (proxy_types, ""); + gtk_label_set_markup (GTK_LABEL (label), proxy_types->str); + g_string_free (proxy_types, TRUE); + SPANNED_ADD (label); + g_signal_connect (settings, "notify::proxy-type", + G_CALLBACK (midori_preferences_notify_proxy_type_cb), label); + midori_preferences_notify_proxy_type_cb (settings, NULL, label); + #endif #if WEBKIT_CHECK_VERSION (1, 3, 11) #ifndef HAVE_WEBKIT2 if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE)) @@ -501,7 +529,9 @@ } #endif #endif - label = katze_property_label (settings, "identify-as"); + /* i18n: This refers to an application, not the 'user agent' string */ + label = gtk_label_new (_("Identify as")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); INDENTED_ADD (label); button = katze_property_proxy (settings, "identify-as", "custom-user-agent"); SPANNED_ADD (button); diff -Nru midori-0.4.9/midori/midori-privatedata.c midori-0.5.0/midori/midori-privatedata.c --- midori-0.4.9/midori/midori-privatedata.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-privatedata.c 2013-04-04 20:31:20.000000000 +0000 @@ -28,10 +28,18 @@ #endif static void +#ifdef HAVE_GRANITE +midori_private_data_dialog_response_cb (GtkWidget* button, +#else midori_private_data_dialog_response_cb (GtkWidget* dialog, gint response_id, +#endif MidoriBrowser* browser) { + #ifdef HAVE_GRANITE + GtkWidget* dialog = gtk_widget_get_toplevel (button); + gint response_id = GTK_RESPONSE_ACCEPT; + #endif if (response_id == GTK_RESPONSE_ACCEPT) { GtkToggleButton* button; @@ -116,16 +124,32 @@ gint clear_prefs = MIDORI_CLEAR_NONE; g_object_get (settings, "clear-private-data", &clear_prefs, NULL); + #ifdef HAVE_GRANITE + /* FIXME: granite: should return GtkWidget* like GTK+ */ + dialog = (GtkWidget*)granite_widgets_light_window_new (_("Clear Private Data")); + /* FIXME: granite: should return GtkWidget* like GTK+ */ + content_area = (GtkWidget*)granite_widgets_decorated_window_get_box (GRANITE_WIDGETS_DECORATED_WINDOW (dialog)); + hbox = gtk_hbox_new (FALSE, 4); + gtk_box_pack_end (GTK_BOX (content_area), hbox, FALSE, FALSE, 4); + button = gtk_button_new_with_mnemonic (_("_Clear private data")); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_private_data_dialog_response_cb), browser); + #else /* i18n: Dialog: Clear Private Data, in the Tools menu */ dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"), GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL); - katze_widget_add_class (gtk_dialog_get_widget_for_response ( - GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT), "noundo"); + button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); + g_signal_connect (dialog, "response", + G_CALLBACK (midori_private_data_dialog_response_cb), browser); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + #endif + katze_widget_add_class (button, "noundo"); screen = gtk_widget_get_screen (GTK_WIDGET (browser)); if (screen) gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_CLEAR); @@ -168,8 +192,8 @@ } g_free (clear_data); gtk_container_add (GTK_CONTAINER (alignment), vbox); - gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 4); + gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 8); button = gtk_check_button_new_with_mnemonic (_("Clear private data when _quitting Midori")); if ((clear_prefs & MIDORI_CLEAR_ON_QUIT) == MIDORI_CLEAR_ON_QUIT) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); @@ -180,10 +204,6 @@ gtk_container_add (GTK_CONTAINER (alignment), button); gtk_box_pack_start (GTK_BOX (content_area), alignment, FALSE, FALSE, 0); gtk_widget_show_all (content_area); - - g_signal_connect (dialog, "response", - G_CALLBACK (midori_private_data_dialog_response_cb), browser); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); return dialog; } diff -Nru midori-0.4.9/midori/midori-searchaction.c midori-0.5.0/midori/midori-searchaction.c --- midori-0.4.9/midori/midori-searchaction.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-searchaction.c 2013-04-04 20:31:20.000000000 +0000 @@ -928,8 +928,10 @@ #endif active_element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument*)doc); - active_form = webkit_dom_html_input_element_get_form ((WebKitDOMHTMLInputElement*)active_element); + if (!WEBKIT_DOM_IS_HTML_INPUT_ELEMENT (active_element)) + return NULL; + active_form = webkit_dom_html_input_element_get_form ((WebKitDOMHTMLInputElement*)active_element); if (!active_form) return NULL; @@ -1000,18 +1002,18 @@ /* See midori_view_set_title: title can be first or last */ if (ellipsize == PANGO_ELLIPSIZE_END) { - item->name = g_strdup (parts[0]); - item->text = g_strdup (parts[1]); + katze_item_set_name (item, parts[0]); + katze_item_set_text (item, parts[1]); } else { - item->name = g_strdup (parts[1]); - item->text = g_strdup (parts[2]); + katze_item_set_name (item, parts[1]); + katze_item_set_text (item, parts[2]); } g_strfreev (parts); } else - item->name = g_strdup (title); + katze_item_set_name (item, title); g_free (token_element); return item; diff -Nru midori-0.4.9/midori/midori-session.c midori-0.5.0/midori/midori-session.c --- midori-0.4.9/midori/midori-session.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-session.c 2013-04-04 20:31:20.000000000 +0000 @@ -32,8 +32,12 @@ SoupURI* proxy_uri; /* soup_uri_new expects a non-NULL string with a protocol */ - if (midori_uri_is_http (uri)) + gchar* scheme = uri ? g_uri_parse_scheme (uri): NULL; + if (scheme) + { proxy_uri = soup_uri_new (uri); + g_free (scheme); + } else if (uri && *uri) { gchar* fixed_uri = g_strconcat ("http://", uri, NULL); @@ -367,7 +371,7 @@ KatzeArray* old_session = katze_array_new (KATZE_TYPE_ITEM); gchar* config_file = midori_paths_get_config_filename_for_reading ("session.old.xbel"); GError* error = NULL; - if (midori_array_from_file (old_session, config_file, "xbel", &error)) + if (midori_array_from_file (old_session, config_file, "xbel-tiny", &error)) { KatzeItem* item; KATZE_ARRAY_FOREACH_ITEM (item, old_session) @@ -375,8 +379,8 @@ } else { - g_warning (_("The session couldn't be loaded: %s\n"), error->message); - /* FIXME: Show a graphical dialog */ + sokoke_message_dialog (GTK_MESSAGE_ERROR, + _("The session couldn't be loaded: %s\n"), error->message, FALSE); g_error_free (error); } g_free (config_file); @@ -403,7 +407,7 @@ { gchar* config_file = midori_paths_get_config_filename_for_writing ("session.xbel"); GError* error = NULL; - if (!midori_array_to_file (session, config_file, "xbel", &error)) + if (!midori_array_to_file (session, config_file, "xbel-tiny", &error)) { g_warning (_("The session couldn't be saved. %s"), error->message); g_error_free (error); @@ -482,9 +486,9 @@ { item = katze_item_new (); if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) - katze_item_set_uri (item, "about:blank"); + katze_item_set_uri (item, "about:new"); else - item->uri = katze_object_get_string (settings, "homepage"); + katze_item_set_uri (item, "about:home"); katze_array_add_item (saved_session, item); g_object_unref (item); } @@ -510,16 +514,12 @@ if (midori_uri_is_blank (katze_item_get_uri (item))) midori_browser_activate_action (browser, "Location"); - if (open_uris != NULL) + guint i = 0; + for (i = 0; open_uris && open_uris[i]; i++) { - guint i = 0; - while (open_uris[i]) - { - gchar* uri = sokoke_prepare_uri (open_uris[i]); - midori_browser_add_uri (browser, uri); - g_free (uri); - i++; - } + gchar* uri = sokoke_magic_uri (open_uris[i], TRUE, TRUE); + midori_browser_add_uri (browser, uri); + g_free (uri); } g_object_unref (settings); diff -Nru midori-0.4.9/midori/midori-settings.vala midori-0.5.0/midori/midori-settings.vala --- midori-0.4.9/midori/midori-settings.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-settings.vala 2013-04-04 20:31:20.000000000 +0000 @@ -21,6 +21,12 @@ /* Since: 0.1.3 */ #if !HAVE_WEBKIT2 public class Settings : WebKit.WebSettings { + /* Since: 0.5.0 */ + public bool enable_javascript { get { + return enable_scripts; + } set { + enable_scripts = value; + } } #else public class Settings : WebKit.Settings { #endif @@ -102,7 +108,8 @@ public bool open_tabs_next_to_current { get; set; default = true; } public bool always_show_tabbar { get; set; default = true; } - public string homepage { get; set; default = "http://www.google.com"; } + public string homepage { get; set; default = "about:search"; } + public string tabhome { get; set; default = "about:dial"; } static string default_download_folder () { return Environment.get_user_special_dir (UserDirectory.DOWNLOAD) ?? Environment.get_home_dir (); diff -Nru midori-0.4.9/midori/midori-speeddial.vala midori-0.5.0/midori/midori-speeddial.vala --- midori-0.4.9/midori/midori-speeddial.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-speeddial.vala 2013-04-04 20:31:20.000000000 +0000 @@ -365,7 +365,7 @@ if (thumb_view == null) { thumb_view = new WebKit.WebView (); var settings = new WebKit.WebSettings (); - settings. set ("enable-scripts", false, + settings. set ("enable-javascript", false, "enable-plugins", false, "auto-load-images", true, "enable-html5-database", false, diff -Nru midori-0.4.9/midori/midori-tab.vala midori-0.5.0/midori/midori-tab.vala --- midori-0.4.9/midori/midori-tab.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-tab.vala 2013-04-04 20:31:20.000000000 +0000 @@ -57,6 +57,9 @@ public Security security { get; protected set; default = Security.NONE; } public LoadStatus load_status { get; protected set; default = LoadStatus.FINISHED; } public string? statusbar_text { get; protected set; default = null; } + /* Since: 0.5.0 */ + public Gdk.Color? fg_color { get; protected set; default = null; } + public Gdk.Color? bg_color { get; protected set; default = null; } private double current_progress = 0.0; public double progress { get { @@ -180,7 +183,7 @@ return Pango.EllipsizeMode.START; string[] parts = title.split (" "); - if (uri.has_suffix (parts[parts.length - 1].down ())) + if (parts[0] != null && uri.has_suffix (parts[parts.length - 1].down ())) return Pango.EllipsizeMode.START; return Pango.EllipsizeMode.END; @@ -221,14 +224,22 @@ } public bool find (string text, bool case_sensitive, bool forward) { -#if !HAVE_WEBKIT2 +#if HAVE_WEBKIT2 + var controller = web_view.get_find_controller (); + uint options = WebKit.FindOptions.WRAP_AROUND; + if (!case_sensitive) + options += WebKit.FindOptions.CASE_INSENSITIVE; + if (!forward) + options += WebKit.FindOptions.BACKWARDS; + controller.search (text, options, 0); + // FIXME: mark matches, count matches, not found + return true; +#else bool found = false; found = web_view.search_text (text, case_sensitive, forward, true); web_view.mark_text_matches (text, case_sensitive, 0); web_view.set_highlight_text_matches (true); return found; -#else - return false; #endif } } diff -Nru midori-0.4.9/midori/midori-view.c midori-0.5.0/midori/midori-view.c --- midori-0.4.9/midori/midori-view.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-view.c 2013-04-04 20:31:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2010 Christian Dywan + Copyright (C) 2007-2013 Christian Dywan Copyright (C) 2009 Jean-François Guchens This library is free software; you can redistribute it and/or @@ -476,6 +476,45 @@ } #if !WEBKIT_CHECK_VERSION (1, 3, 13) +static GdkPixbuf* +katze_pixbuf_new_from_buffer (const guchar* buffer, + gsize length, + const gchar* mime_type, + GError** error) +{ + /* Proposed for inclusion in GdkPixbuf + See http://bugzilla.gnome.org/show_bug.cgi?id=74291 */ + GdkPixbufLoader* loader; + GdkPixbuf* pixbuf; + + g_return_val_if_fail (buffer != NULL, NULL); + g_return_val_if_fail (length > 0, NULL); + + if (mime_type) + { + loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error); + if (!loader) + return NULL; + } + else + loader = gdk_pixbuf_loader_new (); + if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) + { + g_object_unref (loader); + return NULL; + } + if (!gdk_pixbuf_loader_close (loader, error)) + { + g_object_unref (loader); + return NULL; + } + + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); + g_object_ref (pixbuf); + g_object_unref (loader); + return pixbuf; +} + static void katze_net_object_maybe_unref (gpointer object) { @@ -566,7 +605,9 @@ GtkSettings* settings = gtk_widget_get_settings (view->web_view); gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &icon_width, &icon_height); GdkPixbuf* pixbuf = NULL; - #if WEBKIT_CHECK_VERSION (1, 8, 0) + #ifdef HAVE_WEBKIT2 + /* FIXME */ + #elif WEBKIT_CHECK_VERSION (1, 8, 0) if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf ( WEBKIT_WEB_VIEW (view->web_view), icon_width, icon_height))) midori_view_apply_icon (view, pixbuf, view->icon_uri); @@ -671,7 +712,7 @@ const gchar* uri = webkit_network_request_get_uri (request); if (g_str_has_prefix (uri, "geo:") && strstr (uri, ",")) { - gchar* new_uri = sokoke_magic_uri (uri); + gchar* new_uri = sokoke_magic_uri (uri, TRUE, FALSE); midori_view_set_uri (view, new_uri); g_free (new_uri); return TRUE; @@ -771,51 +812,36 @@ } #endif -#ifndef HAVE_WEBKIT2 static void -webkit_web_view_load_started_cb (WebKitWebView* web_view, - WebKitWebFrame* web_frame, - MidoriView* view) +midori_view_load_started (MidoriView* view) { midori_view_update_load_status (view, MIDORI_LOAD_PROVISIONAL); midori_tab_set_progress (MIDORI_TAB (view), 0.0); } -#endif #ifdef HAVE_GCR const gchar* midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags); #endif -#ifndef HAVE_WEBKIT2 static void -webkit_web_view_load_committed_cb (WebKitWebView* web_view, - WebKitWebFrame* web_frame, - MidoriView* view) +midori_view_load_committed (MidoriView* view) { - const gchar* uri; - GList* children; - - if (web_frame != webkit_web_view_get_main_frame (web_view)) - return; - #ifdef HAVE_GRANITE_CLUTTER GraniteWidgetsNavigationBox* navigation_box = midori_tab_get_navigation_box (MIDORI_TAB (view)); granite_widgets_navigation_box_transition_ready (navigation_box); #endif - g_object_freeze_notify (G_OBJECT (view)); - uri = webkit_web_frame_get_uri (web_frame); - g_return_if_fail (uri != NULL); katze_assign (view->icon_uri, NULL); - children = gtk_container_get_children (GTK_CONTAINER (view)); + GList* children = gtk_container_get_children (GTK_CONTAINER (view)); for (; children; children = g_list_next (children)) if (g_object_get_data (G_OBJECT (children->data), "midori-infobar-cb")) gtk_widget_destroy (children->data); g_list_free (children); view->alerts = 0; + const gchar* uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW (view->web_view)); if (g_strcmp0 (uri, katze_item_get_uri (view->item))) { midori_tab_set_uri (MIDORI_TAB (view), uri); @@ -832,14 +858,13 @@ if (!strncmp (uri, "https", 5)) { - #if defined (HAVE_LIBSOUP_2_29_91) - WebKitWebDataSource *source; - WebKitNetworkRequest *request; - SoupMessage *message; - - source = webkit_web_frame_get_data_source (web_frame); - request = webkit_web_data_source_get_request (source); - message = webkit_network_request_get_message (request); + #ifdef HAVE_WEBKIT2 + /* Not implemented */ + #elif defined (HAVE_LIBSOUP_2_29_91) + WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + WebKitWebDataSource* source = webkit_web_frame_get_data_source (web_frame); + WebKitNetworkRequest* request = webkit_web_data_source_get_request (source); + SoupMessage* message = webkit_network_request_get_message (request); if (message && soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED) @@ -886,9 +911,7 @@ view->find_links = -1; midori_view_update_load_status (view, MIDORI_LOAD_COMMITTED); - g_object_thaw_notify (G_OBJECT (view)); } -#endif static void webkit_web_view_progress_changed_cb (WebKitWebView* web_view, @@ -1309,14 +1332,20 @@ return FALSE; } -#ifndef HAVE_WEBKIT2 static gboolean webkit_web_view_load_error_cb (WebKitWebView* web_view, +#ifdef HAVE_WEBKIT2 + WebKitLoadEvent load_event, +#else WebKitWebFrame* web_frame, +#endif const gchar* uri, GError* error, MidoriView* view) { + #ifdef HAVE_WEBKIT2 + void* web_frame = NULL; + #endif gchar* title; gchar* message; gboolean result; @@ -1368,16 +1397,13 @@ } static void -webkit_web_view_load_finished_cb (WebKitWebView* web_view, - WebKitWebFrame* web_frame, - MidoriView* view) +midori_view_load_finished (MidoriView* view) { - g_object_freeze_notify (G_OBJECT (view)); - + #ifndef HAVE_WEBKIT2 midori_view_apply_scroll_position (view); - if (web_frame == webkit_web_view_get_main_frame (web_view)) { + WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); /* Icon: URI, News Feed: $URI|title, Search: :URI|title */ gchar* value = sokoke_js_script_eval (js_context, @@ -1468,21 +1494,94 @@ _midori_web_view_load_icon (view); #endif } + #endif midori_tab_set_progress (MIDORI_TAB (view), 1.0); midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); +} + +#ifdef HAVE_WEBKIT2 +static void +midori_view_web_view_crashed_cb (WebKitWebView* web_view, + MidoriView* view) +{ + const gchar* uri = webkit_web_view_get_uri (web_view); + gchar* title = g_strdup_printf (_("Oops - %s"), uri); + gchar* message = g_strdup_printf (_("Something went wrong with '%s'."), uri); + midori_view_display_error (view, uri, title, + message, "", _("Try again"), NULL); + g_free (message); + g_free (title); +} + +static void +midori_view_web_view_load_changed_cb (WebKitWebView* web_view, + WebKitLoadEvent load_event, + MidoriView* view) +{ + g_object_freeze_notify (G_OBJECT (view)); + + switch (load_event) + { + case WEBKIT_LOAD_STARTED: + midori_view_load_started (view); + break; + case WEBKIT_LOAD_REDIRECTED: + /* Not implemented */ + break; + case WEBKIT_LOAD_COMMITTED: + midori_view_load_committed (view); + break; + case WEBKIT_LOAD_FINISHED: + midori_view_load_finished (view); + break; + default: + g_warn_if_reached (); + } + + g_object_thaw_notify (G_OBJECT (view)); +} +#else +static void +midori_view_web_view_notify_load_status_cb (WebKitWebView* web_view, + GParamSpec* pspec, + MidoriView* view) +{ + g_object_freeze_notify (G_OBJECT (view)); + + switch (webkit_web_view_get_load_status (web_view)) + { + case WEBKIT_LOAD_PROVISIONAL: + midori_view_load_started (view); + break; + case WEBKIT_LOAD_COMMITTED: + midori_view_load_committed (view); + break; + case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT: + /* Not implemented */ + break; + case WEBKIT_LOAD_FINISHED: + case WEBKIT_LOAD_FAILED: + midori_view_load_finished (view); + break; + default: + g_warn_if_reached (); + } g_object_thaw_notify (G_OBJECT (view)); } #endif + #if WEBKIT_CHECK_VERSION (1, 1, 18) static void midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view, GParamSpec* pspec, MidoriView* view) { -#ifndef HAVE_WEBKIT2 +#ifdef HAVE_WEBKIT2 + /* TODO */ +#else const gchar* icon_uri = webkit_web_view_get_icon_uri (web_view); katze_assign (view->icon_uri, g_strdup (icon_uri)); _midori_web_view_load_icon (view); @@ -1526,11 +1625,22 @@ } static void -webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view, - const gchar* tooltip, - const gchar* link_uri, - MidoriView* view) +webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view, + #ifdef HAVE_WEBKIT2 + WebKitHitTestResult* hit_test_result, + guint modifiers, + #else + const gchar* tooltip, + const gchar* link_uri, + #endif + MidoriView* view) { + #ifdef HAVE_WEBKIT2 + if (!webkit_hit_test_result_context_is_link (hit_test_result)) + return; + const gchar* link_uri = webkit_hit_test_result_get_link_uri (hit_test_result); + #endif + #if !(WEBKIT_CHECK_VERSION (1, 3, 1) && defined (HAVE_LIBSOUP_2_29_91)) sokoke_prefetch_uri (view->settings, link_uri, NULL, NULL); #endif @@ -1676,7 +1786,7 @@ /* Hold Alt to search for the selected word */ if (event->state & GDK_MOD1_MASK) { - new_uri = sokoke_magic_uri (uri); + new_uri = sokoke_magic_uri (uri, TRUE, FALSE); if (!new_uri) { gchar* search = katze_object_get_string ( @@ -2053,8 +2163,11 @@ MidoriView* view) { gchar* uri = katze_object_get_string (view->hit_test, "image-uri"); - g_signal_emit (view, signals[NEW_TAB], 0, uri, - view->open_tabs_in_the_background); + if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW) + g_signal_emit (view, signals[NEW_WINDOW], 0, uri); + else + g_signal_emit (view, signals[NEW_TAB], 0, uri, + view->open_tabs_in_the_background); g_free (uri); } @@ -2201,7 +2314,7 @@ } else { - gchar* uri = sokoke_magic_uri (data); + gchar* uri = sokoke_magic_uri (data, TRUE, FALSE); if (!uri) uri = g_strdup (data); g_signal_emit (view, signals[NEW_TAB], 0, uri, @@ -2223,19 +2336,19 @@ midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, MidoriView* view) { - gchar* search; - gchar* uri; - - if ((search = g_object_get_data (G_OBJECT (widget), "search"))) - search = g_strdup (search); + const gchar* search = g_object_get_data (G_OBJECT (widget), "search"); + if (search == NULL) + search = midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings)); + gchar* uri = midori_uri_for_search (search, view->selected_text); + + if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW) + g_signal_emit (view, signals[NEW_WINDOW], 0, uri); + /* FIXME: need a way to override behavior (middle click) + else if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT) + midori_view_set_uri (view, uri); */ else - g_object_get (view->settings, "location-entry-search", - &search, NULL); - uri = midori_uri_for_search (search, view->selected_text); - g_free (search); - - g_signal_emit (view, signals[NEW_TAB], 0, uri, - view->open_tabs_in_the_background); + g_signal_emit (view, signals[NEW_TAB], 0, uri, + view->open_tabs_in_the_background); g_free (uri); } @@ -2538,7 +2651,10 @@ if (view->link_uri) gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ()); midori_view_insert_menu_item (menu_shell, -1, - _("Open _Image in New Tab"), STOCK_TAB_NEW, + view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW + ? _("Open _Image in New Window") + : _("Open _Image in New Tab") + , STOCK_TAB_NEW, G_CALLBACK (midori_web_view_menu_image_new_tab_activate_cb), widget); midori_view_insert_menu_item (menu_shell, -1, _("Copy Im_age"), NULL, @@ -2575,7 +2691,7 @@ window = gtk_widget_get_toplevel (GTK_WIDGET (web_view)); i = 0; - if (katze_object_has_property (window, "search-engines")) + if (MIDORI_IS_BROWSER (window)) search_engines = katze_object_get_object (window, "search-engines"); if (search_engines != NULL) @@ -3165,6 +3281,7 @@ #ifndef HAVE_WEBKIT2 /* Adjustments are not created initially, but overwritten later */ view->scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_NEVER); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view->scrolled_window), GTK_SHADOW_NONE); g_signal_connect (view->scrolled_window, "notify::hadjustment", @@ -3363,7 +3480,7 @@ MidoriWebSettings* settings) { MidoriView* view = g_object_new (MIDORI_TYPE_VIEW, - "title", item ? item->name : NULL, + "title", item ? katze_item_get_name (item) : NULL, NULL); if (settings) _midori_view_set_settings (view, settings); @@ -3409,7 +3526,7 @@ view->middle_click_opens_selection = g_value_get_boolean (&value); else if (name == g_intern_string ("open-tabs-in-the-background")) view->open_tabs_in_the_background = g_value_get_boolean (&value); - else if (name == g_intern_string ("enable-scripts")) + else if (name == g_intern_string ("enable-javascript")) { /* Speed dial is only editable with scripts, so regenerate it */ if (midori_view_is_blank (view)) @@ -3616,7 +3733,36 @@ view->web_view = GTK_WIDGET (midori_tab_get_web_view (MIDORI_TAB (view))); g_object_connect (view->web_view, - #ifndef HAVE_WEBKIT2 + #ifdef HAVE_WEBKIT2 + "signal::web-process-crashed", + midori_view_web_view_crashed_cb, view, + "signal::load-failed", + webkit_web_view_load_error_cb, view, + "signal::load-changed", + midori_view_web_view_load_changed_cb, view, + "signal::notify::estimated-load-progress", + webkit_web_view_progress_changed_cb, view, + "signal::notify::favicon", + midori_web_view_notify_icon_uri_cb, view, + "signal::mouse-target-changed", + webkit_web_view_hovering_over_link_cb, view, + #else + "signal::notify::load-status", + midori_view_web_view_notify_load_status_cb, view, + "signal::notify::progress", + webkit_web_view_progress_changed_cb, view, + "signal::script-alert", + midori_view_web_view_script_alert_cb, view, + "signal::window-object-cleared", + webkit_web_view_window_object_cleared_cb, view, + "signal::create-web-view", + webkit_web_view_create_web_view_cb, view, + "signal-after::mime-type-policy-decision-requested", + webkit_web_view_mime_type_decision_cb, view, + "signal::print-requested", + midori_view_web_view_print_requested_cb, view, + "signal-after::load-error", + webkit_web_view_load_error_cb, view, "signal::navigation-policy-decision-requested", midori_view_web_view_navigation_decision_cb, view, "signal::resource-request-starting", @@ -3627,24 +3773,14 @@ "signal::geolocation-policy-decision-requested", midori_view_web_view_geolocation_decision_cb, view, #endif - "signal::load-started", - webkit_web_view_load_started_cb, view, - "signal::load-committed", - webkit_web_view_load_committed_cb, view, - "signal::load-finished", - webkit_web_view_load_finished_cb, view, - #endif - #ifndef HAVE_WEBKIT2 - "signal::notify::progress", - webkit_web_view_progress_changed_cb, view, - #else - "signal::notify::estimated-load-progress", - webkit_web_view_progress_changed_cb, view, - #endif #if WEBKIT_CHECK_VERSION (1, 1, 18) "signal::notify::icon-uri", midori_web_view_notify_icon_uri_cb, view, #endif + "signal::hovering-over-link", + webkit_web_view_hovering_over_link_cb, view, + #endif + "signal::notify::uri", webkit_web_view_notify_uri_cb, view, "signal::notify::title", @@ -3653,8 +3789,6 @@ webkit_web_view_statusbar_text_changed_cb, view, "signal::leave-notify-event", midori_view_web_view_leave_notify_event_cb, view, - "signal::hovering-over-link", - webkit_web_view_hovering_over_link_cb, view, "signal::button-press-event", midori_view_web_view_button_press_event_cb, view, "signal::button-release-event", @@ -3667,24 +3801,8 @@ webkit_web_view_populate_popup_cb, view, "signal::console-message", webkit_web_view_console_message_cb, view, - #ifndef HAVE_WEBKIT2 - "signal::script-alert", - midori_view_web_view_script_alert_cb, view, - "signal::window-object-cleared", - webkit_web_view_window_object_cleared_cb, view, - "signal::create-web-view", - webkit_web_view_create_web_view_cb, view, - "signal-after::mime-type-policy-decision-requested", - webkit_web_view_mime_type_decision_cb, view, - #endif "signal::download-requested", webkit_web_view_download_requested_cb, view, - #ifndef HAVE_WEBKIT2 - "signal::print-requested", - midori_view_web_view_print_requested_cb, view, - "signal-after::load-error", - webkit_web_view_load_error_cb, view, - #endif NULL); if (view->settings) @@ -3716,6 +3834,7 @@ /* Overlays must be created before showing GtkOverlay as of GTK+ 3.2 */ { GtkWidget* frame = gtk_frame_new (NULL); + gtk_widget_set_no_show_all (frame, TRUE); view->overlay_label = gtk_label_new (NULL); gtk_widget_show (view->overlay_label); gtk_container_add (GTK_CONTAINER (frame), view->overlay_label); @@ -3927,12 +4046,15 @@ } static const gchar* valid_about_uris[] = { - "about:widgets", - "about:private", - "about:nodocs", - "http://.invalid", + "about:dial", "about:geolocation", + "about:home", + "about:new", + "about:nodocs", "about:paths", + "about:private", + "about:search", + "about:widgets", }; static void @@ -3963,6 +4085,7 @@ gchar* data; g_return_if_fail (MIDORI_IS_VIEW (view)); + g_return_if_fail (uri != NULL); if (!gtk_widget_get_parent (GTK_WIDGET (view))) g_warning ("Calling %s() before adding the view to a browser. This " @@ -3970,7 +4093,19 @@ if (!midori_debug ("unarmed")) { - if (!uri || !strcmp (uri, "") || !strcmp (uri, "about:blank")) + gchar* temporary_uri = NULL; + if (!strcmp (uri, "about:new")) + uri = midori_settings_get_tabhome (MIDORI_SETTINGS (view->settings)); + if (!strcmp (uri, "about:home")) + uri = midori_settings_get_homepage (MIDORI_SETTINGS (view->settings)); + if (!strcmp (uri, "about:search")) + { + uri = midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings)); + temporary_uri = midori_uri_for_search (uri, ""); + uri = temporary_uri; + } + + if (!strcmp (uri, "about:dial")) { MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view)); MidoriSpeedDial* dial = katze_object_get_object (browser, "speed-dial"); @@ -3982,13 +4117,13 @@ timer = g_timer_new (); #endif - midori_tab_set_uri (MIDORI_TAB (view), "about:blank"); + midori_tab_set_uri (MIDORI_TAB (view), uri); midori_tab_set_mime_type (MIDORI_TAB (view), "text/html"); katze_item_set_meta_string (view->item, "mime-type", "text/html"); katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED); html = dial != NULL ? midori_speed_dial_get_html (dial, NULL) : ""; - midori_view_set_html (view, html, NULL, NULL); + midori_view_set_html (view, html, uri, NULL); #ifdef G_ENABLE_DEBUG if (midori_debug ("startup")) @@ -4099,7 +4234,7 @@ { gchar* res_dir = midori_paths_get_res_filename (""); gchar* lib_dir = midori_paths_get_lib_path (PACKAGE_NAME); - data = g_strdup_printf ("

%s

" + data = g_markup_printf_escaped ("

%s

" "

config: %s

" "

res: %s

" "

lib: %s

" @@ -4128,12 +4263,12 @@ "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">" "", _("Version numbers in brackets show the version used at runtime.")); - midori_view_add_version (tmp, TRUE, g_strdup_printf ("Command line %s", + midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Command line %s", command_line)); midori_view_list_versions (tmp, TRUE); - midori_view_add_version (tmp, TRUE, g_strdup_printf ("Platform %s %s %s", + midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Platform %s %s %s", platform, sys_name, architecture ? architecture : "")); - midori_view_add_version (tmp, TRUE, g_strdup_printf ("Identification %s", + midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Identification %s", ident)); midori_view_add_version (tmp, TRUE, g_strdup_printf ("Video Formats %s", list_video_formats (view))); @@ -4149,7 +4284,9 @@ g_free (command_line); g_free (ident); - } + } + else if (!strcmp (uri, "about:blank")) + data = g_strdup (""); else { data = g_strdup_printf ( @@ -4182,10 +4319,8 @@ } else if (g_str_has_prefix (uri, "javascript:")) { - gboolean result; - gchar* exception; - - result = midori_view_execute_script (view, &uri[11], &exception); + gchar* exception = NULL; + gboolean result = midori_view_execute_script (view, &uri[11], &exception); if (!result) { sokoke_message_dialog (GTK_MESSAGE_ERROR, "javascript:", @@ -4207,6 +4342,7 @@ #endif webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view->web_view), uri); } + g_free (temporary_uri); } } @@ -4301,7 +4437,7 @@ * * Retrieves a string that is suitable for displaying. * - * Note that "about:blank" is represented as "". + * Note that "about:blank" and "about:dial" are represented as "". * * You can assume that the string is not %NULL. * @@ -4317,7 +4453,9 @@ uri = midori_tab_get_uri (MIDORI_TAB (view)); /* Something in the stack tends to turn "" into "about:blank". Yet for practical purposes we prefer "". */ - if (!strcmp (uri, "about:blank") || !strcmp (uri, "about:private")) + if (!strcmp (uri, "about:blank") + || !strcmp (uri, "about:dial") + || !strcmp (uri, "about:private")) return ""; return uri; @@ -4498,7 +4636,7 @@ for (; tabs; tabs = g_list_next (tabs)) { if (tabs->data != view) - gtk_widget_destroy (tabs->data); + midori_browser_close_tab (browser, tabs->data); } g_list_free (tabs); } @@ -5113,7 +5251,12 @@ g_return_if_fail (MIDORI_IS_VIEW (view)); if (midori_tab_is_blank (MIDORI_TAB (view))) - midori_view_set_uri (view, midori_tab_get_uri (MIDORI_TAB (view))); + { + /* Duplicate here because the URI pointer might change */ + gchar* uri = g_strdup (midori_tab_get_uri (MIDORI_TAB (view))); + midori_view_set_uri (view, uri); + g_free (uri); + } else if (from_cache) webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); else @@ -5579,3 +5722,20 @@ return MIDORI_VIEW (view); } +void +midori_view_set_colors (MidoriView* view, + GdkColor* fg_color, + GdkColor* bg_color) +{ + midori_tab_set_fg_color (MIDORI_TAB (view), fg_color); + midori_tab_set_bg_color (MIDORI_TAB (view), bg_color); + + GtkWidget* label = midori_view_get_proxy_tab_label (view); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), + fg_color != NULL || bg_color != NULL); + gtk_widget_modify_fg (label, GTK_STATE_NORMAL, fg_color); + gtk_widget_modify_fg (label, GTK_STATE_ACTIVE, fg_color); + gtk_widget_modify_bg (label, GTK_STATE_NORMAL, bg_color); + gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, bg_color); +} + diff -Nru midori-0.4.9/midori/midori-view.h midori-0.5.0/midori/midori-view.h --- midori-0.4.9/midori/midori-view.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-view.h 2013-04-04 20:31:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2013 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -243,6 +243,11 @@ GString* markup, gboolean html); +void +midori_view_set_colors (MidoriView* view, + GdkColor* fg_color, + GdkColor* bg_color); + G_END_DECLS #endif /* __MIDORI_VIEW_H__ */ diff -Nru midori-0.4.9/midori/midori-websettings.c midori-0.5.0/midori/midori-websettings.c --- midori-0.4.9/midori/midori-websettings.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-websettings.c 2013-04-04 20:31:20.000000000 +0000 @@ -33,12 +33,19 @@ #include #endif +#ifdef HAVE_WEBKIT2 +#define WEB_SETTINGS_STRING(x) "WebKitSettings::"x"" +#else +#define WEB_SETTINGS_STRING(x) "WebKitWebSettings::"x"" +#endif + struct _MidoriWebSettings { MidoriSettings parent_instance; MidoriToolbarStyle toolbar_style : 3; MidoriStartup load_on_startup : 2; + MidoriNewTabType new_tab_type: 3; MidoriPreferredEncoding preferred_encoding : 3; gint close_buttons_left; MidoriNewPage open_new_pages_in : 2; @@ -76,6 +83,7 @@ PROP_TOOLBAR_STYLE, PROP_LOAD_ON_STARTUP, + PROP_NEW_TAB, PROP_PREFERRED_ENCODING, PROP_CLOSE_BUTTONS_LEFT, @@ -115,6 +123,25 @@ } GType +midori_newtab_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_NEWTAB_BLANK_PAGE, "MIDORI_NEWTAB_BLANK_PAGE", N_("Show Blank Page") }, + { MIDORI_NEWTAB_HOMEPAGE, "MIDORI_NEWTAB_HOMEPAGE", N_("Show Homepage") }, + { MIDORI_NEWTAB_SEARCH, "MIDORI_NEWTAB_SEARCH", N_("Show default Search Engine") }, + { MIDORI_NEWTAB_SPEED_DIAL, "MIDORI_NEWTAB_SPEED_DIAL", N_("Show Speed Dial") }, + { MIDORI_NEWTAB_CUSTOM, "MIDORI_NEWTAB_CUSTOM", N_("Show custom page") }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriNewTabType", values); + }; + return type; +} + +GType midori_preferred_encoding_get_type (void) { static GType type = 0; @@ -128,7 +155,7 @@ { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") }, { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") }, { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") }, - { MIDORI_ENCODING_CUSTOM, "MIDORI_ENCODING_CUSTOM", N_("Custom...") }, + { MIDORI_ENCODING_CUSTOM, "MIDORI_ENCODING_CUSTOM", N_("Custom…") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriPreferredEncoding", values); @@ -204,7 +231,7 @@ { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") }, { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") }, { MIDORI_IDENT_EXPLORER, "MIDORI_IDENT_EXPLORER", N_("Internet Explorer") }, - { MIDORI_IDENT_CUSTOM, "MIDORI_IDENT_CUSTOM", N_("Custom...") }, + { MIDORI_IDENT_CUSTOM, "MIDORI_IDENT_CUSTOM", N_("Custom…") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriIdentity", values); @@ -277,7 +304,7 @@ PROP_TOOLBAR_STYLE, g_param_spec_enum ( "toolbar-style", - _("Toolbar Style:"), + "Toolbar Style:", _("The style of the toolbar"), MIDORI_TYPE_TOOLBAR_STYLE, MIDORI_TOOLBAR_DEFAULT, @@ -287,13 +314,23 @@ PROP_LOAD_ON_STARTUP, g_param_spec_enum ( "load-on-startup", - _("When Midori starts:"), + "When Midori starts:", "What to do when Midori starts", MIDORI_TYPE_STARTUP, MIDORI_STARTUP_LAST_OPEN_PAGES, flags)); g_object_class_install_property (gobject_class, + PROP_NEW_TAB, + g_param_spec_enum ( + "new-tab-type", + "New tab behavior:", + "What to show in newly opened tabs", + MIDORI_TYPE_NEWTAB, + MIDORI_NEWTAB_SPEED_DIAL, + flags)); + + g_object_class_install_property (gobject_class, PROP_PREFERRED_ENCODING, g_param_spec_enum ( "preferred-encoding", @@ -324,7 +361,7 @@ PROP_OPEN_NEW_PAGES_IN, g_param_spec_enum ( "open-new-pages-in", - _("Open new pages in:"), + "Open new pages in:", "Where to open new pages", MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, @@ -386,9 +423,8 @@ PROP_IDENTIFY_AS, g_param_spec_enum ( "identify-as", - /* i18n: This refers to an application, not the 'user agent' string */ - _("Identify as"), - _("What to identify as to web pages"), + "Identify as", + "What to identify as to web pages", MIDORI_TYPE_IDENTITY, MIDORI_IDENT_MIDORI, flags)); @@ -708,6 +744,27 @@ #endif } +static const gchar* +get_uri_for_new_tab (MidoriWebSettings* web_settings, + MidoriNewTabType new_tab_type) +{ + switch (new_tab_type) + { + case MIDORI_NEWTAB_BLANK_PAGE: + return "about:blank"; + case MIDORI_NEWTAB_HOMEPAGE: + return "about:home"; + case MIDORI_NEWTAB_SEARCH: + return "about:search"; + case MIDORI_NEWTAB_CUSTOM: + return midori_settings_get_tabhome (MIDORI_SETTINGS (web_settings)); + case MIDORI_NEWTAB_SPEED_DIAL: + return "about:dial"; + default: + g_assert_not_reached (); + } +} + static gchar* generate_ident_string (MidoriWebSettings* web_settings, MidoriIdentity identify_as) @@ -938,7 +995,7 @@ case PROP_ENABLE_PLUGINS: g_object_set (web_settings, - "WebKitWebSettings::enable-plugins", g_value_get_boolean (value), + WEB_SETTINGS_STRING ("enable-plugins"), g_value_get_boolean (value), #if WEBKIT_CHECK_VERSION (1, 1, 22) "enable-java-applet", g_value_get_boolean (value), #endif @@ -946,7 +1003,7 @@ break; #if WEBKIT_CHECK_VERSION (1, 1, 18) case PROP_ENABLE_PAGE_CACHE: - g_object_set (web_settings, "WebKitWebSettings::enable-page-cache", + g_object_set (web_settings, WEB_SETTINGS_STRING ("enable-page-cache"), g_value_get_boolean (value), NULL); break; #endif @@ -966,9 +1023,14 @@ case PROP_USER_AGENT: if (web_settings->identify_as == MIDORI_IDENT_CUSTOM) katze_assign (web_settings->ident_string, g_value_dup_string (value)); - g_object_set (web_settings, "WebKitWebSettings::user-agent", + g_object_set (web_settings, WEB_SETTINGS_STRING ("user-agent"), web_settings->ident_string, NULL); break; + case PROP_NEW_TAB: + web_settings->new_tab_type = g_value_get_enum (value); + const gchar* tabhome = get_uri_for_new_tab (web_settings, web_settings->new_tab_type); + midori_settings_set_tabhome (MIDORI_SETTINGS (web_settings), tabhome); + break; case PROP_PREFERRED_LANGUAGES: katze_assign (web_settings->http_accept_language, g_value_dup_string (value)); g_object_set (web_settings, "spell-checking-languages", @@ -1003,7 +1065,7 @@ midori_web_settings_remove_style (web_settings, "enforce-font-family"); break; case PROP_ENABLE_FULLSCREEN: - g_object_set (web_settings, "WebKitWebSettings::enable-fullscreen", + g_object_set (web_settings, WEB_SETTINGS_STRING ("enable-fullscreen"), g_value_get_boolean (value), NULL); break; case PROP_USER_STYLESHEET_URI: @@ -1098,12 +1160,12 @@ case PROP_ENABLE_PLUGINS: g_value_set_boolean (value, katze_object_get_boolean (web_settings, - "WebKitWebSettings::enable-plugins")); + WEB_SETTINGS_STRING ("enable-plugins"))); break; #if WEBKIT_CHECK_VERSION (1, 1, 18) case PROP_ENABLE_PAGE_CACHE: g_value_set_boolean (value, katze_object_get_boolean (web_settings, - "WebKitWebSettings::enable-page-cache")); + WEB_SETTINGS_STRING ("enable-page-cache"))); break; #endif @@ -1121,6 +1183,9 @@ } g_value_set_string (value, web_settings->ident_string); break; + case PROP_NEW_TAB: + g_value_set_enum (value, web_settings->new_tab_type); + break; case PROP_PREFERRED_LANGUAGES: g_value_set_string (value, web_settings->http_accept_language); break; @@ -1137,11 +1202,11 @@ break; case PROP_ENABLE_FULLSCREEN: g_value_set_boolean (value, katze_object_get_boolean (web_settings, - "WebKitWebSettings::enable-fullscreen")); + WEB_SETTINGS_STRING ("enable-fullscreen"))); break; case PROP_USER_STYLESHEET_URI: g_value_take_string (value, katze_object_get_string (web_settings, - "WebKitWebSettings::user-stylesheet-uri")); + WEB_SETTINGS_STRING ("user-stylesheet-uri"))); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1196,7 +1261,7 @@ /* data: uri prefix from Source/WebCore/page/Page.cpp:700 in WebKit */ encoded = g_strconcat ("data:text/css;charset=utf-8;base64,", css->str, NULL); - g_object_set (G_OBJECT (settings), "WebKitWebSettings::user-stylesheet-uri", encoded, NULL); + g_object_set (settings, WEB_SETTINGS_STRING ("user-stylesheet-uri"), encoded, NULL); g_free (encoded); g_string_free (css, TRUE); } @@ -1487,32 +1552,22 @@ { i = 0; while (_extensions[i]) - { - g_key_file_set_boolean (key_file, "extensions", _extensions[i], TRUE); - i++; - } + g_key_file_set_boolean (key_file, "extensions", _extensions[i++], TRUE); } else if (extensions) { KATZE_ARRAY_FOREACH_ITEM (extension, extensions) if (midori_extension_is_active (extension)) { - const gchar* filename = g_object_get_data ( - G_OBJECT (extension), "filename"); - - gchar* key; - gchar* term; - - key = katze_object_get_string (extension, "key"); - if (key && *key) - term = g_strdup_printf ("%s/%s", filename, key); - else - term = g_strdup (filename); - - g_key_file_set_boolean (key_file, "extensions", term, TRUE); - + const gchar* filename = g_object_get_data (G_OBJECT (extension), "filename"); + g_return_val_if_fail (filename != NULL, FALSE); + if (filename && strchr (filename, '/')) + g_warning ("%s: %s unexpected /", G_STRFUNC, filename); + gchar* key = katze_object_get_string (extension, "key"); + gchar* subname = key ? g_strdup_printf ("%s/%s", filename, key) : g_strdup (filename); + g_key_file_set_boolean (key_file, "extensions", subname, TRUE); g_free (key); - g_free (term); + g_free (subname); } g_object_unref (extensions); } diff -Nru midori-0.4.9/midori/midori-websettings.h midori-0.5.0/midori/midori-websettings.h --- midori-0.4.9/midori/midori-websettings.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori-websettings.h 2013-04-04 20:31:20.000000000 +0000 @@ -62,6 +62,21 @@ typedef enum { + MIDORI_NEWTAB_BLANK_PAGE, + MIDORI_NEWTAB_HOMEPAGE, + MIDORI_NEWTAB_SEARCH, + MIDORI_NEWTAB_SPEED_DIAL, + MIDORI_NEWTAB_CUSTOM, +} MidoriNewTabType; + +GType +midori_newtab_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_NEWTAB \ + (midori_newtab_get_type ()) + +typedef enum +{ MIDORI_ENCODING_CHINESE /* Traditional */, MIDORI_ENCODING_CHINESE_SIMPLIFIED, MIDORI_ENCODING_JAPANESE, diff -Nru midori-0.4.9/midori/midori.vapi midori-0.5.0/midori/midori.vapi --- midori-0.4.9/midori/midori.vapi 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/midori.vapi 2013-04-04 20:31:20.000000000 +0000 @@ -221,6 +221,7 @@ public WebSettings (); [NoAccessorMethod] public MidoriStartup load_on_startup { get; set; } + public static bool has_plugin_support (); } [CCode (cheader_filename = "midori/midori-websettings.h", cprefix = "MIDORI_STARTUP_")] diff -Nru midori-0.4.9/midori/sokoke.c midori-0.5.0/midori/sokoke.c --- midori-0.4.9/midori/sokoke.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/sokoke.c 2013-04-04 20:31:20.000000000 +0000 @@ -395,6 +395,22 @@ } void +sokoke_spawn_gdb (const gchar* gdb, + gboolean sync) +{ + gchar* args = midori_paths_get_command_line_str (FALSE); + const gchar* runtime_dir = midori_paths_get_runtime_dir (); + gchar* cmd = g_strdup_printf ( + "--batch -ex 'set print thread-events off' -ex run " + "-ex 'set logging on %s/%s' -ex 'bt' --return-child-result " + "--args %s", + runtime_dir, "gdb.bt", args); + sokoke_spawn_program (gdb, TRUE, cmd, FALSE, sync); + g_free (cmd); + g_free (args); +} + +void sokoke_spawn_app (const gchar* uri, gboolean private) { @@ -470,25 +486,6 @@ return info != NULL; } -gchar* -sokoke_prepare_uri (const gchar *uri) -{ - gchar* uri_ready; - - if (g_str_has_prefix (uri, "javascript:")) - return g_strdup (uri); - else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR) - && !g_path_is_absolute (uri)) - { - GFile* file = g_file_new_for_commandline_arg (uri); - uri_ready = g_file_get_uri (file); - g_object_unref (file); - return uri_ready; - } - - return sokoke_magic_uri (uri); -} - /** * sokoke_magic_uri: * @uri: a string typed by a user @@ -501,7 +498,9 @@ * Return value: a newly allocated URI, or %NULL **/ gchar* -sokoke_magic_uri (const gchar* uri) +sokoke_magic_uri (const gchar* uri, + gboolean allow_search, + gboolean allow_relative) { gchar** parts; gchar* search; @@ -511,6 +510,14 @@ /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) return g_filename_to_uri (uri, NULL, NULL); + if (allow_relative + && g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) + { + GFile* file = g_file_new_for_commandline_arg (uri); + gchar* uri_ready = g_file_get_uri (file); + g_object_unref (file); + return uri_ready; + } /* Parse geo URI geo:48.202778,16.368472;crs=wgs84;u=40 as a location */ if (!strncmp (uri, "geo:", 4)) { @@ -565,6 +572,8 @@ } g_strfreev (parts); } + if (!allow_search) + midori_error (_("Invalid URI")); return NULL; } diff -Nru midori-0.4.9/midori/sokoke.h midori-0.5.0/midori/sokoke.h --- midori-0.4.9/midori/sokoke.h 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/sokoke.h 2013-04-04 20:31:20.000000000 +0000 @@ -56,6 +56,10 @@ gboolean sync); void +sokoke_spawn_gdb (const gchar* gdb, + gboolean sync); + +void sokoke_spawn_app (const gchar* uri, gboolean inherit_config); @@ -63,10 +67,9 @@ sokoke_external_uri (const gchar* uri); gchar* -sokoke_prepare_uri (const gchar* uri); - -gchar* -sokoke_magic_uri (const gchar* uri); +sokoke_magic_uri (const gchar* uri, + gboolean allow_search, + gboolean allow_realtive); void sokoke_widget_set_visible (GtkWidget* widget, diff -Nru midori-0.4.9/midori/wscript_build midori-0.5.0/midori/wscript_build --- midori-0.4.9/midori/wscript_build 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/midori/wscript_build 2013-04-04 20:31:20.000000000 +0000 @@ -20,11 +20,9 @@ if progressive: obj = bld.new_task_gen ('cc', 'staticlib') obj.target = 'midori-core' - obj.includes = '.. ../katze . ../toolbars' - obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', excludes=['main.c']) + obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', exts=['.vala']) + obj.env.append_value ('CCFLAGS', '-w') obj.uselib = libs - obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') - obj.install_path = None obj.vapi_dirs = '../midori ../katze' obj.packages = 'glib-2.0 gmodule-2.0 gio-2.0 libsoup-2.4 posix sqlite3' if bld.env['HAVE_WEBKIT2']: @@ -37,6 +35,17 @@ obj.packages += ' gtk+-2.0' if bld.env['HAVE_GRANITE']: obj.packages += ' clutter-gtk-1.0 granite' + obj.install_path = None + bld.add_group () + + obj = bld.new_task_gen ('cc', 'staticlib') + obj.target = 'midori-c' + obj.includes = '.. ../katze . ../toolbars' + obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', exts=['.c'], excludes=['main.c']) + obj.uselib = libs + obj.uselib_local = 'midori-core' + obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') + obj.install_path = None bld.add_group () obj = bld.new_task_gen ('cc', 'program') @@ -44,6 +53,6 @@ obj.includes = '.. ../katze . ../panels' obj.source = './main.c' obj.uselib = libs - obj.uselib_local = 'midori-core' + obj.uselib_local = 'midori-c' if bld.env['WINRC']: obj.source += ' ../data/midori.rc' diff -Nru midori-0.4.9/panels/midori-extensions.c midori-0.5.0/panels/midori-extensions.c --- midori-0.4.9/panels/midori-extensions.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/panels/midori-extensions.c 2013-04-04 20:31:20.000000000 +0000 @@ -432,6 +432,29 @@ return ret; } +static gboolean +extensions_column_search_equal_func (GtkTreeModel* model, + gint column, + const gchar* key, + GtkTreeIter* iter, + gpointer search_data) +{ + MidoriExtension* extension; + gchar* name; + gchar* lower; + gboolean match; + + gtk_tree_model_get (model, iter, 0, &extension, -1); + name = katze_object_get_string (extension, "name"); + lower = g_utf8_strdown (name, -1); + match = !strstr (lower, key); + + g_free (lower); + g_free (name); + + return match; +} + static void midori_extensions_init (MidoriExtensions* extensions) { @@ -494,6 +517,9 @@ "signal::row-activated", midori_extensions_treeview_row_activated_cb, extensions, NULL); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (extensions->treeview), 0); + gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (extensions->treeview), + extensions_column_search_equal_func, NULL, NULL); gtk_widget_show (extensions->treeview); gtk_box_pack_start (GTK_BOX (extensions), extensions->treeview, TRUE, TRUE, 0); } diff -Nru midori-0.4.9/po/POTFILES.in midori-0.5.0/po/POTFILES.in --- midori-0.4.9/po/POTFILES.in 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/POTFILES.in 2013-04-04 20:31:20.000000000 +0000 @@ -63,7 +63,7 @@ extensions/web-cache.c katze/katze-net.c katze/midori-hsts.vala -katze/katze-separatoraction.c +katze/katze-separatoraction.vala katze/gtk3-compat.c katze/katze-http-cookies-sqlite.c katze/katze-http-cookies.c diff -Nru midori-0.4.9/po/bg.po midori-0.5.0/po/bg.po --- midori-0.4.9/po/bg.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/bg.po 2013-04-04 20:31:20.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: midori 0.2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-04 06:03+0000\n" -"PO-Revision-Date: 2013-02-04 10:29+0200\n" +"POT-Creation-Date: 2013-03-23 12:15+0000\n" +"PO-Revision-Date: 2013-03-23 18:36+0200\n" "Last-Translator: Kiril Kirilov (Cybercop) \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -26,10 +26,11 @@ msgstr "Интернет;WWW;Търсачка" #: ../data/midori.desktop.in.h:3 -#: ../midori/main.c:138 -#: ../midori/main.c:151 +#: ../midori/main.c:162 #: ../midori/midori-app.c:1443 -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3856 +#: ../midori/sokoke.c:561 msgid "Midori" msgstr "Midori" @@ -42,12 +43,12 @@ msgstr "Нов прозорец за поверително сърфиране" #: ../data/midori.desktop.in.h:6 -#: ../midori/midori-browser.c:1268 +#: ../midori/midori-browser.c:1316 msgid "New Tab" msgstr "Нов раздел" #: ../data/midori.desktop.in.h:7 -#: ../midori/midori-browser.c:1265 +#: ../midori/midori-browser.c:1313 msgid "New Window" msgstr "Нов прозорец" @@ -57,303 +58,315 @@ #: ../data/midori-private.desktop.in.h:1 msgid "Midori Private Browsing" -msgstr "Мидори (поверителенхх режим)" +msgstr "Мидори (поверителен режим)" #: ../data/midori-private.desktop.in.h:2 msgid "Open a new private browsing window" msgstr "Отваряне на нов прозорец за поверително сърфиране" #: ../data/midori-private.desktop.in.h:3 -#: ../midori/midori-view.c:3925 +#: ../midori/midori-view.c:4176 msgid "Private Browsing" msgstr "Поверителен режим на сърфиране" -#: ../midori/main.c:62 +#: ../midori/main.c:63 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "Снимките са съранени в: %s\n" +msgstr "Снимките са съхранени в: %s\n" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "Run ADDRESS as a web application" msgstr "Стартиране на АДРЕС като уеб приложение" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "Use FOLDER as configuration folder" msgstr "Използвай ПАПКА като лична папка" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "Private browsing, no changes are saved" msgstr "Поверителен режим, промените не могат да бъдат запазени" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "Portable mode, all runtime files are stored in one place" msgstr "Мобилен режим. Всички изпълними файлове се съхраняват на едно място." -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" msgstr "Обикновен GTK+ прозорец с WebKit, от рода на GtkСтартер" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "Show a diagnostic dialog" msgstr "Показване на диалог за диагностика" -#: ../midori/main.c:101 +#: ../midori/main.c:104 +msgid "Run within gdb and save a backtrace on crash" +msgstr "Стартирай без gdb и запази доклад за грешка" + +#: ../midori/main.c:106 msgid "Run the specified filename as javascript" msgstr "Изпълнение на зададеният файл като javascript" -#: ../midori/main.c:103 +#: ../midori/main.c:108 msgid "Take a snapshot of the specified URI" msgstr "Направете снимка на посочения URI" -#: ../midori/main.c:105 +#: ../midori/main.c:110 msgid "Execute the specified command" msgstr "Изпълнение на зададената команда" -#: ../midori/main.c:107 +#: ../midori/main.c:112 msgid "List available commands to execute with -e/ --execute" msgstr "Показване на списък с наличните команди за -e/ --execute" -#: ../midori/main.c:109 +#: ../midori/main.c:114 msgid "Display program version" msgstr "Показване на версията на програмата" -#: ../midori/main.c:111 +#: ../midori/main.c:116 msgid "Addresses" msgstr "Адреси" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокиране на URI по ШАБЛОН (регулярен израз)" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Рестартиране на Midori след СЕКУНДИ секунди бездействие" -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "SECONDS" msgstr "СЕКУНДИ" -#: ../midori/main.c:152 +#: ../midori/main.c:155 +#, c-format +msgid "Error: \"gdb\" can't be found\n" +msgstr "Грешка: \"gdb\" не може да бъде намерен\n" + +#: ../midori/main.c:182 msgid "Please report comments, suggestions and bugs to:" msgstr "Моля, докладвайте коментари, съобщения и грешки на:" -#: ../midori/main.c:154 +#: ../midori/main.c:184 msgid "Check for new versions at:" msgstr "Проверка за нова версия на:" -#: ../midori/main.c:299 +#: ../midori/main.c:378 msgid "An unknown error occured" msgstr "Неизвестна грешка" -#: ../midori/midori-app.c:1129 -#: ../midori/midori-browser.c:524 +#: ../midori/midori-app.c:1128 +#: ../midori/midori-browser.c:569 #, c-format msgid "Unexpected action '%s'." msgstr "Неочаквано действие '%s'." -#: ../midori/midori-app.c:1351 +#: ../midori/midori-app.c:1350 #: ../midori/midori-browser.c:6070 msgid "_Bookmarks" msgstr "Отметки" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1351 msgid "Add Boo_kmark" msgstr "Добавяне на отметка" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1352 msgid "_Extensions" msgstr "Разширения" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 +#: ../midori/midori-app.c:1353 #: ../midori/midori-privatedata.c:153 msgid "_History" msgstr "История" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1354 msgid "_Userscripts" msgstr "Потребителски скриптове" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1355 msgid "User_styles" msgstr "Потребителски стилове" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1356 msgid "New _Tab" msgstr "Нов раздел" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1357 msgid "_Transfers" msgstr "Трансфери" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1358 msgid "Netscape p_lugins" msgstr "Плъгини за Netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1359 msgid "_Closed Tabs" msgstr "Затваряне на раздел" -#: ../midori/midori-app.c:1361 +#: ../midori/midori-app.c:1360 #: ../midori/midori-browser.c:5209 msgid "New _Window" msgstr "Нов прозорец" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1361 msgid "New _Folder" msgstr "Нова папка" -#: ../midori/midori-app.c:1417 -#: ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1416 +#: ../midori/midori-app.c:1419 +#: ../midori/midori-app.c:1422 msgid "[Addresses]" msgstr "[Адреси]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:524 msgid "File not found." msgstr "Файлът не е намерен." -#: ../midori/midori-array.c:547 -#: ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 -#: ../midori/midori-array.c:619 +#: ../midori/midori-array.c:549 +#: ../midori/midori-array.c:588 +#: ../midori/midori-array.c:612 +#: ../midori/midori-array.c:622 msgid "Malformed document." msgstr "Лошо оформен документ." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:631 msgid "Unrecognized bookmark format." msgstr "Неизвестен формат на отметката." -#: ../midori/midori-array.c:915 -msgid "Writing failed." -msgstr "Грешка при запис." - -#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:335 #: ../midori/midori-browser.c:5345 msgid "Go forward to the next page" msgstr "Напред към следващата страница" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #: ../midori/midori-browser.c:5353 #: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" msgstr "Напред към следващата подстраница" -#: ../midori/midori-browser.c:431 +#: ../midori/midori-browser.c:447 #: ../midori/midori-browser.c:5294 #: ../midori/midori-browser.c:5303 msgid "Reload the current page" msgstr "Обновяване на текущата страница" -#: ../midori/midori-browser.c:439 +#: ../midori/midori-browser.c:455 #: ../midori/midori-browser.c:5300 msgid "Stop loading the current page" msgstr "Прекратяване на зареждането на текущата страница" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Не може да бъде обновено заглавие: %s\n" -#: ../midori/midori-browser.c:604 +#: ../midori/midori-browser.c:562 +#: ../midori/midori-browser.c:565 +#: ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Стойността '%s' не е валидна за %s" + +#: ../midori/midori-browser.c:645 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Сърфиране в поверителен режим)" -#: ../midori/midori-browser.c:714 -#: ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:755 +#: ../midori/midori-browser.c:797 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Отметки" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:851 msgid "New folder" msgstr "Нова папка" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:851 msgid "Edit folder" msgstr "Редактиране на папка" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:853 msgid "New bookmark" msgstr "Нова отметка" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:853 msgid "Edit bookmark" msgstr "Редактиране на отметка" -#: ../midori/midori-browser.c:846 +#: ../midori/midori-browser.c:887 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Изберете името на отметката и мястото, където да се съхранява." -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:943 msgid "Add to _Speed Dial" msgstr "Добавяне в бързият избор" -#: ../midori/midori-browser.c:908 +#: ../midori/midori-browser.c:949 msgid "Show in the tool_bar" msgstr "Показване в лентата с инструменти" -#: ../midori/midori-browser.c:916 +#: ../midori/midori-browser.c:957 msgid "Run as _web application" msgstr "Стартиране като уеб приложение" -#: ../midori/midori-browser.c:1026 -#: ../midori/midori-browser.c:4447 +#: ../midori/midori-browser.c:1073 +#: ../midori/midori-browser.c:4452 msgid "Save file as" msgstr "Запазване на файла като" -#: ../midori/midori-browser.c:1036 +#: ../midori/midori-browser.c:1083 msgid "Save associated _resources" msgstr "Запазване на асоциираните ресурси" -#: ../midori/midori-browser.c:1265 +#: ../midori/midori-browser.c:1313 msgid "A new window has been opened" msgstr "Отворен е нов прозорец" -#: ../midori/midori-browser.c:1268 +#: ../midori/midori-browser.c:1316 msgid "A new tab has been opened" msgstr "Отворен е нов раздел" -#: ../midori/midori-browser.c:1285 +#: ../midori/midori-browser.c:1334 msgid "Error opening the image!" msgstr "Грешка при отварянена изображението!" -#: ../midori/midori-browser.c:1286 +#: ../midori/midori-browser.c:1335 msgid "Can not open selected image in a default viewer." msgstr "Не може да бъде отворено избраното изображение с програмата за преглед по подразбиране." -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1341 msgid "Error downloading the image!" msgstr "Грешка при сваляне на изображението!" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1342 msgid "Can not download selected image." msgstr "Не може да бъде свалено избраното изображение." -#: ../midori/midori-browser.c:1350 +#: ../midori/midori-browser.c:1401 msgid "Save file" msgstr "Запазване на файл" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2373 msgid "Open file" msgstr "Отваряне на файл" -#: ../midori/midori-browser.c:2444 +#: ../midori/midori-browser.c:2501 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -361,130 +374,130 @@ "За да използвате данните от URI, отворете програмата за четене на новини. Това обикновено е лента от менюто или бутон с име \"Нов абонамент\", \"Нова емисия новини\" или нещо подобно.\n" "От настройките на Midori също можете да зададете програма за четене на новини. В такъв случай, следващият път, когато кликнете въру иконата за емисия новини, тя ще бъде добавена автоматично." -#: ../midori/midori-browser.c:2450 +#: ../midori/midori-browser.c:2507 #: ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Нова емисия" -#: ../midori/midori-browser.c:2485 +#: ../midori/midori-browser.c:2539 #: ../midori/midori-browser.c:5369 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Добавяне на нова отметка" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3065 #: ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Празно" -#: ../midori/midori-browser.c:3404 -#: ../midori/midori-browser.c:3405 +#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3448 msgid "Toggle text cursor navigation" msgstr "Режим на превключване на текста с помощта на показалеца" -#: ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3450 msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites." msgstr "Натиснете F7 за да превключи преместването на показалеца при сърфиране. Когато е включен, показалецът ще се вижда във всички страници." -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3453 msgid "_Enable Caret Browsing" msgstr "Преместване на показалеца." -#: ../midori/midori-browser.c:3851 +#: ../midori/midori-browser.c:3869 #: ../midori/midori-browser.c:5817 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не може да бъде добавена нова история за елемент: %s\n" -#: ../midori/midori-browser.c:4179 -#: ../panels/midori-bookmarks.c:840 -#: ../panels/midori-history.c:797 +#: ../midori/midori-browser.c:4184 +#: ../panels/midori-bookmarks.c:835 +#: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Отваряне на всички в раздели" -#: ../midori/midori-browser.c:4186 -#: ../panels/midori-bookmarks.c:846 -#: ../panels/midori-history.c:803 -#: ../extensions/feed-panel/feed-panel.c:519 +#: ../midori/midori-browser.c:4191 +#: ../panels/midori-bookmarks.c:841 +#: ../panels/midori-history.c:799 +#: ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Отваряне в нов раздел" -#: ../midori/midori-browser.c:4189 -#: ../midori/midori-view.c:2633 -#: ../midori/midori-view.c:4431 -#: ../panels/midori-bookmarks.c:848 -#: ../panels/midori-history.c:805 -#: ../extensions/feed-panel/feed-panel.c:521 +#: ../midori/midori-browser.c:4194 +#: ../midori/midori-view.c:2771 +#: ../midori/midori-view.c:4654 +#: ../panels/midori-bookmarks.c:843 +#: ../panels/midori-history.c:801 +#: ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Отваряне в нов прозорец" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4283 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4284 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4280 +#: ../midori/midori-browser.c:4285 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4286 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4287 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4283 +#: ../midori/midori-browser.c:4288 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4284 +#: ../midori/midori-browser.c:4289 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:4307 msgid "Import bookmarks…" msgstr "Внасяне на отметки…" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4310 #: ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "Внасяне на отметки" -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4321 msgid "_Application:" msgstr "Програма:" -#: ../midori/midori-browser.c:4381 +#: ../midori/midori-browser.c:4386 msgid "Import from XBEL or HTML file" msgstr "Внасяне от файл XBEL или HTML" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4414 msgid "Import from a file" msgstr "Внасяне от файл" -#: ../midori/midori-browser.c:4421 +#: ../midori/midori-browser.c:4426 msgid "Failed to import bookmarks" msgstr "Не може да бъде внесена отметка" -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4457 msgid "XBEL Bookmarks" msgstr "Отметки XBEL" -#: ../midori/midori-browser.c:4457 +#: ../midori/midori-browser.c:4462 msgid "Netscape Bookmarks" msgstr "Отметки Netscape" -#: ../midori/midori-browser.c:4471 +#: ../midori/midori-browser.c:4476 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Midori може да запазва отметки само във формати XBEL (*.xbel) и Netscape (*.html)" -#: ../midori/midori-browser.c:4486 +#: ../midori/midori-browser.c:4491 msgid "Failed to export bookmarks" msgstr "Не могат да бъдат изнесени отметки" @@ -494,7 +507,7 @@ #: ../midori/midori-browser.c:4708 msgid "See about:version for version info." -msgstr "Вижте за:version за получаване на информация за текущата версия." +msgstr "Вижте:version за получаване на информация за текущата версия." #: ../midori/midori-browser.c:4710 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." @@ -793,17 +806,17 @@ msgstr "Лента на състоянието" #: ../midori/midori-browser.c:5464 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "Автоматично" #: ../midori/midori-browser.c:5467 -#: ../midori/midori-websettings.c:124 +#: ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Китайска традиционна (Big5)" #: ../midori/midori-browser.c:5470 -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Китайска опростена (GB18030)" @@ -813,26 +826,29 @@ msgstr "Японска (SHIFT__JIS)" #: ../midori/midori-browser.c:5477 -#: ../midori/midori-websettings.c:127 +#: ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Корейска (EUC-KR)" #: ../midori/midori-browser.c:5480 -#: ../midori/midori-websettings.c:128 +#: ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Руска (KOI8-R)" #: ../midori/midori-browser.c:5483 -#: ../midori/midori-websettings.c:129 +#: ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" #: ../midori/midori-browser.c:5486 -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Западно-европейска (ISO-8859-1)" #: ../midori/midori-browser.c:5489 +#: ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 +#: ../katze/katze-utils.c:603 msgid "Custom…" msgstr "Потребителски избор…" @@ -865,8 +881,8 @@ msgstr "Показване на запазените отметки" #: ../midori/midori-browser.c:6105 -msgid "_Window" -msgstr "Прозорец" +msgid "_Tabs" +msgstr "Раздели" #: ../midori/midori-browser.c:6107 msgid "Show a list of all open tabs" @@ -880,7 +896,7 @@ msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6903 +#: ../midori/midori-browser.c:6892 #, c-format msgid "Unexpected setting '%s'" msgstr "Неочаквана настройка '%s'" @@ -914,7 +930,7 @@ #: ../midori/midori-locationaction.c:1366 msgid "The certificate has expired" -msgstr "Срокът на действиена сертификата е изтекъл." +msgstr "Срокът на действие на сертификата е изтекъл." #: ../midori/midori-locationaction.c:1368 msgid "The certificate has been revoked according to the GTlsConnection's certificate revocation list." @@ -922,38 +938,38 @@ #: ../midori/midori-locationaction.c:1370 msgid "The certificate's algorithm is considered insecure." -msgstr "Алкоритъмът, използван в сертификата не се смята за безопасен." +msgstr "Алгоритъмът, използван в сертификата не се смята за безопасен." #: ../midori/midori-locationaction.c:1372 msgid "Some other error occurred validating the certificate." msgstr "Появиха се други грешки при проверка на сертификата." -#: ../midori/midori-locationaction.c:1419 +#: ../midori/midori-locationaction.c:1420 msgid "_Export certificate" msgstr "Изнасяне на сертификат." -#: ../midori/midori-locationaction.c:1434 +#: ../midori/midori-locationaction.c:1435 msgid "Self-signed" msgstr "Самоподписан" -#: ../midori/midori-locationaction.c:1468 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Подробности за безопасност" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1555 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Поставете и продължете" -#: ../midori/midori-locationaction.c:1787 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Не е проверено" -#: ../midori/midori-locationaction.c:1795 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Проверена и защитена връзка" -#: ../midori/midori-locationaction.c:1802 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Отваряне, незащитена връзка" @@ -962,7 +978,7 @@ #: ../midori/midori-panel.c:480 #: ../midori/midori-panel.c:483 msgid "Align sidepanel to the right" -msgstr "Разполагане на страничният панел в дясно" +msgstr "Разполагане на страничният панел вдясно" #: ../midori/midori-panel.c:326 #: ../midori/midori-panel.c:327 @@ -972,399 +988,385 @@ #: ../midori/midori-panel.c:481 #: ../midori/midori-panel.c:484 msgid "Align sidepanel to the left" -msgstr "Разполагане на страничният панел в ляво" +msgstr "Разполагане на страничният панел вляво" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 +#: ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Показване на бързо стартиране" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 +#: ../midori/midori-websettings.c:133 msgid "Show Homepage" -msgstr "Показване на Домашната папка" +msgstr "Показване на Домашната страница" -#: ../midori/midori-websettings.c:108 -#: ../midori/midori-frontend.c:339 +#: ../midori/midori-websettings.c:116 +#: ../midori/midori-frontend.c:344 msgid "Show last open tabs" msgstr "Показване на последните отворени раздели" -#: ../midori/midori-websettings.c:109 -#: ../midori/midori-frontend.c:338 +#: ../midori/midori-websettings.c:117 +#: ../midori/midori-frontend.c:343 msgid "Show last tabs without loading" msgstr "Показване на последните раздели без зареждане" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Покажи празна страница" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Покажи търсачката по подразбиране" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Покажи потребителска страница" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Японска (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 -#: ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Потребителска…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Нов раздел" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Нов прозорец" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Текущ раздел" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "По подразбиране" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Икони" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Малки икони" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Икони и текст" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Текст до иконите" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Автоматично (GNOME или поддържаната)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "Прокси-сървър HTTP" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Без прокси-сървър" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Стил на лентата с инструменти:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Стилът на лентата с инструменти" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "При стартиране на Midori:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Отваряне на нова страница в:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Идентифициране като" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Как да се идентифицират като уеб страници" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Винаги да се използва избран от мен шрифт" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "Замяна на шрифтовете, зададени от уебсайтовете с предпочитани от потребителя" -#: ../midori/midori-websettings.c:1305 -#: ../midori/midori-websettings.c:1311 +#: ../midori/midori-websettings.c:1375 +#: ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не може да бъде заредена конфигурацията: %s\n" -#: ../midori/midori-websettings.c:1360 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Стойността '%s' не е валидна за %s" - -#: ../midori/midori-websettings.c:1365 -#: ../midori/midori-websettings.c:1476 +#: ../midori/midori-websettings.c:1435 +#: ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Невалидна стойност на конфигурация '%s'" -#: ../midori/midori-tab.vala:117 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Не може да бъде внесен стил на страница: %s" -#: ../midori/midori-view.c:725 -#: ../midori/midori-view.c:866 +#: ../midori/midori-view.c:767 +#: ../midori/midori-view.c:895 msgid "Trust this website" msgstr "Довери се на този сайт" -#: ../midori/midori-view.c:864 +#: ../midori/midori-view.c:893 msgid "Security unknown" msgstr "Неизвестно равнище на сигурност" -#: ../midori/midori-view.c:1162 +#: ../midori/midori-view.c:1194 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s иска достъп до базата данни на HTML5." -#: ../midori/midori-view.c:1166 #: ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1230 msgid "_Deny" -msgstr "Забрана" +msgstr "Отказване" -#: ../midori/midori-view.c:1166 #: ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1230 msgid "_Allow" -msgstr "Разрешаване" +msgstr "Позволяване" -#: ../midori/midori-view.c:1194 +#: ../midori/midori-view.c:1226 #, c-format msgid "%s wants to know your location." msgstr "%s иска да научи вашето местоположение." -#: ../midori/midori-view.c:1305 +#: ../midori/midori-view.c:1357 #, c-format msgid "Error - %s" msgstr "Грешка — %s" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1358 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Страницата '%s' не може да бъде заредена." -#: ../midori/midori-view.c:1308 +#: ../midori/midori-view.c:1360 msgid "Try again" msgstr "Нов опит" -#: ../midori/midori-view.c:1507 -#: ../midori/midori-view.c:2574 +#: ../midori/midori-view.c:1620 +#: ../midori/midori-view.c:2712 #, c-format msgid "Send a message to %s" -msgstr "Изпращане на съобщение %s" +msgstr "Изпращане на съобщение на %s" -#: ../midori/midori-view.c:2362 +#: ../midori/midori-view.c:2497 msgid "Add _search engine..." msgstr "Добавяне на търсачка..." -#: ../midori/midori-view.c:2405 -#: ../midori/midori-view.c:2709 +#: ../midori/midori-view.c:2540 +#: ../midori/midori-view.c:2847 msgid "Inspect _Element" -msgstr "Изследване на елемент" +msgstr "Проверка на елемент" -#: ../midori/midori-view.c:2457 +#: ../midori/midori-view.c:2592 msgid "Open Link in New _Tab" msgstr "Отваряне на връзката в нов раздел" -#: ../midori/midori-view.c:2461 +#: ../midori/midori-view.c:2596 msgid "Open Link in _Foreground Tab" msgstr "Отваряне на връзката в раздел на преден план" -#: ../midori/midori-view.c:2462 +#: ../midori/midori-view.c:2597 msgid "Open Link in _Background Tab" msgstr "Отваряне на връзката в раздел на заден план" -#: ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2600 msgid "Open Link in New _Window" msgstr "Отваряне на връзката в нов прозорец" -#: ../midori/midori-view.c:2468 +#: ../midori/midori-view.c:2603 msgid "Open Link as Web A_pplication" msgstr "Отваряне на връзката като уеб приложение" -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2608 msgid "Copy Link de_stination" msgstr "Копиране на адреса на връзката" -#: ../midori/midori-view.c:2479 +#: ../midori/midori-view.c:2614 msgid "Save _As…" msgstr "Запази като…" -#: ../midori/midori-view.c:2488 +#: ../midori/midori-view.c:2624 +msgid "Open _Image in New Window" +msgstr "Отваряне на изображението в нов прозорец" + +#: ../midori/midori-view.c:2625 msgid "Open _Image in New Tab" msgstr "Отваряне на изображението в нов раздел" -#: ../midori/midori-view.c:2491 +#: ../midori/midori-view.c:2629 msgid "Copy Im_age" msgstr "Копиране на изображението" -#: ../midori/midori-view.c:2494 +#: ../midori/midori-view.c:2632 msgid "Save I_mage" msgstr "Запазване на изображението" -#: ../midori/midori-view.c:2497 +#: ../midori/midori-view.c:2635 msgid "Open in Image _Viewer" msgstr "Отваряне на изображението с програма за преглед" -#: ../midori/midori-view.c:2504 +#: ../midori/midori-view.c:2642 msgid "Copy Video _Address" msgstr "Копиране на адреса на видеото" -#: ../midori/midori-view.c:2507 +#: ../midori/midori-view.c:2645 msgid "Save _Video" msgstr "Запазване на видеото" -#: ../midori/midori-view.c:2507 +#: ../midori/midori-view.c:2645 msgid "Download _Video" msgstr "Сваляне на видеото" -#: ../midori/midori-view.c:2533 +#: ../midori/midori-view.c:2671 msgid "Search _with" msgstr "Търсене с" -#: ../midori/midori-view.c:2562 +#: ../midori/midori-view.c:2700 msgid "_Search the Web" msgstr "Търсене в мрежата" -#: ../midori/midori-view.c:2582 +#: ../midori/midori-view.c:2720 msgid "Open Address in New _Tab" msgstr "Отваряне на адреса в нов раздел" -#: ../midori/midori-view.c:2629 +#: ../midori/midori-view.c:2767 msgid "Open _Frame in New Tab" msgstr "Отваряне на рамката в нов раздел" -#: ../midori/midori-view.c:2841 +#: ../midori/midori-view.c:2984 #, c-format msgid "Open or download file from %s" msgstr "Отваряне или сваляне на файл от %s" -#: ../midori/midori-view.c:2854 +#: ../midori/midori-view.c:2997 #, c-format msgid "File Name: %s" msgstr "Име на файл: %s" -#: ../midori/midori-view.c:2859 +#: ../midori/midori-view.c:3002 #, c-format msgid "File Type: '%s'" msgstr "Тип файл: '%s'" -#: ../midori/midori-view.c:2861 +#: ../midori/midori-view.c:3004 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файл: %s ('%s')" -#: ../midori/midori-view.c:2898 +#: ../midori/midori-view.c:3041 #, c-format msgid "Size: %s" msgstr "Размер: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2909 +#: ../midori/midori-view.c:3052 #, c-format msgid "Open %s" msgstr "Отваряне на %s" -#: ../midori/midori-view.c:3435 +#: ../midori/midori-view.c:3581 #, c-format msgid "Inspect page - %s" msgstr "Проверка на страница — %s" -#: ../midori/midori-view.c:3850 +#: ../midori/midori-view.c:4101 #, c-format msgid "No documentation installed" msgstr "Не е намерена документация" -#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:4177 msgid "Midori doesn't store any personal data:" msgstr "Midori не можа да запази някои от личните данни:" -#: ../midori/midori-view.c:3927 +#: ../midori/midori-view.c:4178 msgid "No history or web cookies are being saved." msgstr "Историята и бисквитките не бяха запазени." -#: ../midori/midori-view.c:3928 +#: ../midori/midori-view.c:4179 msgid "Extensions are disabled." msgstr "Разширенията са изключени." -#: ../midori/midori-view.c:3929 +#: ../midori/midori-view.c:4180 msgid "HTML5 storage, local database and application caches are disabled." msgstr "HTML5 хранилището, локалната база данни и кеширането на приложения са изключени." -#: ../midori/midori-view.c:3930 +#: ../midori/midori-view.c:4181 msgid "Midori prevents websites from tracking the user:" msgstr "Midori предотвратява следенето на потребителя от уеб страници:" -#: ../midori/midori-view.c:3931 +#: ../midori/midori-view.c:4182 msgid "Referrer URLs are stripped down to the hostname." msgstr "Изходните адреси се отрязват до име на хост." -#: ../midori/midori-view.c:3932 +#: ../midori/midori-view.c:4183 msgid "DNS prefetching is disabled." msgstr "Проактивните DNS заявки са забранени." -#: ../midori/midori-view.c:3933 +#: ../midori/midori-view.c:4184 msgid "The language and timezone are not revealed to websites." msgstr "Сайтът не предоставя информация за език и часови пояс." -#: ../midori/midori-view.c:3934 +#: ../midori/midori-view.c:4185 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "Сайтът не дава информация за наличие на Flash и други Netscape плъгини." -#: ../midori/midori-view.c:4013 +#: ../midori/midori-view.c:4225 msgid "Version numbers in brackets show the version used at runtime." msgstr "Числата в скобите показват ползваната в момента версия." -#: ../midori/midori-view.c:4059 +#: ../midori/midori-view.c:4275 msgid "Page loading delayed" msgstr "Зареждането на страницата е отложено" -#: ../midori/midori-view.c:4060 +#: ../midori/midori-view.c:4276 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Зареждането на страницата е забавено заради повреда или е зададено от настройките." -#: ../midori/midori-view.c:4061 +#: ../midori/midori-view.c:4277 msgid "Load Page" msgstr "Зареждане на страница" -#: ../midori/midori-view.c:4225 +#: ../midori/midori-view.c:4444 msgid "Blank page" msgstr "Празна страница" -#: ../midori/midori-view.c:4435 +#: ../midori/midori-view.c:4658 msgid "_Duplicate Tab" msgstr "Дублиране на раздела" -#: ../midori/midori-view.c:4440 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Label" msgstr "Показване на заглавието на раздела" -#: ../midori/midori-view.c:4440 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Icon Only" msgstr "Показване само на икони в раздела" -#: ../midori/midori-view.c:4447 +#: ../midori/midori-view.c:4670 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Затваряне на другият раздел" @@ -1372,34 +1374,34 @@ msgstr[2] "Затваряне на другите раздели" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5122 +#: ../midori/midori-view.c:5359 msgid "previous" msgstr "предишно" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5141 +#: ../midori/midori-view.c:5378 msgid "next" msgstr "следващо" -#: ../midori/midori-view.c:5154 +#: ../midori/midori-view.c:5391 msgid "Print background images" msgstr "Отпечатване на фоновото изображение" -#: ../midori/midori-view.c:5155 +#: ../midori/midori-view.c:5392 msgid "Whether background images should be printed" msgstr "Да бъде ли отпечатано фоновото изображение" -#: ../midori/midori-view.c:5179 +#: ../midori/midori-view.c:5417 msgid "Features" msgstr "Възможности" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:54 +#: ../midori/midori-download.vala:63 #, c-format msgid "%s of %s" msgstr "%s на %s" -#: ../midori/midori-download.vala:70 +#: ../midori/midori-download.vala:79 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -1407,7 +1409,7 @@ msgstr[1] "%d часа" msgstr[2] "%d часа" -#: ../midori/midori-download.vala:71 +#: ../midori/midori-download.vala:80 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -1415,7 +1417,7 @@ msgstr[1] "%d минути" msgstr[2] "%d минути" -#: ../midori/midori-download.vala:72 +#: ../midori/midori-download.vala:81 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1424,45 +1426,45 @@ msgstr[2] "%d секунди" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:87 +#: ../midori/midori-download.vala:96 #, c-format msgid " - %s remaining" msgstr " - %s оставащо" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:98 +#: ../midori/midori-download.vala:107 msgid "?B" msgstr "?Б" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:100 +#: ../midori/midori-download.vala:109 #, c-format msgid " (%s/s)" msgstr " (%s/s)" -#: ../midori/midori-download.vala:197 +#: ../midori/midori-download.vala:224 msgid "The downloaded file is erroneous." msgstr "Сваляният файл е повреден." -#: ../midori/midori-download.vala:198 +#: ../midori/midori-download.vala:225 msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards." msgstr "Контролната сума, посочена в адреса не съвпада. Възможно е файлът да е повреден или да не е завършен." -#: ../midori/midori-download.vala:312 +#: ../midori/midori-download.vala:345 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "Файлът \"%s\" не може да бъде запазен в тази папка." -#: ../midori/midori-download.vala:314 +#: ../midori/midori-download.vala:347 msgid "You don't have permission to write in this location." msgstr "Вие нямате права за запис в този файл." -#: ../midori/midori-download.vala:317 +#: ../midori/midori-download.vala:350 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Там няма достатъчно място за свалянето на \"%s\"." -#: ../midori/midori-download.vala:319 +#: ../midori/midori-download.vala:352 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файлът се нуждае от %s обаче е налице само %s." @@ -1492,294 +1494,311 @@ msgid "Startup" msgstr "Стартиране" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "При стартиране на Midori:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Домашна страница:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Използване на текущата страница" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Използване на текущатастраница, като домашна страница" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Шрифтове" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Пропорционални шрифтове" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Шрифтове по подразбиране, използвани за показване на текста" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Размер на шрифтовете по подразбиране, използвани за показване на текста" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Шрифтове с фиксирана ширина /равно-широки/" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Равношироки шрифтове, използвани за показване на текста" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "Размер на шрифта, използван за показване на текст с фиксирана ширина" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Минимален размер на шрифта" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Минималният размер на шрифта, използван за показване на текста" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Предпочитана кодировка" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:364 +#: ../midori/midori-preferences.c:365 #: ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Зареждане на изображението автоматично" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Включване проверката на правописа" -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-preferences.c:382 #: ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Включване на скриптове" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Включване поддръжката на WebGL" -#: ../midori/midori-preferences.c:388 +#: ../midori/midori-preferences.c:403 #: ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Включване на плъгини Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Увеличаване на текста и изображенията" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Разрешаване на скриптовете да отварят изскачащи прозорци" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Да се разреши ли на скриптовете да отварят изскачащи прозорци автоматично?" -#: ../midori/midori-preferences.c:403 -msgid "Kinetic scrolling" -msgstr "Превъртане по инерция" - -#: ../midori/midori-preferences.c:404 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Дали превъртането по инерция трябва да става според скоростта?" - -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Отваряне на избраното със среден бутон" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Зареждане на избраният адрес със среден бутон на мишката" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Мигащ прозорец на разделите във фонов режим" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Предпочитани езици" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:429 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Списък на предпочитаните езици за многоезични страници, например, \"de\", \"bg,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Запазване на свалените файлове в:" #. Page "Interface" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Сърфиране" +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Стил на лентата с инструменти:" + #: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Отваряне на нова страница в:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Поведение на нов раздел:" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Затваряне на бутоните на разделите" -#: ../midori/midori-preferences.c:451 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Винаги показвай лентата на разделите" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Отваряне на нови раздели след текущият" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Отваряне на нови раздели след текущият или след последният" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Отваряне на разделите във фонов режим" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Текстов редактор" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Програма за четене на новини" #. Page "Network" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Мрежа" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Прокси сървър" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Адрес /Име на хост/" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Порт" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Поддържани типове прокси сървъри:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:532 #: ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 -#: ../midori/midori-privatedata.c:304 +#: ../midori/midori-privatedata.c:308 msgid "Web Cache" -msgstr "Мрежова кеширане" +msgstr "Уеб кеширане" -#: ../midori/midori-preferences.c:502 -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "Максимален размер на кеширани страници върху диска" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "МБ" -#: ../midori/midori-preferences.c:526 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Идентифициране като" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Поверителност" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Изтриване на стари бисквитки след:" -#: ../midori/midori-preferences.c:530 -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Максимален брой дни за съхранение на бисквитки" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Приемане на бисквитки само от посещаваните сайтове" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Блокиране на бисквитките, изпратени от уебсайтове на трети страни" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:577 msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." msgstr "Бисквитките съхраняват входните данни, записани игри или потребителски профили за рекламни цели." -#: ../midori/midori-preferences.c:550 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Включване на кеширано уеб приложение" -#: ../midori/midori-preferences.c:553 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Включване на поддръжка на локално хранилище HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:557 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Орязвай референтните детайли, изпращани към уебстраниците" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Да бъде ли заглавието \"Референтен\" съкратено до името на хоста и да не показва адреса" -#: ../midori/midori-preferences.c:562 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Изтривай история по- стара от:" -#: ../midori/midori-preferences.c:564 -#: ../midori/midori-preferences.c:567 +#: ../midori/midori-preferences.c:598 +#: ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Максимален срок /в дни/ на съхраняване на историята" -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:638 #: ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Разширения" -#: ../midori/midori-searchaction.c:1043 +#: ../midori/midori-searchaction.c:1047 msgid "Add search engine" msgstr "Добавяне на търсачка" -#: ../midori/midori-searchaction.c:1043 +#: ../midori/midori-searchaction.c:1047 msgid "Edit search engine" msgstr "Добавяне на търсачка" -#: ../midori/midori-searchaction.c:1071 +#: ../midori/midori-searchaction.c:1075 msgid "_Name:" msgstr "Име:" -#: ../midori/midori-searchaction.c:1086 +#: ../midori/midori-searchaction.c:1090 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-searchaction.c:1099 +#: ../midori/midori-searchaction.c:1103 #: ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-searchaction.c:1118 +#: ../midori/midori-searchaction.c:1122 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1408 +#: ../midori/midori-searchaction.c:1412 msgid "Manage Search Engines" msgstr "Управление на търсачките" -#: ../midori/midori-searchaction.c:1508 +#: ../midori/midori-searchaction.c:1512 msgid "Use as _default" msgstr "Използване по подразбиране" -#: ../midori/midori-searchaction.c:1619 +#: ../midori/midori-searchaction.c:1623 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Търсачката не може да бъде заредена. %s\n" -#: ../midori/midori-searchaction.c:1674 +#: ../midori/midori-searchaction.c:1678 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Търсачката не може да бъде запазена. %s" @@ -1824,11 +1843,15 @@ msgid "Choose an application or command to open \"%s\":" msgstr "Избор на приложение или команда за отваряне на \"%s\":" -#: ../midori/sokoke.c:366 -#: ../midori/sokoke.c:380 +#: ../midori/sokoke.c:368 +#: ../midori/sokoke.c:388 msgid "Could not run external program." msgstr "Не може да бъде стартирана външна програма." +#: ../midori/sokoke.c:561 +msgid "Invalid URI" +msgstr "Невалиден URI" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1859,21 +1882,21 @@ msgid "Transfer completed" msgstr "Прехвърлянето приключи" -#: ../toolbars/midori-transferbar.c:239 +#: ../toolbars/midori-transferbar.c:244 #: ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Изчистване на всичко" -#: ../toolbars/midori-transferbar.c:272 -#: ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:277 +#: ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Няколко файла бяха свалени" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "Затваряне на Midori" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Прехвърлянията ще бъдат отменени, ако Midori бъде затворен." @@ -1905,7 +1928,7 @@ msgstr "Разделител" #. Create the filter entry -#: ../panels/midori-bookmarks.c:1017 +#: ../panels/midori-bookmarks.c:1009 msgid "Search Bookmarks" msgstr "Търсене в отметките" @@ -1925,7 +1948,7 @@ msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Преди %d ден" -msgstr[1] "Преди %d дена" +msgstr[1] "Преди %d дни" msgstr[2] "Преди %d дни" #: ../panels/midori-history.c:165 @@ -1956,7 +1979,7 @@ msgstr "Изчистване на цялата история" #. Create the filter entry -#: ../panels/midori-history.c:988 +#: ../panels/midori-history.c:981 msgid "Search History" msgstr "Търсене в историята" @@ -1964,11 +1987,11 @@ msgid "Transfers" msgstr "Прехвърляния" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:442 msgid "Open Destination _Folder" msgstr "Отваряне на местоположението на папката" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:445 msgid "Copy Link Loc_ation" msgstr "Копиране на адреса на връзката" @@ -2011,7 +2034,6 @@ msgstr "Кадрите с анимация са повредени" #: ../katze/katze-utils.c:422 -#: ../katze/katze-utils.c:811 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство '%s' не е валидно за %s" @@ -2030,30 +2052,30 @@ msgid "None" msgstr "Няма" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:688 msgid "1 hour" msgstr "1 час" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:689 msgid "1 day" msgstr "1 ден" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:690 msgid "1 week" msgstr "1 седмица" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:691 msgid "1 month" msgstr "1 месец" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "1 year" msgstr "1 година" #: ../katze/katze-preferences.c:72 #: ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:242 #, c-format msgid "Preferences for %s" msgstr "Предпочитания за %s" @@ -2066,36 +2088,36 @@ msgid "SHA1-Checksum:" msgstr "Контролна сума SHA1:" -#: ../extensions/adblock.c:484 +#: ../extensions/adblock.c:483 msgid "Configure Advertisement filters" msgstr "Настройки на филтрите за реклами" -#: ../extensions/adblock.c:515 +#: ../extensions/adblock.c:512 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "Въдедете адрес в полето за въвеждане и натиснете \"Добавяне\" за да бъде добавен редът в списъка. Вие можете да намерите повече списъци на %s." -#: ../extensions/adblock.c:929 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Правила за редактиране" -#: ../extensions/adblock.c:943 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "Правило:" -#: ../extensions/adblock.c:997 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Блокиране на изображение" -#: ../extensions/adblock.c:1002 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Блокиране на връзка" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Блокиране на реклами" -#: ../extensions/adblock.c:1929 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Блокиране на реклами от списъка с филтрите" @@ -2187,11 +2209,11 @@ msgid "Support for userscripts and userstyles" msgstr "Поддръжка на потребителски скриптове и стилове" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Оцветяване на раздели" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Всеки раздел да има свой цвят" @@ -2216,23 +2238,23 @@ msgid "Collapse All" msgstr "Свиване на всички" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:575 msgid "Do you really want to delete all cookies?" msgstr "Наистина ли искате да изтриете всички бисквитки?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:577 msgid "Question" msgstr "Въпрос" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:588 msgid "Only cookies which match the filter will be deleted." msgstr "Ще бъдат изтрити само бисквитките, които отговарят на зададеното във филтъра." -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "At the end of the session" msgstr "В края на сесията" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:683 #, c-format msgid "" "Host: %s\n" @@ -2250,15 +2272,15 @@ "Изтичане на срока: %s" #. i18n: is this cookie secure (SSL)? yes/ no -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "No" msgstr "Не" -#: ../extensions/cookie-manager/cookie-manager-page.c:699 +#: ../extensions/cookie-manager/cookie-manager-page.c:705 #, c-format msgid "" "Domain: %s\n" @@ -2267,19 +2289,20 @@ "Домейн: %s\n" "Бисквитки: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1022 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Име" -#: ../extensions/cookie-manager/cookie-manager-page.c:1074 +#: ../extensions/cookie-manager/cookie-manager-page.c:1080 msgid "_Expand All" msgstr "Разширяване на всички" -#: ../extensions/cookie-manager/cookie-manager-page.c:1082 +#: ../extensions/cookie-manager/cookie-manager-page.c:1088 msgid "_Collapse All" msgstr "Свиване на всички" -#: ../extensions/cookie-manager/cookie-manager-page.c:1134 +#: ../extensions/cookie-manager/cookie-manager-page.c:1140 msgid "Search Cookies by Name or Domain" msgstr "Търсене на бисквитки по име или домейн" @@ -2342,7 +2365,7 @@ msgid "Download files with \"%s\" or a custom command" msgstr "Сваляне на файлове с \"%s\" или с потребителска команда" -#: ../extensions/external-download-manager.vala:318 +#: ../extensions/external-download-manager.vala:320 msgid "External Download Manager - CommandLine" msgstr "Външен мениджър на изтеглянията - CommandLine" @@ -2355,25 +2378,25 @@ msgstr "Не може да се намери необходимите Atom елементи \"емисия\" в база данни XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:378 +#: ../extensions/feed-panel/feed-panel.c:375 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Последно обновяване: %s." -#: ../extensions/feed-panel/feed-panel.c:644 +#: ../extensions/feed-panel/feed-panel.c:629 msgid "Feeds" msgstr "Емисии" -#: ../extensions/feed-panel/feed-panel.c:697 +#: ../extensions/feed-panel/feed-panel.c:682 msgid "Add new feed" msgstr "Добавяне на нова емисия" -#: ../extensions/feed-panel/feed-panel.c:704 +#: ../extensions/feed-panel/feed-panel.c:689 msgid "Delete feed" -msgstr "Премаване на емисия" +msgstr "Премахване на емисия" -#: ../extensions/feed-panel/feed-panel.c:784 +#: ../extensions/feed-panel/feed-panel.c:769 msgid "_Feeds" msgstr "Емисии" @@ -2461,11 +2484,11 @@ #: ../extensions/formhistory/formhistory.c:427 msgid "Toggle form history state" -msgstr "Превключване на състоянието на попълването на формуляра" +msgstr "Превключване на състоянието на историята на формуляра" #: ../extensions/formhistory/formhistory.c:428 msgid "Activate or deactivate form history for the current tab." -msgstr "Активиране и деактивиране на историята на формуляра за текущият раздел." +msgstr "Активиране или деактивиране на историята на формуляра за текущият раздел." #: ../extensions/formhistory/formhistory.c:515 #: ../midori/midori-history.c:47 @@ -2498,61 +2521,61 @@ msgid "Failed to select suggestions\n" msgstr "Не може да бъде избрано предложение\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:204 msgid "There are no unvisited tabs" msgstr "Няма непосетени раздели" # Используется как заголовок окна настроек дополнения: «Параметры » -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:242 #, c-format msgid "History-List" msgstr "Списък с история" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:282 msgid "Tab closing behavior" msgstr "Поведение при затворен раздел:" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:290 msgid "Do nothing" msgstr "Не прави нищо" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:296 msgid "Switch to last viewed tab" msgstr "Превключи на последният разглеждан раздел" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:302 msgid "Switch to newest tab" msgstr "Превключи на най- новият раздел" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:430 msgid "Next new Tab (History List)" msgstr "Следващият нов раздел (от списъка с историята)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:431 msgid "Next new tab from history" msgstr "Следващият нов раздел от историята" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:440 msgid "Previous new Tab (History List)" -msgstr "Предишният нов рездел (от листата с историята)" +msgstr "Предишният нов рездел (от списъка с историята)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:441 msgid "Previous new tab from history" msgstr "Предишният нов раздел от историята" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:450 msgid "Display tab in background (History List)" -msgstr "Показване на раздел във фонов режим (Листата с история)" +msgstr "Показване на раздел във фонов режим (Списък с история)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:451 msgid "Display the current selected tab in background" msgstr "Показване на текущо избраният раздел във фонов режим" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:578 msgid "History List" msgstr "Списък с историята" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:579 msgid "Move to the last used tab when switching or closing tabs" msgstr "Преместване до последният използван раздел при превключване или затваряне на разделите" @@ -2573,8 +2596,8 @@ msgstr "Настройване на бързите клавиши" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." -msgstr "Настройване на бързите клавиши…" +msgid "Customize Sh_ortcuts…" +msgstr "Настройване на бързите клавиши." #: ../extensions/shortcuts.c:312 msgid "Shortcuts" @@ -2610,18 +2633,18 @@ #: ../extensions/statusbar-features.c:260 msgid "Easily toggle features on web pages on and off" -msgstr "Лесно превключване функциите на уеб страниците и изключване" +msgstr "Лесно превключване на функциите на уеб страниците" -#: ../extensions/tab-panel.c:584 -#: ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 +#: ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Панел с раздели" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Панел с раздели" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Показване на разделите във вертикален панел" @@ -2631,7 +2654,7 @@ #: ../extensions/tabs-minimized.c:77 msgid "New tabs have no label by default" -msgstr "Скриване на заглавието и показване само на икони на новите раздели" +msgstr "Новите раздели са без заглавие по подразбиране" #: ../extensions/toolbar-editor.c:395 msgid "Customize Toolbar" @@ -2692,15 +2715,15 @@ msgstr "Изчистване на личните данни при затваряне на Midori" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:298 +#: ../midori/midori-privatedata.c:302 msgid "Saved logins and _passwords" msgstr "Запазване на потребителски имена и пароли" -#: ../midori/midori-privatedata.c:300 +#: ../midori/midori-privatedata.c:304 msgid "Cookies and Website data" msgstr "Бисквитки и данни от уеб-сайтове" -#: ../midori/midori-privatedata.c:307 +#: ../midori/midori-privatedata.c:311 msgid "Website icons" msgstr "Икони на уеб-сайтове" @@ -2708,7 +2731,7 @@ msgid "Open tabs" msgstr "Отваряне на раздели" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Повече отворени раздели..." @@ -2742,7 +2765,7 @@ #: ../midori/midori-bookmarks.c:259 #, c-format msgid "Couldn't create bookmarks table: %s\n" -msgstr "Не може да бъдат създадени таблици с раздели: %s\n" +msgstr "Не може да бъдат създадено табло с отметки: %s\n" #: ../midori/midori-bookmarks.c:274 #, c-format @@ -2754,79 +2777,327 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Отметките не могат да бъдат запазени. %s" -#: ../midori/midori-session.c:187 +#: ../midori/midori-session.c:192 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Не е достъпно администраторско удостоверение за файла. SSL сертификатите не могат да бъдат проверени." -#: ../midori/midori-session.c:355 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Конфигурацията не може да бъде запазена. %s" -#: ../midori/midori-session.c:376 -#: ../midori/midori-frontend.c:449 +#: ../midori/midori-session.c:382 +#: ../midori/midori-frontend.c:454 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Сесията не можа да бъде заредена: %s\n" -#: ../midori/midori-session.c:406 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесията не може да бъде запазена. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:126 +#: ../midori/midori-frontend.c:128 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Съдържанието на кошчето не може дабъде запазено. %s" -#: ../midori/midori-frontend.c:309 +#: ../midori/midori-frontend.c:314 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/midori-frontend.c:319 +#: ../midori/midori-frontend.c:324 msgid "Modify _preferences" msgstr "Промяна на предпочитанията" -#: ../midori/midori-frontend.c:323 +#: ../midori/midori-frontend.c:328 msgid "Disable all _extensions" msgstr "Изключване на всички разширения" -#: ../midori/midori-frontend.c:332 +#: ../midori/midori-frontend.c:337 msgid "Show a dialog after Midori crashed" msgstr "Показване на прозорец за действие при аварийно спиране на работата на Midori" -#: ../midori/midori-frontend.c:337 +#: ../midori/midori-frontend.c:342 msgid "Discard old tabs" msgstr "Затваряне на старите раздели" -#: ../midori/midori-frontend.c:401 +#: ../midori/midori-frontend.c:406 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori е стартиране, но не отговаря.\n" -#: ../midori/midori-frontend.c:434 +#: ../midori/midori-frontend.c:439 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Отметките не могат да бъдат заредени: %s\n" -#: ../midori/midori-frontend.c:465 +#: ../midori/midori-frontend.c:470 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не може да бъде заредено кошчето: %s\n" -#: ../midori/midori-frontend.c:473 +#: ../midori/midori-frontend.c:478 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "не може да бъде заредена историята: %s\n" +msgstr "Не може да бъде заредена историята: %s\n" -#: ../midori/midori-frontend.c:484 +#: ../midori/midori-frontend.c:489 msgid "The following errors occured:" msgstr "Открити са следните грешки:" -#: ../midori/midori-frontend.c:489 +#: ../midori/midori-frontend.c:494 msgid "_Ignore" msgstr "Пренебрегване" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 +#, c-format +msgid "SQL fails: %s" +msgstr "SQL файлове: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 +msgid "Accept" +msgstr "Приемане" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 +msgid "Accept for session" +msgstr "Приемане за тази сесия" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 +msgid "Block" +msgstr "Блокиране" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 +#, c-format +msgid "Could not open database of extenstion: %s" +msgstr "Неуспех при отварянето на база с данни: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 +#, c-format +msgid "Failed to execute database statement: %s" +msgstr "Неуспех при изпълнението на отчета на база с данни: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 +msgid "Do you really want to delete all cookie permissions?" +msgstr "Наистина ли искате да изтриете всички запазени бисквитки?" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +msgid "Delete all cookie permissions?" +msgstr "Изтриване на всички бисквитки ?" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 +msgid "This action will delete all cookie permissions. You will be asked for permissions again for each web site visited." +msgstr "Това действие ще изтрие всички запазени бисквитки. Вие ще бъдете питани за потвърждение всеки път, когато посетите уеб сайт." + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 +msgid "Cookie permission manager" +msgstr "Управление на бисквитките" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 +msgid "Instance of current cookie permission manager" +msgstr "Внасяне на текущите настройки в управлението на бисквитките" + +#. Set up dialog +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 +msgid "Configure cookie permission" +msgstr "Настройка на управлението на бисквитките" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 +#, c-format +msgid "Below is a list of all web sites and the policy set for them. You can delete policies by marking the entries and clicking on Delete.You can also add a policy for a domain manually by entering the domain below, choosing the policy and clicking on Add." +msgstr "Отдолу е списъкът с всички уеб страници и техните правомощият. Вие можете да премахнете дадените права, като маркирате тези записи и кликнете на Изтриване.Вие също може да предоставите правомощия на домейн, като въведете ръчно избраните правомощия и кликнете на Добавяне." + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 +msgid "Domain" +msgstr "Домейн" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 +msgid "Policy" +msgstr "Политика за сигурност" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 +msgid "Delete _all" +msgstr "Изтриване на всичко" + +#. Add "ask-for-unknown-policy" checkbox +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 +msgid "A_sk for policy if unknown for a domain" +msgstr "Питай за потвърждение, ако домейнът е непознат" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 +msgid "A fatal error occurred which prevents the cookie permission manager extension to continue. You should disable it." +msgstr "Фатална грешка, което не позволява на разширението \"Управление на бисквитките\", за да продължи. Трябва да го изключите." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 +msgid "Error in cookie permission manager extension" +msgstr "Грешка в разширението за управление на бисквитките" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 +msgid "Reason" +msgstr "Причина" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 +msgid "Could not get path to configuration of extension: path is NULL" +msgstr "Не може да бъде получен пътят до настройките на разширението: пътят е НУЛА" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 +msgid "Could not get path to configuration of extension." +msgstr "Не може да бъде получен пътят до настройките на разширението." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#, c-format +msgid "Could not create configuration folder for extension: %s" +msgstr "Не може да бъде създадена папка с конфигурацията на разширение: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 +msgid "Could not create configuration folder for extension." +msgstr "Не може да бъде създадена папка с конфигурацията на разширението." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 +msgid "Could not open database of extension." +msgstr "Неуспех при отварянето на базата с данни на разширението." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 +msgid "Could not set up database structure of extension." +msgstr "Не може да се създаде структура на базата данни на разширението." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 +#, c-format +msgid "Could not determine global cookie policy to set for domain: %s" +msgstr "Не може да бъде определена глобалната политика за сигурност за домейн: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "До края на сесията" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 +#, c-format +msgid "The website %s wants to store %d cookies." +msgstr "Уеб сайтът %s желае да запазите %d бисквитки." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 +#, c-format +msgid "The website %s wants to store a cookie." +msgstr "Уеб сайтът %s желае да запазите бисквитката." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 +#, c-format +msgid "Multiple websites want to store %d cookies in total." +msgstr "Множество сайтове желаят да запазите %d бисквитки обединени." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "Разрешаване" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Разрешаване за тази сесия" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "Отказване" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "Откажи този път" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 +msgid "Path" +msgstr "Път" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 +msgid "Value" +msgstr "Стойност" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 +msgid "Expire date" +msgstr "Срок на валидност" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 +msgid "Extension instance" +msgstr "Примерно разширение" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 +msgid "The Midori extension instance for this extension" +msgstr "Примерно разширение на Midori за това разширение" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 +msgid "Application instance" +msgstr "Примерна програма" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 +msgid "The Midori application instance this extension belongs to" +msgstr "Примерното Midori разширение принадлежи към" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 +msgid "Database instance" +msgstr "Примерна база с данни" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 +msgid "Pointer to sqlite database instance used by this extension" +msgstr "Указател до примерна SQLite база данни, използвана от това разширение" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "Път до база с данни" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "Пътят към база данни SQLite например, използвани от това разширение" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 +msgid "Ask for unknown policy" +msgstr "Питай при неопределени права" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 +msgid "If true this extension ask for policy for every unknown domain.If false this extension uses the global cookie policy set in Midori settings." +msgstr "Ако го разрешите, това разширение ще иска потвърждение от всеки непознат домейн. Ако забраните това разширение ще се използва глобалната политика \"бисквитки\", зададени от настройките на Midori." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 +msgid "Undetermined" +msgstr "Неопределен" + +#: ../extensions/cookie-permissions/main.c:62 +msgid "Cookie Security Manager" +msgstr "Управление на бисквиткитe" + +#: ../extensions/cookie-permissions/main.c:63 +msgid "Manage cookie permission per site" +msgstr "Управление на бисквитките за сайта" + +#~ msgid "Writing failed." +#~ msgstr "Грешка при запис." + +#~ msgid "_Window" +#~ msgstr "Прозорец" + +#~ msgid "Custom..." +#~ msgstr "Потребителска…" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Как да се идентифицират като уеб страници" + +#~ msgid "Kinetic scrolling" +#~ msgstr "Превъртане по инерция" + +#~ msgid "Whether scrolling should kinetically move according to speed" +#~ msgstr "Дали превъртането по инерция трябва да става според скоростта?" + #~ msgid "Redirects console warnings to the specified FILENAME" #~ msgstr "Перенаправить предупреждения из консоли в выбранный ФАЙЛ" @@ -3263,9 +3534,6 @@ #~ msgid "Big" #~ msgstr "Большой" -#~ msgid "Reset the last _session" -#~ msgstr "Удалить _данные последнего сеанса" - #~ msgid "Failed to execute database statement\n" #~ msgstr "Не удалось выполнить запрос к базе данных\n" @@ -3308,9 +3576,6 @@ #~ msgid "Where to open externally opened pages" #~ msgstr "Расположение сторонних страниц при открытии" -#~ msgid "Accept cookies" -#~ msgstr "Принимать фрагменты данных" - #~ msgid "What type of cookies to accept" #~ msgstr "Разрешённый тип фрагментов данных" @@ -3356,9 +3621,6 @@ #~ msgid "Navigationbar" #~ msgstr "Панель навигации" -#~ msgid "Applications" -#~ msgstr "Приложения" - #~ msgid "External applications" #~ msgstr "Внешние приложения" @@ -3374,9 +3636,6 @@ #~ msgid "Delete old cookies after 1 week" #~ msgstr "Удалять старые фрагменты данных через неделю" -#~ msgid "Delete old cookies after 1 month" -#~ msgstr "Удалять старые фрагменты данных через месяц" - #~ msgid "Delete old cookies after 1 year" #~ msgstr "Удалять старые фрагменты данных через год" @@ -3424,9 +3683,6 @@ #~ msgid "Show the documentation" #~ msgstr "Документация" -#~ msgid "Show Blank page" -#~ msgstr "Открыть пустую страницу" - #~ msgid "_Save Link destination" #~ msgstr "_Сохранить объект" @@ -3561,9 +3817,6 @@ #~ msgid "Open _Link" #~ msgstr "_Открыть ссылку" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Открыть изображение в новом _окне" - #~ msgid "Not available on this platform" #~ msgstr "Недоступно для данной платформы" @@ -3745,9 +3998,6 @@ #~ msgid "The trash, collecting recently closed tabs and windows" #~ msgstr "Корзина. Сохраняет закрытые вкладки и окна" -#~ msgid "Search Engines" -#~ msgstr "Средства поиска" - #~ msgid "The list of search engines" #~ msgstr "Список средств поиска" diff -Nru midori-0.4.9/po/cs.po midori-0.5.0/po/cs.po --- midori-0.4.9/po/cs.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/cs.po 2013-04-04 20:31:20.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-28 07:51+0000\n" +"POT-Creation-Date: 2013-03-27 07:12+0000\n" "PO-Revision-Date: 2012-02-24 01:20+0100\n" "Last-Translator: Michal Várady \n" "Language-Team: Czech < >\n" @@ -28,9 +28,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" @@ -42,11 +42,11 @@ msgid "New Private Browsing Window" msgstr "Nové okno soukromého prohlížení" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "Nová karta" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "Nové okno" @@ -62,7 +62,7 @@ msgid "Open a new private browsing window" msgstr "Nové okno soukromého prohlížení" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Soukromé prohlížení" @@ -148,202 +148,207 @@ msgid "SECONDS" msgstr "SEKUNDY" -#: ../midori/main.c:155 -#, c-format +#: ../midori/main.c:147 msgid "Error: \"gdb\" can't be found\n" msgstr "Chyba: program \"gdb\" nebyl nalezen\n" -#: ../midori/main.c:181 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a hlášení o chybách posílejte na:" -#: ../midori/main.c:183 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Zjistěte dostupnost nové verze na:" -#: ../midori/main.c:338 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Došlo k neznámé chybě" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Neočekávaná akce '%s'." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6116 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "_Přidat záložku" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "_Rozšíření" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Historie" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "_Uživatelské skripty" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "Uživatelské _styly" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "_Přenosy" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "Zásuvné moduly ap_likace Netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5255 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "Nová _složka" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Soubor nebyl nalezen." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Nesprávný formát dokumentu." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Neznámý formát záložek." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5391 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5402 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5349 msgid "Reload the current page" msgstr "Znovu načíst tuto stránku" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5346 msgid "Stop loading the current page" msgstr "Zastavit načítání této stránky" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se aktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Hodnota '%s' je pro %s neplatná" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Neočekávaná akce '%s'." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Soukromé prohlížení)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Záložky" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Nová složka" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Upravit složku" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Zadejte název záložky a zařaďte ji." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "Přidat do _rychlého přístupu" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "Zobrazit v panelu _nástrojů" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4498 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "Uložit připojené _zdroje" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "Bylo otevřeno nové okno" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "Byla otevřena nová karta" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "Chyba při otevírání obrázku!" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "Vybraný obrázek nelze otevřít ve výchozím prohlížeči obrázků." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "Chyba při stahování obrázku." -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "Vybraný obrázek se nepodařilo stáhnout." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -357,24 +362,24 @@ "Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). " "Dalším kliknutím na ikonu RSS přidáte kanál přímo do čtečky." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5415 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3111 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3493 ../midori/midori-browser.c:3494 msgid "Toggle text cursor navigation" msgstr "Přepíná navigaci pomocí kurzoru" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3496 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -382,111 +387,111 @@ "Stisk klávesy F7 přepíná funkci ovládání pomocí kurzoru. Když je aktivní, na " "všech stránkách se objevuje kurzor." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3499 msgid "_Enable Caret Browsing" msgstr "Povolit ovládání ku_rzorem" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3915 ../midori/midori-browser.c:5863 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4329 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4330 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4331 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4332 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4333 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4334 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4335 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4353 msgid "Import bookmarks…" msgstr "Importovat záložky…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4356 ../midori/midori-browser.c:5420 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4367 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4432 msgid "Import from XBEL or HTML file" msgstr "Importovat ze souboru typu XBEL, nebo HTML" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4460 msgid "Import from a file" msgstr "Importovat ze souboru" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4472 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4503 msgid "XBEL Bookmarks" msgstr "Záložky ve formátu XBEL" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4508 msgid "Netscape Bookmarks" msgstr "Záložky z aplikace Netscape" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4522 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "" "Z aplikace Midori lze exportovat záložky pouze ve formátech XBEL (*.xbel) a " "Netscape (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4537 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4753 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4754 msgid "See about:version for version info." msgstr "about:version zobrazí informace o verzi" -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4756 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -497,380 +502,381 @@ "práv GNU Lesser General Public License jak byla publikována Free Software " "Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4791 msgid "translator-credits" msgstr "" "David Štancl \n" "Michal Várady " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5253 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5256 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5259 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5261 msgid "New P_rivate Browsing Window" msgstr "Nové okno souk_romého prohlížení" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5265 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5267 msgid "_Save Page As…" msgstr "Uložit stránku j_ako…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5268 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5270 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5274 msgid "Create _Launcher" msgstr "Vytvořit _spouštěč" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5277 msgid "Subscribe to News _feed" msgstr "Přihlásit se k odběru _kanálu" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5283 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5284 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5286 msgid "C_lose Window" msgstr "Z_avřít okno" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5290 msgid "_Share" msgstr "_Sdílet" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5291 msgid "Share this page" msgstr "Sdílet tuto stránku" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5295 msgid "Print the current page" msgstr "Vytisknout tuto stránku" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5298 msgid "Close a_ll Windows" msgstr "Zavřít _všechna okna" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5301 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5324 msgid "_Find…" msgstr "Na_jít…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5325 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5327 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5330 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5334 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5336 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5337 msgid "_Toolbars" msgstr "Pane_ly nástrojů" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5342 msgid "Reload page without caching" msgstr "Znovu načíst stránku bez použití mezipaměti" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5352 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5355 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5359 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5361 msgid "View So_urce" msgstr "Zobrazit zdro_jový kód" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5364 msgid "Ca_ret Browsing" msgstr "Prohlížení ku_rzorem" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5368 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5370 msgid "Scroll _Left" msgstr "Posunout v_levo" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5373 msgid "Scroll _Down" msgstr "Posunout _dolů" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5376 msgid "Scroll _Up" msgstr "Posunout nahor_u" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5379 msgid "Scroll _Right" msgstr "Posunout vp_ravo" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5382 msgid "_Readable" msgstr "Č_tecí mód" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5385 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5388 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5395 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5404 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5405 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5407 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5410 msgid "Undo _Close Tab" msgstr "_Znovu otevřít zavřenou kartu" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5417 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5423 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5426 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "Nastavit vy_hledávací nástroje" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5429 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5432 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5436 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5439 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5441 msgid "Move Tab to _first position" msgstr "Přesunout kartu na _začátek" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5443 msgid "Move Tab _Backward" msgstr "Přesunout kartu v_zad" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5445 msgid "_Move Tab Forward" msgstr "Přesunout kartu v_před" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5447 msgid "Move Tab to _last position" msgstr "Přesunout kartu na _konec" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5450 msgid "Focus _Current Tab" msgstr "_Přepnout kurzor na tuto kartu" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5453 msgid "Focus _Next view" msgstr "Přepnout na _další" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5456 msgid "Only show the Icon of the _Current Tab" msgstr "Zobrazit pouze ikonu a_ktuální karty" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5459 msgid "_Duplicate Current Tab" msgstr "Z_dvojit aktuální kartu" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5462 msgid "Close Ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5465 msgid "Open last _session" msgstr "Otevřít poslední _relaci" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5468 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5470 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5473 msgid "_Report a Problem…" msgstr "Ohlásit chy_bu…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5478 ../midori/midori-browser.c:6135 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5485 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5489 msgid "_Navigationbar" msgstr "_Navigační panel" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5493 msgid "Side_panel" msgstr "Postranní _panel" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5494 msgid "Sidepanel" msgstr "Postranní panel" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5497 msgid "_Bookmarkbar" msgstr "Panel _záložek" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5501 msgid "_Statusbar" msgstr "_Stavový panel" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Čínské tradiční (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Čínské zjednodušené (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5520 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5523 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5526 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5529 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5532 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5535 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Vlastní…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6041 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6048 msgid "_Location…" msgstr "U_místění…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6050 msgid "Open a particular location" msgstr "Otevřít konkrétní umístění" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6072 msgid "_Web Search…" msgstr "_Hledat na webu…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6074 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6101 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6118 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6151 msgid "_Tabs" msgstr "_Karty" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6153 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6167 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6169 msgid "Menu" msgstr "Nabídka" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6934 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -931,24 +937,24 @@ msgid "Self-signed" msgstr "Podepsán sebou samým (self-signed)" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Podrobnosti o zabezpečení" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Vložit a s_pustit" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Neověřené spojení" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Ověřené a šifrované spojení" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Ověřené, nešifrované spojení" @@ -965,391 +971,386 @@ msgid "Align sidepanel to the left" msgstr "Umístit postranní panel vlevo" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "zobrazit rychlý přístup" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "zobrazit domovskou stránku" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "zobrazit naposledy otevřené karty" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "zobrazit naposledy otevřené karty bez načtení" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "zobrazit prázdnou stránku" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "zobrazit výchozí vyhledávač" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "zobrazit vlastní stránku" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Vlastní…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "nové kartě" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "novém okně" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "aktuální kartě" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "výchozí" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "ikony" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "malé ikony" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "text" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "ikony a text" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "text pod ikonami" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "automaticky (GNOME, nebo jiné prostředí)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "server proxy HTTP" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "žádný server proxy" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Styl panelu nástrojů:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Styl panelu nástrojů" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Po spuštění aplikace Midori:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Nové stránky otevírat v:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Hlásit se jako" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Určuje, jak se bude aplikace identifikovat webovým stránkám" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Vždy použít mnou zvolená písma" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "Vybraná písma se použijí vždy bez ohledu na požadavky stránky" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfiguraci nelze načíst: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Hodnota '%s' je pro %s neplatná" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neplatná hodnota '%s' konfigurace" -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Nepodařilo se aplikovat soubor se styly: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Důvěřovat tomuto webu" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Neznámé zabezpečení" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s chce uložit data do databáze HTML5." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Zakázat" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Povolit" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s chce zjistit vaši polohu." -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stránku '%s' nelze načíst." -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Zkusit znovu" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Chyba - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Něco nesprávného se přihodilo s '%s'" + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Poslat zprávu pro %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Přidat vy_hledávací nástroj..." -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "Prozkouma_t prvek" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Otevřít odkaz v nové kartě a _zobrazit ji" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Otevřít odkaz v nové kartě na _pozadí" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Otevřít odkaz jako _webovou aplikaci" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "Zkopírovat _cíl odkazu" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "Uložit j_ako…" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Otevřít _obrázek v novém okně" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Otevřít _obrázek v nové kartě" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Zkopírovat _adresu obrázku" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Uložit o_brázek" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Otevřít v prohlížeči _obrázků" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Zkopírovat _adresu videa" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Uložit _video" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Stáhnout _video" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Hledat _pomocí" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Otevřít _rám v nové kartě" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Otevřít nebo stáhnout soubor z %s" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Název souboru: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Velikost: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "Aplikace Midori neukládá žádné osobní údaje:" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Neukládá se historie, ani cookies." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Rozšíření jsou zakázána." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "Zakázáno úložiště HTML5, lokální databáze a aplikační mezipaměťi." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Aplikace Midori zabraňuje webovým stránkám sledovat uživatele:" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "Adresy URL referentů jsou zkráceny na pouhý název hostitele." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "Přednačítání DNS záznamů je zakázáno." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "Stránkám nejsou poskytovány údaje o jazyku a časovém pásmu." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "" "Stránky nemohou získat seznam zásuvných modulů Flash ani modulů aplikace " "Netscape." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "Čísla verzí v závorce jsou verze použité při běhu programu." -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Načtení stránky bylo pozdrženo kvůli nedávnému pádu aplikace, nebo kvůli " "nastavení po spuštění." -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "Zobrazit _popisek karty" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "Zobrazit jen _ikonu karty" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "_Zavřít druhou kartu" @@ -1357,24 +1358,24 @@ msgstr[2] "_Zavřít ostatní karty" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "předchozí" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "následující" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Určuje, zda se vytisknou obrázky na pozadí" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Rozšíření" @@ -1480,114 +1481,118 @@ msgid "Startup" msgstr "Při spuštění" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Po spuštění aplikace Midori:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Použít _stávající stránku" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Použít stávající stránku jako domovskou" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Písma" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Proporcionální písmo" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Výchozí písmo pro zobrazení textu" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Výchozí velikost písma pro zobrazení textu" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Neproporcionální písmo" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Písmo pro zobrazení textu se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "Velikost písma pro zobrazení textu se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Minimální velikost písma" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Minimální velikost fontu použitého pro zobrazení" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Upřednostňované kódování" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Chování" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Automaticky načítat obrázky" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Povolit kontrolu pravopisu" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Povolit skripty" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Povolit podporu WebGL" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Povolit zásuvné moduly aplikace Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Povolit skriptům otevírat vyskakovací okna" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Určuje, zda bude skriptům povoleno automaticky otevírat vyskakovací okna" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Kliknutí prostředního tlačítka otevře vybraný text" -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Prostřední tlačítko myši otevře adresu obsaženou ve vybraném textu" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Blikání okna při otevření karty na pozadí" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Upřednostňované jazyky" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1595,97 +1600,118 @@ "Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", " "nebo \"cs-cs;q=1.0, en-en;q=0.667\"" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Ukládat stažené soubory do:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Prohlížení" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Styl panelu nástrojů:" + +#: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Nové stránky otevírat v:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Na nové kartě:" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Vždy zobrazit panel karet" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Určuje, zda se budou nové karty otevírat vedle aktivní nebo vedle poslední " "karty" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Čtečka RSS" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Síť" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Server proxy" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Název hostitele" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Port" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Podporované typy proxy:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Mezipaměť stránek" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "Maximální velikost diskové mezipaměti stránek" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Hlásit se jako" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Soukromí" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Smazat stará cookies po:" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Maximální počet dní, po které jsou cookies platná." -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Přijímat cookies pouze z navštívených stránek" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Blokovat cookies z jiných stránek" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1693,77 +1719,77 @@ "V cookies se ukládají přihlašovací údaje, stavy her nebo uživatelská data " "pro reklamní účely." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Povolit mezipaměť pro offline aplikace" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Povolit místní úložiště pro HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Odstranit detaily o referující adrese při odesílání" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "" "Určuje, zda bude referenční hlavička \"Referer\" zkrácena na pouhý název " "hostitele" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Smazat stránky z historie po:" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "" "Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Rozšíření" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Přidat vyhledávací nástroj" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Upravit vyhledávací nástroj" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Název:" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "_Zkratka:" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Spravovat vyhledávací nástroje" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Použít jako _výchozí" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nelze načíst.%s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Vyhledávací nástroj nelze uložit. %s" @@ -1808,9 +1834,14 @@ msgstr "Vyberte aplikaci, nebo příkaz k otevření \"%s\":" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Nelze spustit externí program." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "Nesprávné URI" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1832,28 +1863,28 @@ msgid "Close Findbar" msgstr "Zavřít panel hledání" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "Soubor %s byl stažen." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Smazat vše" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Některé soubory se stále stahují" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "U_končit aplikaci Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Pokud bude aplikace Midori ukončena, stahování se stornuje." @@ -1984,47 +2015,47 @@ msgid "Animation frames are broken" msgstr "Snímky animace jsou porušené" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnost '%s' je pro %s neplatná" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Zvolit soubor" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Zvolit složku" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "není" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hodině" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dni" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 týdnu" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 měsíci" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 roce" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Nastavení pro %s" @@ -2041,7 +2072,7 @@ msgid "Configure Advertisement filters" msgstr "Nastavení filtrů blokování reklamy" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2051,27 +2082,27 @@ "tlačítko \"Přidat\" ji přidáte do seznamu. Více připravených filtrů " "naleznete na adrese %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Upravit pravidlo" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "P_ravidlo:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Bl_okovat obrázek" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Bl_okovat odkaz" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Blokování reklamy" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Blokovat reklamu podle seznamu filtrů" @@ -2157,11 +2188,11 @@ msgid "Support for userscripts and userstyles" msgstr "Podpora uživatelských skriptů a stylů." -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Barevné karty" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Obarvit každou kartu zvlášť" @@ -2242,7 +2273,7 @@ "Cookies: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Název" @@ -2473,68 +2504,68 @@ msgid "Failed to select suggestions\n" msgstr "Nepodařilo se vybrat návrh\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Žádné nenavštívené karty" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Historie" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Při zavření karty" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "nedělat nic" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "přepnout na poslední prohlíženou kartu" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "přepnout na naposledy přidanou kartu" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "Další nová karta (v historii)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "Zvolí další novou kartu z historie" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "Předchozí nová karta (v seznamu historie)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "Zvolí předchozí novou kartu z historie" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "Zobrazit kartu na pozadí (Seznam historie)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "Zobrazí vybranou kartu na pozadí" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "Seznam historie" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "Při přepínání nebo zavírání karet přesunout do naposledy použitých" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Gesta myší" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Ovládat aplikaci Midori pomocí myši" @@ -2547,7 +2578,7 @@ msgstr "Přizpůsobení klávesových zkratek" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." +msgid "Customize Sh_ortcuts…" msgstr "Přizpůsobení klávesových _zkratek…" #: ../extensions/shortcuts.c:312 @@ -2586,15 +2617,15 @@ msgid "Easily toggle features on web pages on and off" msgstr "Jednoduše zapíná a vypíná rozšíření webových stránek" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panel karet" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Panel _karet" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Zobrazí karty ve svislém panelu" @@ -2606,11 +2637,11 @@ msgid "New tabs have no label by default" msgstr "Nové karty nebudou mít ve výchozím stavu popisek" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Upravit panel nástrojů" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2618,23 +2649,23 @@ "Vybrané položky se zobrazí na panelu nástrojů. Změnu pořadí položek " "provedete přetažením." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Dostupné položky" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Zobrazené položky" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "Upravit pane_l nástrojů…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Editor panelu nástrojů" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "Umožňuje jednoduše změnit rozvržení panelu nástrojů" @@ -2685,7 +2716,7 @@ msgid "Open tabs" msgstr "Otevřít v kartách" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Další otevřené karty..." @@ -2731,34 +2762,34 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky nelze uložit. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nelze ověřit." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfiguraci nelze uložit. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Relaci nelze načíst: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "Relaci nelze uložit. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Seznam zavřených karet nelze uložit. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2766,99 +2797,107 @@ "Aplikace Midori zřejmě minule nebyla řádně ukončena. V případě opakujících " "se potíží použijte k jejich odstranění následující možnosti." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Zobrazit dialog po pádu aplikace Midori" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Zahodit staré karty" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Zobrazit záznam pos_ledního pádu" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "Spustit v _debuggeru" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "Instance aplikace Midori je již spuštěna, ale neodpovídá.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Záložky nelze načíst: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nelze načíst: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historii nelze načíst: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Ignorovat" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "SQL selhalo: %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "Přijmout" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "Přijmout pro sezení" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "Odmítnout" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format msgid "Could not open database of extenstion: %s" msgstr "Nepodařilo se otevřít databázi pro rozšíření: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, c-format msgid "Failed to execute database statement: %s" msgstr "Nepodařilo se spustit databázový příkaz: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Opravdu chcete smazat všechna oprávnění cookies?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Smazat všechna oprávnění cookies?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." @@ -2866,20 +2905,20 @@ "Tato akce smaže všechna oprávnění k cookies. Při další návštěvě stránek bude " "znovu vyžadován souhlas s oprávněními." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Správce oprávnění cookies" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "Instance správce oprávnění cookies" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "Nastavení oprávnění cookies" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2891,25 +2930,25 @@ "oprávnění po kliknutí na Smazat. Také můžete přidat oprávnění ručně " "zadáním domény, výběrem oprávnění a kliknutím na Přidat." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "Doména" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "Oprávnění" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "Smazat _vše" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "Ze_ptat se na oprávnění u neznámé domény" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." @@ -2917,122 +2956,128 @@ "Došlo k chybě, která zabraňuje správci oprávnění cookies v práci. Bylo by " "vhodné správce vypnout." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "Chyba ve správci oprávnění cookies" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "Důvod" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "Nelze zjistit cestu k nastavení rozšíření: cesta je NULL" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "Nelze zjistit cestu k nastavení rozšíření." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "Nelze vytvořit složku pro uložení nastavení rozšíření: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "Nelze vytvořit složku pro uložení nastavení rozšíření." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 msgid "Could not open database of extension." msgstr "Nepodařilo se otevřít databázi pro rozšíření." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "Nelze vytvořit databázovou strukturu pro rozšíření." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "Nelze zjistit výchozí nastavení oprávnění cookies pro doménu: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "Potvrzení uložení cookie" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "Sezení ukončeno" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "Stránky %s potřebují uložit %d cookies." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "Stránky %s vyžadují uložit cookie." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "Několik stránek vyžaduje uložit celkem %d cookies." -#. Create expander for details -#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 -msgid "_Details" -msgstr "_Detaily" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "_Přijmout" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Přijmout pro toto _sezení" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "Odmít_nout" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "_Teď odepřít" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 msgid "Path" msgstr "Cesta" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 msgid "Value" msgstr "Hodnota" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 msgid "Expire date" msgstr "Vyprší dne" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" -msgstr "_Přijmout" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "Přijmout pro toto _sezení" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" -msgstr "Odmít_nout" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "Instance rozšíření" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "Instance rozšíření pro toto rozšíření" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "Instance aplikace" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "Instance aplikace Midori tohoto rozšíření náleží" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "Instance databáze" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "Ukazatel na instanci databáze sqlite používaný tímto rozšířením" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "Cesta k databázi" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "Cesta k sqlite databázi, která je používána tímto rozšířením" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "Zeptat se v případě neznámého oprávnění" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 msgid "" "If true this extension ask for policy for every unknown domain.If false this " "extension uses the global cookie policy set in Midori settings." @@ -3040,7 +3085,7 @@ "Pokud je povoleno, bude se toto rozšíření dotazovat na oprávnění při " "návštěvě neznámých stránek. Pokud je zakázáno, použije se výchozí nastavení." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "Neurčeno" @@ -3052,6 +3097,18 @@ msgid "Manage cookie permission per site" msgstr "Spravovat oprávnění cookies pro stránky jednotlivě" +#~ msgid "Custom..." +#~ msgstr "Vlastní…" + +#~ msgid "Confirm storing cookie" +#~ msgstr "Potvrzení uložení cookie" + +#~ msgid "_Details" +#~ msgstr "_Detaily" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Určuje, jak se bude aplikace identifikovat webovým stránkám" + #~ msgid "Writing failed." #~ msgstr "Zápis se nezdařil." @@ -3172,9 +3229,6 @@ #~ msgid "The homepage" #~ msgstr "Domovská stránka" -#~ msgid "Show crash dialog" -#~ msgstr "Zobrazit dialog po pádu" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "Složka, do níž se budou ukládat stažené soubory" @@ -3639,9 +3693,6 @@ #~ msgid "Quit the application" #~ msgstr "Ukončit aplikaci" -#~ msgid "Show Blank page" -#~ msgstr "zobrazit prázdnou stránku" - #~ msgid "_Contents" #~ msgstr "_Obsah" @@ -3789,9 +3840,6 @@ #~ msgid "Open _Link" #~ msgstr "Otevřít _odkaz" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Otevřít _obrázek v novém okně" - #~ msgid "" #~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "" diff -Nru midori-0.4.9/po/de.po midori-0.5.0/po/de.po --- midori-0.4.9/po/de.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/de.po 2013-04-04 20:31:20.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-23 05:30+0000\n" +"POT-Creation-Date: 2013-03-24 04:18+0000\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -26,8 +26,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer;Browser" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:138 ../midori/main.c:151 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 +#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3856 ../midori/sokoke.c:561 msgid "Midori" msgstr "Midori" @@ -39,11 +40,11 @@ msgid "New Private Browsing Window" msgstr "Neues Fenster zum privaten Surfen" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1268 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1316 msgid "New Tab" msgstr "Neuer Reiter" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1265 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1313 msgid "New Window" msgstr "Neues Fenster" @@ -59,285 +60,297 @@ msgid "Open a new private browsing window" msgstr "Neues Fenster zum privaten Surfen öffnen" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:3922 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4176 msgid "Private Browsing" msgstr "Privat surfen" -#: ../midori/main.c:62 +#: ../midori/main.c:63 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "Private browsing, no changes are saved" msgstr "Privat surfen, Änderungen werden nicht gespeichert" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "Portable mode, all runtime files are stored in one place" msgstr "Portabler Modus, alle Laufzeitdateien werden an einem Ort gespeichert" -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" msgstr "Einfaches GTK+-Fenster mit WebKit, verwandt mit GtkLauncher" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "Show a diagnostic dialog" msgstr "Diagnosedialog anzeigen" -#: ../midori/main.c:101 +#: ../midori/main.c:104 +#, fuzzy +msgid "Run within gdb and save a backtrace on crash" +msgstr "Gemeinsam mit gdb ausführen und einen Backtrace beim Absturz speichern" + +#: ../midori/main.c:106 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javascript ausführen" -#: ../midori/main.c:103 +#: ../midori/main.c:108 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen Adresse aufnehmen" -#: ../midori/main.c:105 +#: ../midori/main.c:110 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:107 +#: ../midori/main.c:112 msgid "List available commands to execute with -e/ --execute" msgstr "Alle Befehle auflisten, die mit -e/ --execute ausgeführt werden können" -#: ../midori/main.c:109 +#: ../midori/main.c:114 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:111 +#: ../midori/main.c:116 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "Block URIs according to regular expression PATTERN" msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "PATTERN" msgstr "MUSTER" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen" -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "SECONDS" msgstr "SEKUNDEN" -#: ../midori/main.c:152 +#: ../midori/main.c:155 +#, c-format, fuzzy +msgid "Error: \"gdb\" can't be found\n" +msgstr "Fehler: \"gdb\" konnte nicht gefunden werden" + +#: ../midori/main.c:182 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:154 +#: ../midori/main.c:184 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:299 +#: ../midori/main.c:378 msgid "An unknown error occured" msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:524 +#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:569 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5993 +#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6070 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1351 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1352 msgid "_Extensions" msgstr "_Erweiterungen" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Verlauf" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1354 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1355 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1356 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1357 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1358 msgid "Netscape p_lugins" msgstr "Netscape-Modu_le" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1359 msgid "_Closed Tabs" msgstr "Ges_chlossene Reiter" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5132 +#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5209 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1361 msgid "New _Folder" msgstr "Neuer _Ordner" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419 +#: ../midori/midori-app.c:1422 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:524 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:549 ../midori/midori-array.c:588 +#: ../midori/midori-array.c:612 ../midori/midori-array.c:622 msgid "Malformed document." msgstr "Fehlerhaftes Dokument." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:631 msgid "Unrecognized bookmark format." msgstr "Unbekanntes Lesezeichenformat." -#: ../midori/midori-array.c:915 -msgid "Writing failed." -msgstr "Schreiben fehlgeschlagen." - -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5268 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5345 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5276 -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5356 msgid "Go to the next sub-page" msgstr "Gehe weiter zur nächsten Unterseite" -#: ../midori/midori-browser.c:431 ../midori/midori-browser.c:5217 -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5303 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:439 ../midori/midori-browser.c:5223 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5300 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Titel konnte nicht aktualisiert werden: %s\n" -#: ../midori/midori-browser.c:604 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:565 +#: ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Wert »%s« ist ungültig für %s" + +#: ../midori/midori-browser.c:645 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Privat surfen)" -#: ../midori/midori-browser.c:714 ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:755 ../midori/midori-browser.c:797 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:851 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:851 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:853 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:853 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:846 +#: ../midori/midori-browser.c:887 msgid "Type a name for this bookmark and choose where to keep it." msgstr "" "Namen des Lesezeichens eingeben und angeben, wo es gespeichert werden soll." -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:943 msgid "Add to _Speed Dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:908 +#: ../midori/midori-browser.c:949 msgid "Show in the tool_bar" msgstr "In der Werkzeug_leiste anzeigen" -#: ../midori/midori-browser.c:916 +#: ../midori/midori-browser.c:957 msgid "Run as _web application" msgstr "Als _Internetanwendung starten" -#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4390 +#: ../midori/midori-browser.c:1073 ../midori/midori-browser.c:4452 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1036 +#: ../midori/midori-browser.c:1083 msgid "Save associated _resources" msgstr "Zugehörige _Ressourcen speichern" -#: ../midori/midori-browser.c:1265 +#: ../midori/midori-browser.c:1313 msgid "A new window has been opened" msgstr "Ein neues Fenster wurde geöffnet" -#: ../midori/midori-browser.c:1268 +#: ../midori/midori-browser.c:1316 msgid "A new tab has been opened" msgstr "Ein neuer Reiter wurde geöffnet" -#: ../midori/midori-browser.c:1285 +#: ../midori/midori-browser.c:1334 msgid "Error opening the image!" msgstr "Fehler beim Öffnen des Bildes!" -#: ../midori/midori-browser.c:1286 +#: ../midori/midori-browser.c:1335 msgid "Can not open selected image in a default viewer." msgstr "" "Das ausgewählte Bild kann nicht im Standardbildbetrachter geöffnet werden." -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1341 msgid "Error downloading the image!" msgstr "Fehler beim Herunterladen des Bildes!" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1342 msgid "Can not download selected image." msgstr "Das Bild kann nicht heruntergeladen werden" -#: ../midori/midori-browser.c:1350 +#: ../midori/midori-browser.c:1401 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2373 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2444 +#: ../midori/midori-browser.c:2501 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -352,24 +365,24 @@ "Nachrichtenaggregator auswählen. Dann wird beim nächsten Klick auf das " "Symbol für Nachrichtenquellen die Addresse automatisch hinzugefügt." -#: ../midori/midori-browser.c:2450 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2507 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:2493 ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:2539 ../midori/midori-browser.c:5369 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3011 ../midori/midori-searchaction.c:481 +#: ../midori/midori-browser.c:3065 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Leer" -#: ../midori/midori-browser.c:3406 ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 msgid "Toggle text cursor navigation" msgstr "Navigation mit Textmarke einschalten" -#: ../midori/midori-browser.c:3409 +#: ../midori/midori-browser.c:3450 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -377,109 +390,109 @@ "Drücken von F7 aktiviert bzw. deaktiviert Caret Browsing. Falls aktiviert " "wird auf allen Internetseiten ein Textcursor angezeigt." -#: ../midori/midori-browser.c:3412 +#: ../midori/midori-browser.c:3453 msgid "_Enable Caret Browsing" msgstr "Navigation mit Textcursor" -#: ../midori/midori-browser.c:3796 ../midori/midori-browser.c:5740 +#: ../midori/midori-browser.c:3869 ../midori/midori-browser.c:5817 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-browser.c:4122 ../panels/midori-bookmarks.c:840 -#: ../panels/midori-history.c:797 +#: ../midori/midori-browser.c:4184 ../panels/midori-bookmarks.c:835 +#: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:4129 ../panels/midori-bookmarks.c:846 -#: ../panels/midori-history.c:803 ../extensions/feed-panel/feed-panel.c:519 +#: ../midori/midori-browser.c:4191 ../panels/midori-bookmarks.c:841 +#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:4132 ../midori/midori-view.c:2637 -#: ../midori/midori-view.c:4428 ../panels/midori-bookmarks.c:848 -#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:521 +#: ../midori/midori-browser.c:4194 ../midori/midori-view.c:2771 +#: ../midori/midori-view.c:4654 ../panels/midori-bookmarks.c:843 +#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:4221 +#: ../midori/midori-browser.c:4283 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4222 +#: ../midori/midori-browser.c:4284 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:4285 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4224 +#: ../midori/midori-browser.c:4286 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:4287 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4288 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:4289 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4307 msgid "Import bookmarks…" msgstr "Lesezeichen importieren …" -#: ../midori/midori-browser.c:4248 ../midori/midori-browser.c:5297 +#: ../midori/midori-browser.c:4310 ../midori/midori-browser.c:5374 msgid "_Import bookmarks" msgstr "Lesezeichen _importieren" -#: ../midori/midori-browser.c:4259 +#: ../midori/midori-browser.c:4321 msgid "_Application:" msgstr "_Anwendung:" -#: ../midori/midori-browser.c:4324 +#: ../midori/midori-browser.c:4386 msgid "Import from XBEL or HTML file" msgstr "Aus einer XBEL- oder HTML-Datei importieren" -#: ../midori/midori-browser.c:4352 +#: ../midori/midori-browser.c:4414 msgid "Import from a file" msgstr "Aus einer Datei importieren" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4426 msgid "Failed to import bookmarks" msgstr "Fehler beim Importieren der Lesezeichen" -#: ../midori/midori-browser.c:4395 +#: ../midori/midori-browser.c:4457 msgid "XBEL Bookmarks" msgstr "XBEL-Lesezeichen" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4462 msgid "Netscape Bookmarks" msgstr "Netscape-Lesezeichen" -#: ../midori/midori-browser.c:4414 +#: ../midori/midori-browser.c:4476 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Midori kann nur zu XBEL (*.xbel) oder Netscape (*.html) exportieren" -#: ../midori/midori-browser.c:4429 +#: ../midori/midori-browser.c:4491 msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" -#: ../midori/midori-browser.c:4650 +#: ../midori/midori-browser.c:4707 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:4651 +#: ../midori/midori-browser.c:4708 msgid "See about:version for version info." msgstr "Siehe about:version für Versionsinformationen." -#: ../midori/midori-browser.c:4653 +#: ../midori/midori-browser.c:4710 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -491,380 +504,381 @@ "veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " "2.1 der Lizenz oder (wahlweise) jeder späteren Version." -#: ../midori/midori-browser.c:4683 +#: ../midori/midori-browser.c:4745 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:5207 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:5210 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5213 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:5215 msgid "New P_rivate Browsing Window" msgstr "Neues Fenster zum _privaten Surfen" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5219 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5221 msgid "_Save Page As…" msgstr "_Seite speichern unter …" -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:5222 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:5147 +#: ../midori/midori-browser.c:5224 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5151 +#: ../midori/midori-browser.c:5228 msgid "Create _Launcher" msgstr "_Starter erstellen" -#: ../midori/midori-browser.c:5154 +#: ../midori/midori-browser.c:5231 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5237 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5238 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:5240 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:5167 +#: ../midori/midori-browser.c:5244 msgid "_Share" msgstr "_Freigeben" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5245 msgid "Share this page" msgstr "Diese Seite teilen" -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:5249 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:5252 msgid "Close a_ll Windows" msgstr "_Alle Fenster schließen" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:5255 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:5278 msgid "_Find…" msgstr "_Suchen …" -#: ../midori/midori-browser.c:5202 +#: ../midori/midori-browser.c:5279 msgid "Find a word or phrase in the page" msgstr "Ein Wort oder einen Satz auf der Seite suchen" -#: ../midori/midori-browser.c:5204 +#: ../midori/midori-browser.c:5281 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:5207 +#: ../midori/midori-browser.c:5284 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:5211 +#: ../midori/midori-browser.c:5288 msgid "Configure the application preferences" msgstr "Anwendungseinstellungen anpassen" -#: ../midori/midori-browser.c:5213 +#: ../midori/midori-browser.c:5290 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5291 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5296 msgid "Reload page without caching" msgstr "Seite ohne Zwischenspeicher neu laden" -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5306 msgid "Increase the zoom level" msgstr "Die Vergrößerungsstufe erhöhen" -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5309 msgid "Decrease the zoom level" msgstr "Die Vergrößerungsstufe verringern" -#: ../midori/midori-browser.c:5236 +#: ../midori/midori-browser.c:5313 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5315 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5318 msgid "Ca_ret Browsing" msgstr "Navigation mit Textma_rke" -#: ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5322 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5324 msgid "Scroll _Left" msgstr "Nach _links rollen" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5327 msgid "Scroll _Down" msgstr "_Herunter rollen" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5330 msgid "Scroll _Up" msgstr "H_och rollen" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5333 msgid "Scroll _Right" msgstr "Nach _rechts rollen" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5336 msgid "_Readable" msgstr "Lesba_r" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5339 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5342 msgid "Go back to the previous page" msgstr "Zur vorherigen Seite zurück gehen" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:5349 msgid "Go to the previous sub-page" msgstr "Zur vorherigen Unterseite zurück gehen" -#: ../midori/midori-browser.c:5281 +#: ../midori/midori-browser.c:5358 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/midori-browser.c:5282 +#: ../midori/midori-browser.c:5359 msgid "Go to your homepage" msgstr "Zu Ihrer Startseite gehen" -#: ../midori/midori-browser.c:5284 +#: ../midori/midori-browser.c:5361 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5364 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5371 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5377 msgid "_Export bookmarks" msgstr "Lesezeichen _exportieren" -#: ../midori/midori-browser.c:5303 ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5380 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5383 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5386 msgid "_Inspect Page" msgstr "Seite _untersuchen" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5390 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5393 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:5318 +#: ../midori/midori-browser.c:5395 msgid "Move Tab to _first position" msgstr "Reiter an die _erste Position verschieben." -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:5397 msgid "Move Tab _Backward" msgstr "Reiter _zurück schieben" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5399 msgid "_Move Tab Forward" msgstr "Reiter v_orwärts schieben" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5401 msgid "Move Tab to _last position" msgstr "Reiter an die _letzte Position verschieben." -#: ../midori/midori-browser.c:5327 +#: ../midori/midori-browser.c:5404 msgid "Focus _Current Tab" msgstr "_Aktuellen Reiter fokussieren" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5407 msgid "Focus _Next view" msgstr "_Nächste Ansicht fokussieren" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:5410 msgid "Only show the Icon of the _Current Tab" msgstr "Nur das Symbol des _aktuellen Reiters anziegen" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5413 msgid "_Duplicate Current Tab" msgstr "Aktuellen Reiter _verdoppeln" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5416 msgid "Close Ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5419 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5422 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5424 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5427 msgid "_Report a Problem…" msgstr "Einen Fehler _melden …" -#: ../midori/midori-browser.c:5355 ../midori/midori-browser.c:6012 +#: ../midori/midori-browser.c:5432 ../midori/midori-browser.c:6089 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:5439 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:5366 +#: ../midori/midori-browser.c:5443 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5447 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5448 msgid "Sidepanel" msgstr "Seitenleiste" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5451 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:5455 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:5387 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5390 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Traditionelles Chinesisch (BIG5)" -#: ../midori/midori-browser.c:5393 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Vereinfachtes Chinesisch (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5474 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:5400 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5477 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Koreanisch (EUC-KR)" -#: ../midori/midori-browser.c:5403 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5480 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5483 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5486 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:603 msgid "Custom…" msgstr "Benutzerdefiniert …" -#: ../midori/midori-browser.c:5918 +#: ../midori/midori-browser.c:5995 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:5925 +#: ../midori/midori-browser.c:6002 msgid "_Location…" msgstr "_Ort …" -#: ../midori/midori-browser.c:5927 +#: ../midori/midori-browser.c:6004 msgid "Open a particular location" msgstr "Einen bestimmten Ort öffnen" -#: ../midori/midori-browser.c:5949 +#: ../midori/midori-browser.c:6026 msgid "_Web Search…" msgstr "Im _Netz suchen …" -#: ../midori/midori-browser.c:5951 +#: ../midori/midori-browser.c:6028 msgid "Run a web search" msgstr "Eine Suche im Netz starten" -#: ../midori/midori-browser.c:5978 +#: ../midori/midori-browser.c:6055 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:5995 +#: ../midori/midori-browser.c:6072 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:6028 -msgid "_Window" -msgstr "_Fenster" +#: ../midori/midori-browser.c:6105 +msgid "_Tabs" +msgstr "_Reiter" -#: ../midori/midori-browser.c:6030 +#: ../midori/midori-browser.c:6107 msgid "Show a list of all open tabs" msgstr "Eine Übersicht aller offenen Reiter zeigen" -#: ../midori/midori-browser.c:6044 +#: ../midori/midori-browser.c:6121 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6046 +#: ../midori/midori-browser.c:6123 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:6826 +#: ../midori/midori-browser.c:6892 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -875,7 +889,7 @@ msgstr "" "Die Konfiguration der Erweiterung »%s« konnte nicht geladen werden: %s\n" -#: ../midori/midori-extension.c:881 ../extensions/addons.c:1676 +#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "" @@ -922,32 +936,32 @@ msgid "Some other error occurred validating the certificate." msgstr "Ein anderer Fehler trat bei der Überprüfung des Zertifikats auf." -#: ../midori/midori-locationaction.c:1419 +#: ../midori/midori-locationaction.c:1420 msgid "_Export certificate" msgstr "Zertifikat _exportieren" -#: ../midori/midori-locationaction.c:1434 +#: ../midori/midori-locationaction.c:1435 msgid "Self-signed" msgstr "Selbstsigniert" -#: ../midori/midori-locationaction.c:1468 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Sicherheitsdetails" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1555 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Einfügen und _fortfahren" -#: ../midori/midori-locationaction.c:1787 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Nicht überprüft" -#: ../midori/midori-locationaction.c:1795 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Überprüfte und verschlüsselte Verbindung" -#: ../midori/midori-locationaction.c:1802 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Offene, unverschlüsselte Verbindung" @@ -964,439 +978,433 @@ msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Schnellwahl anzeigen" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Startseite anzeigen" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:338 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:344 msgid "Show last open tabs" msgstr "Zuletzt geöffnete Reiter anzeigen" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:337 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:343 msgid "Show last tabs without loading" msgstr "Letzte Reiter zeigen, ohne sie zu laden" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +#, fuzzy +msgid "Show Blank Page" +msgstr "Leere Seite anzeigen" + +#: ../midori/midori-websettings.c:134 +#, fuzzy +msgid "Show default Search Engine" +msgstr "Suchmaschinen verwalten" + +#: ../midori/midori-websettings.c:136 +#, fuzzy +msgid "Show custom page" +msgstr "Startseite anzeigen" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Benutzerdefiniert …" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Kleine Symbole" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME oder Umgebung)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Kein Zwischenrechner" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Werkzeugleistenstil:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Beim Starten von Midori:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Neue Seiten öffnen in:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Ausgeben als" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Legt fest, wie gegenüber Seiten im Internet identifiziert werden soll" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Immer meine Schriften benutzen" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "" "Schriftarten auf Internetseiten mit Benutzereinstellungen überschreiben" -#: ../midori/midori-websettings.c:1305 ../midori/midori-websettings.c:1311 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/midori-websettings.c:1360 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Wert »%s« ist ungültig für %s" - -#: ../midori/midori-websettings.c:1365 ../midori/midori-websettings.c:1476 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/midori-tab.vala:117 +#: ../midori/midori-tab.vala:121 #, fuzzy, c-format msgid "Failed to inject stylesheet: %s" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-view.c:725 ../midori/midori-view.c:866 +#: ../midori/midori-view.c:767 ../midori/midori-view.c:895 msgid "Trust this website" msgstr "Dieser Webseite vertrauen" -#: ../midori/midori-view.c:864 +#: ../midori/midori-view.c:893 msgid "Security unknown" msgstr "Sicherheitsstufe unbekannt" -#: ../midori/midori-view.c:1162 +#: ../midori/midori-view.c:1194 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s möchte eine HTML5-Datenbank speichern." -#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Deny" msgstr "_Verweigern" -#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Allow" msgstr "_Zulassen" -#: ../midori/midori-view.c:1194 +#: ../midori/midori-view.c:1226 #, c-format msgid "%s wants to know your location." msgstr "%s möchte Ihren Standort wissen." -#: ../midori/midori-view.c:1305 +#: ../midori/midori-view.c:1357 #, c-format msgid "Error - %s" msgstr "Fehler - %s" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1358 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite »%s« konnte nicht geladen werden." -#: ../midori/midori-view.c:1308 +#: ../midori/midori-view.c:1360 msgid "Try again" msgstr "Erneut versuchen" -#: ../midori/midori-view.c:1507 ../midori/midori-view.c:2578 +#: ../midori/midori-view.c:1620 ../midori/midori-view.c:2712 #, c-format msgid "Send a message to %s" msgstr "Nachricht an %s schicken" -#: ../midori/midori-view.c:2362 +#: ../midori/midori-view.c:2497 msgid "Add _search engine..." msgstr "_Suchmaschine hinzufügen …" -#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2713 +#: ../midori/midori-view.c:2540 ../midori/midori-view.c:2847 msgid "Inspect _Element" msgstr "Element _untersuchen" -#: ../midori/midori-view.c:2457 +#: ../midori/midori-view.c:2592 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2461 +#: ../midori/midori-view.c:2596 msgid "Open Link in _Foreground Tab" msgstr "Verweis in _Vordergrund-Reiter öffnen" -#: ../midori/midori-view.c:2462 +#: ../midori/midori-view.c:2597 msgid "Open Link in _Background Tab" msgstr "Verweis in _Hintergrund-Reiter öffnen" -#: ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2600 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:2468 +#: ../midori/midori-view.c:2603 msgid "Open Link as Web A_pplication" msgstr "Verweis als _Internetanwendung öffnen" -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2608 msgid "Copy Link de_stination" msgstr "Verweisziel k_opieren" -#: ../midori/midori-view.c:2489 +#: ../midori/midori-view.c:2614 +#, fuzzy +msgid "Save _As…" +msgstr "_Seite speichern unter …" + +#: ../midori/midori-view.c:2624 +#, fuzzy +msgid "Open _Image in New Window" +msgstr "Bild in neuem Fe_nster öffnen" + +#: ../midori/midori-view.c:2625 msgid "Open _Image in New Tab" msgstr "_Bild in neuem Reiter öffnen" -#: ../midori/midori-view.c:2492 +#: ../midori/midori-view.c:2629 #, fuzzy msgid "Copy Im_age" msgstr "Bild kopieren" -#: ../midori/midori-view.c:2495 +#: ../midori/midori-view.c:2632 msgid "Save I_mage" msgstr "Bi_ld speichern" -#: ../midori/midori-view.c:2498 +#: ../midori/midori-view.c:2635 msgid "Open in Image _Viewer" msgstr "In _Bildbetrachter öffnen" -#: ../midori/midori-view.c:2505 +#: ../midori/midori-view.c:2642 msgid "Copy Video _Address" msgstr "Video_adresse kopieren" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2645 msgid "Save _Video" msgstr "_Video speichern" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2645 msgid "Download _Video" msgstr "_Video herunterladen" -#: ../midori/midori-view.c:2534 +#: ../midori/midori-view.c:2671 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:2566 +#: ../midori/midori-view.c:2700 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2720 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2767 msgid "Open _Frame in New Tab" msgstr "_Rahmen in neuem Reiter öffnen" -#: ../midori/midori-view.c:2845 +#: ../midori/midori-view.c:2984 #, c-format msgid "Open or download file from %s" msgstr "Datei öffnen oder von %s herunterladen" -#: ../midori/midori-view.c:2858 +#: ../midori/midori-view.c:2997 #, c-format msgid "File Name: %s" msgstr "Dateiname: %s" -#: ../midori/midori-view.c:2863 +#: ../midori/midori-view.c:3002 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:2865 +#: ../midori/midori-view.c:3004 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s (»%s«)" -#: ../midori/midori-view.c:2902 +#: ../midori/midori-view.c:3041 #, c-format msgid "Size: %s" msgstr "Größe: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2913 +#: ../midori/midori-view.c:3052 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:3435 +#: ../midori/midori-view.c:3581 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:3847 +#: ../midori/midori-view.c:4101 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:3923 +#: ../midori/midori-view.c:4177 msgid "Midori doesn't store any personal data:" msgstr "Midori speichert keine persönlichen Daten:" -#: ../midori/midori-view.c:3924 +#: ../midori/midori-view.c:4178 msgid "No history or web cookies are being saved." msgstr "Es werden weder Verlauf noch Web-Cookies gespeichert." -#: ../midori/midori-view.c:3925 +#: ../midori/midori-view.c:4179 msgid "Extensions are disabled." msgstr "Erweiterungen sind deaktiviert." -#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:4180 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "HTML5-Speicher, lokale Datenbank und Anwendungszwischenspeicher sind " "deaktiviert." -#: ../midori/midori-view.c:3927 +#: ../midori/midori-view.c:4181 msgid "Midori prevents websites from tracking the user:" msgstr "Midori verhindert, dass Webseiten ihre Nutzer verfolgen:" -#: ../midori/midori-view.c:3928 +#: ../midori/midori-view.c:4182 msgid "Referrer URLs are stripped down to the hostname." msgstr "" "Weiterleitende URLs werden bis hintunter auf den Rechnernamen aufgelöst." -#: ../midori/midori-view.c:3929 +#: ../midori/midori-view.c:4183 msgid "DNS prefetching is disabled." msgstr "DNS-Auflösung im Voraus ist deaktiviert." -#: ../midori/midori-view.c:3930 +#: ../midori/midori-view.c:4184 msgid "The language and timezone are not revealed to websites." msgstr "" "Die Sprach- und Zeitzoneneinstellungen werden Webseiten nicht verraten." -#: ../midori/midori-view.c:3931 +#: ../midori/midori-view.c:4185 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "" "Flash und andere Netscape-Erweiterungen können nicht durch Websites " "aufgelistet werden." -#: ../midori/midori-view.c:4010 +#: ../midori/midori-view.c:4225 msgid "Version numbers in brackets show the version used at runtime." msgstr "Versionsnummern in Klammern geben Versionen zur Laufzeit an." -#: ../midori/midori-view.c:4056 +#: ../midori/midori-view.c:4275 msgid "Page loading delayed" msgstr "Laden der Seite verzögert" -#: ../midori/midori-view.c:4057 +#: ../midori/midori-view.c:4276 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Laden der Seite wegen eines Absturzes oder Einstellung verzögert" -#: ../midori/midori-view.c:4058 +#: ../midori/midori-view.c:4277 msgid "Load Page" msgstr "Seite laden" -#: ../midori/midori-view.c:4222 +#: ../midori/midori-view.c:4444 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:4432 +#: ../midori/midori-view.c:4658 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:4437 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Label" msgstr "Reiterleiste anzeigen" -#: ../midori/midori-view.c:4437 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Icon Only" msgstr "Nur Reiter_symbol anzeigen" -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:4670 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Ande_ren Reiter schließen" msgstr[1] "Ande_re Reiter schließen" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5119 +#: ../midori/midori-view.c:5359 msgid "previous" msgstr "vorige" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5138 +#: ../midori/midori-view.c:5378 msgid "next" msgstr "nächste" -#: ../midori/midori-view.c:5151 +#: ../midori/midori-view.c:5391 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:5152 +#: ../midori/midori-view.c:5392 msgid "Whether background images should be printed" msgstr "Leget fest, ob Hintergrundbilder gedruckt werden sollen oder nicht" -#: ../midori/midori-view.c:5184 +#: ../midori/midori-view.c:5417 msgid "Features" msgstr "Inhalte" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:54 +#: ../midori/midori-download.vala:63 #, c-format msgid "%s of %s" msgstr "%s von %s" -#: ../midori/midori-download.vala:70 +#: ../midori/midori-download.vala:79 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: ../midori/midori-download.vala:71 +#: ../midori/midori-download.vala:80 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: ../midori/midori-download.vala:72 +#: ../midori/midori-download.vala:81 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1404,27 +1412,27 @@ msgstr[1] "%d Sekunden" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:87 +#: ../midori/midori-download.vala:96 #, c-format msgid " - %s remaining" msgstr " - %s verbleibend" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:98 +#: ../midori/midori-download.vala:107 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:100 +#: ../midori/midori-download.vala:109 #, c-format msgid " (%s/s)" msgstr " (%s/s)" -#: ../midori/midori-download.vala:197 +#: ../midori/midori-download.vala:224 msgid "The downloaded file is erroneous." msgstr "Die heruntergeladene Datei ist fehlerhaft." -#: ../midori/midori-download.vala:198 +#: ../midori/midori-download.vala:225 msgid "" "The checksum provided with the link did not match. This means the file is " "probably incomplete or was modified afterwards." @@ -1433,21 +1441,21 @@ "normalerweise, dass die Datei unvollständig ist oder im Nachhinein verändert " "wurde." -#: ../midori/midori-download.vala:312 +#: ../midori/midori-download.vala:345 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "Die Datei «%s» kann in diesem Ornder nicht gespeichert werden." -#: ../midori/midori-download.vala:314 +#: ../midori/midori-download.vala:347 msgid "You don't have permission to write in this location." msgstr "Sie haben an diesem Ort keine Schreibberechtigung." -#: ../midori/midori-download.vala:317 +#: ../midori/midori-download.vala:350 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der freie Speichersplatz reicht nicht aus, um »%s« herunterzuladen." -#: ../midori/midori-download.vala:319 +#: ../midori/midori-download.vala:352 #, c-format msgid "The file needs %s but only %s are left." msgstr "Die Datei benötigt %s, aber nur %s sind übrig." @@ -1476,121 +1484,117 @@ msgid "Startup" msgstr "Programmstart" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Beim Starten von Midori:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Startseite:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "_Aktuelle Seite benutzen" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Aktuelle Seite als Startseite benutzen" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Schriften" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Proportionale Schriftart" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Dicktengleiche Schriftart" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Rechtschreibprüfung einschalten" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "WebGL-Unterstützung einschalten" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Netscape-Module einschalten" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Skripte können Aufklappfenster öffnen" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Skripte können selbstständig neue Fenster öffnen" -#: ../midori/midori-preferences.c:403 -msgid "Kinetic scrolling" -msgstr "Sanfter Bildlauf" - -#: ../midori/midori-preferences.c:404 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Legt fest ob der Bildlauf sanft schneller und langsamer wird" - -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Auswahl" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Eine markierte Adresse mit der mittleren Maustaste laden" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Fenster bei Hintergrund-Reitern blinken lassen" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Bevorzugte Sprachen" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1599,95 +1603,118 @@ "Darstellung mehrsprachiger Internetseiten benutzt wird, zum Beispiel »de«, " "»ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Heruntergeladene Dateien speichern in:" #. Page "Interface" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Navigation" +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Werkzeugleistenstil:" + #: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Neue Seiten öffnen in:" + +#: ../midori/midori-preferences.c:451 +#, fuzzy +msgid "New tab behavior:" +msgstr "Neues Verhalten der Reiter:" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Knöpfe zum Schließen auf Reitern" -#: ../midori/midori-preferences.c:451 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Nachrichtenaggregator" #. Page "Network" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Proxy-Server" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Rechnername" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Port" +#: ../midori/midori-preferences.c:512 +#, fuzzy +msgid "Supported proxy types:" +msgstr "Unterstützte Proxy Typen" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:501 ../extensions/web-cache.c:461 -#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:304 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Zwischenspeicher" -#: ../midori/midori-preferences.c:502 ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "Die maximale Größe zwischengespeicherter Seiten auf der Festplatte" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:526 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Ausgeben als" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Privatsphäre" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Alte Cookies löschen nach:" -#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Cookies gespeichert werden" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Nur Cookies von Seiten annehmen, die ich besuche" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Cookies von Drittanbietern blockieren" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1695,76 +1722,76 @@ "Cookies sind Profildateien, die Anmeldedaten, Spielstände oder " "Benutzerprofile zu Werbezwecken speichern." -#: ../midori/midori-preferences.c:550 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "HTML5-Anwendungsspeicher einschalten" -#: ../midori/midori-preferences.c:553 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "HTML5-Lokalspeicher einschalten" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:557 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Herkunftsdetails beim Seitenwechsel kürzen" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "" "Legt fest, ob die »Referer«-Kopfzeile auf den Rechnernamen verkürzt werden " "soll" -#: ../midori/midori-preferences.c:562 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Seiten aus dem Verlauf löschen nach:" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird" -#: ../midori/midori-preferences.c:604 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Erweiterungen" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1047 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1047 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:1096 +#: ../midori/midori-searchaction.c:1075 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:1111 +#: ../midori/midori-searchaction.c:1090 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-searchaction.c:1124 ../extensions/feed-panel/main.c:376 +#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-searchaction.c:1143 +#: ../midori/midori-searchaction.c:1122 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1441 +#: ../midori/midori-searchaction.c:1412 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/midori-searchaction.c:1541 +#: ../midori/midori-searchaction.c:1512 msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/midori-searchaction.c:1652 +#: ../midori/midori-searchaction.c:1623 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/midori-searchaction.c:1707 +#: ../midori/midori-searchaction.c:1678 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s" @@ -1789,29 +1816,34 @@ msgid "Search for %s" msgstr "Nach %s suchen" -#: ../midori/midori-searchcompletion.vala:23 +#: ../midori/midori-searchcompletion.vala:20 #: ../midori/midori-searchcompletion.vala:60 msgid "Search with…" msgstr "Suchen mit …" -#: ../midori/midori-searchcompletion.vala:50 +#: ../midori/midori-searchcompletion.vala:48 #, c-format msgid "Search with %s" msgstr "Suchen mit %s" -#: ../midori/sokoke.c:251 +#: ../midori/sokoke.c:243 msgid "Open with" msgstr "Öffnen mit" -#: ../midori/sokoke.c:259 +#: ../midori/sokoke.c:251 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Anwendung oder Befehl zum Öffnen von »%s« wählen:" -#: ../midori/sokoke.c:374 ../midori/sokoke.c:388 +#: ../midori/sokoke.c:368 ../midori/sokoke.c:388 msgid "Could not run external program." msgstr "Externes Programm konnte nicht ausgeführt werden." +#: ../midori/sokoke.c:561 +#, fuzzy +msgid "Invalid URI" +msgstr "Ungültige URI" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1842,19 +1874,19 @@ msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Alle entfernen" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Einige Dateien werden gerade heruntergeladen." -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "Midori _beenden" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Die Übertragungen werden abgebrochen, wenn Midori beendet wird." @@ -1885,7 +1917,7 @@ msgstr "Trennlinie" #. Create the filter entry -#: ../panels/midori-bookmarks.c:1017 +#: ../panels/midori-bookmarks.c:1009 msgid "Search Bookmarks" msgstr "Lesezeichen durchsuchen" @@ -1930,7 +1962,7 @@ msgstr "Den gesamten Verlauf löschen" #. Create the filter entry -#: ../panels/midori-history.c:988 +#: ../panels/midori-history.c:981 msgid "Search History" msgstr "Verlauf durchsuchen" @@ -1938,11 +1970,11 @@ msgid "Transfers" msgstr "Übertragungen" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:442 msgid "Open Destination _Folder" msgstr "Zielordner ö_ffnen" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:445 msgid "Copy Link Loc_ation" msgstr "Verweisziel ko_pieren" @@ -1984,7 +2016,7 @@ msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:422 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" @@ -2002,29 +2034,29 @@ msgid "None" msgstr "Keine" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:688 msgid "1 hour" msgstr "1 Stunde" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:689 msgid "1 day" msgstr "1 Tag" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:690 msgid "1 week" msgstr "1 Woche" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:691 msgid "1 month" msgstr "1 Monat" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "1 year" msgstr "1 Jahr" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:242 #, c-format msgid "Preferences for %s" msgstr "Einstellungen für %s" @@ -2037,11 +2069,11 @@ msgid "SHA1-Checksum:" msgstr "SHA1-Prüfsumme:" -#: ../extensions/adblock.c:492 +#: ../extensions/adblock.c:483 msgid "Configure Advertisement filters" msgstr "Werbefilter einstellen" -#: ../extensions/adblock.c:523 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2051,27 +2083,27 @@ "ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " "Listen finden Sie auf %s." -#: ../extensions/adblock.c:937 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Regel bearbeiten" -#: ../extensions/adblock.c:951 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:1005 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Bild bloc_kieren" -#: ../extensions/adblock.c:1010 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Verweis blo_ckieren" -#: ../extensions/adblock.c:1936 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:1937 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" @@ -2108,7 +2140,7 @@ msgstr "Benutzerstile" #: ../extensions/addons.c:371 ../extensions/addons.c:450 -#: ../extensions/feed-panel/main.c:128 +#: ../extensions/feed-panel/main.c:120 msgid "Error" msgstr "Fehler" @@ -2159,11 +2191,11 @@ msgid "Support for userscripts and userstyles" msgstr "Unterstützung für Benutzerskripte und -stile" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Farbige Reiter" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" @@ -2192,24 +2224,24 @@ msgid "Collapse All" msgstr "Alle einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:575 msgid "Do you really want to delete all cookies?" msgstr "Sind Sie sicher, dass alle Cookies entfernt werden sollen?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:577 msgid "Question" msgstr "Frage" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:588 msgid "Only cookies which match the filter will be deleted." msgstr "" "Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "At the end of the session" msgstr "Am Ende der Sitzung" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:683 #, c-format msgid "" "Host: %s\n" @@ -2227,15 +2259,15 @@ "Verfällt: %s" #. i18n: is this cookie secure (SSL)? yes/ no -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "No" msgstr "Nein" -#: ../extensions/cookie-manager/cookie-manager-page.c:699 +#: ../extensions/cookie-manager/cookie-manager-page.c:705 #, c-format msgid "" "Domain: %s\n" @@ -2244,19 +2276,20 @@ "Domäne: %s\n" "Profildateien: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1022 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager/cookie-manager-page.c:1074 +#: ../extensions/cookie-manager/cookie-manager-page.c:1080 msgid "_Expand All" msgstr "Alle _ausklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1082 +#: ../extensions/cookie-manager/cookie-manager-page.c:1088 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../extensions/cookie-manager/cookie-manager-page.c:1134 +#: ../extensions/cookie-manager/cookie-manager-page.c:1140 msgid "Search Cookies by Name or Domain" msgstr "Cookies nach Name oder Rechner suchen" @@ -2323,7 +2356,7 @@ msgid "Download files with \"%s\" or a custom command" msgstr "Dateien mit »%s« oder benutzerdefinierten Befehl herunterladen" -#: ../extensions/external-download-manager.vala:318 +#: ../extensions/external-download-manager.vala:320 msgid "External Download Manager - CommandLine" msgstr "Externer Übertragungsmanager - Befehlszeile" @@ -2338,25 +2371,25 @@ "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:378 +#: ../extensions/feed-panel/feed-panel.c:375 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Zuletzt aktualisiert: %s." -#: ../extensions/feed-panel/feed-panel.c:644 +#: ../extensions/feed-panel/feed-panel.c:629 msgid "Feeds" msgstr "Nachrichtenquellen" -#: ../extensions/feed-panel/feed-panel.c:697 +#: ../extensions/feed-panel/feed-panel.c:682 msgid "Add new feed" msgstr "Eine neue Nachrichtenquelle hinzufügen" -#: ../extensions/feed-panel/feed-panel.c:704 +#: ../extensions/feed-panel/feed-panel.c:689 msgid "Delete feed" msgstr "Nachrichtenquelle löschen" -#: ../extensions/feed-panel/feed-panel.c:784 +#: ../extensions/feed-panel/feed-panel.c:769 msgid "_Feeds" msgstr "_Nachrichtenquellen (Feeds)" @@ -2393,21 +2426,21 @@ msgstr "" "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." -#: ../extensions/feed-panel/main.c:130 +#: ../extensions/feed-panel/main.c:122 #, c-format msgid "Feed '%s' already exists" msgstr "Nachrichtenquelle »%s« ist bereits vorhanden" -#: ../extensions/feed-panel/main.c:207 +#: ../extensions/feed-panel/main.c:199 #, c-format msgid "Error loading feed '%s'" msgstr "Fehler beim Laden der Nachrichtenquelle »%s«" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:509 msgid "Feed Panel" msgstr "Nachrichtenquellenleiste" -#: ../extensions/feed-panel/main.c:518 +#: ../extensions/feed-panel/main.c:510 msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" @@ -2486,60 +2519,60 @@ msgid "Failed to select suggestions\n" msgstr "Vervollständigung schlug fehl\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:204 msgid "There are no unvisited tabs" msgstr "Keine unbesuchten Reiter vorhanden" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:242 #, c-format msgid "History-List" msgstr "Verlaufsliste" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:282 msgid "Tab closing behavior" msgstr "Verhalten beim Schließen von Reitern" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:290 msgid "Do nothing" msgstr "Nichts tun" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:296 msgid "Switch to last viewed tab" msgstr "Zum letzten Reiter wechseln" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:302 msgid "Switch to newest tab" msgstr "Zum nächsten neuen Reiter wechseln" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:430 msgid "Next new Tab (History List)" msgstr "Nächster neuer Reiter (Verlaufsgestützte Liste)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:431 msgid "Next new tab from history" msgstr "Nächster neuer Reiter aus dem Verlauf" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:440 msgid "Previous new Tab (History List)" msgstr "Voheriger neuer Reiter (Verlaufsgestützte Liste)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:441 msgid "Previous new tab from history" msgstr "Voheriger neuer Reiter aus dem Verlauf" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:450 msgid "Display tab in background (History List)" msgstr "Reiter in Hintergrund anzeigen (Verlaufsliste)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:451 msgid "Display the current selected tab in background" msgstr "Aktuell ausgewählten Reiter im Hintergrund anzeigen" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:578 msgid "History List" msgstr "Verlaufsgestützte Liste" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:579 msgid "Move to the last used tab when switching or closing tabs" msgstr "" "Beim Wechseln oder Schließen von Reitern zum zuletzt genutzten Reiter " @@ -2557,19 +2590,20 @@ msgid "Reload page or stop loading" msgstr "Seite neu laden oder Laden abbrechen" -#: ../extensions/shortcuts.c:176 +#: ../extensions/shortcuts.c:168 msgid "Customize Keyboard shortcuts" msgstr "Tastaturkürzel anpassen" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts..." +#: ../extensions/shortcuts.c:275 +#, fuzzy +msgid "Customize Sh_ortcuts…" msgstr "_Tastaturkürzel anpassen …" -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:312 msgid "Shortcuts" msgstr "Tastaturkürzel" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:313 msgid "View and edit keyboard shortcuts" msgstr "Tastaturkürzel ansehen und bearbeiten" @@ -2593,23 +2627,23 @@ msgid "Netscape plugins" msgstr "Netscape-Module" -#: ../extensions/statusbar-features.c:261 +#: ../extensions/statusbar-features.c:259 msgid "Statusbar Features" msgstr "Funktionen in der Statusleiste" -#: ../extensions/statusbar-features.c:262 +#: ../extensions/statusbar-features.c:260 msgid "Easily toggle features on web pages on and off" msgstr "Funktionen auf Internetseiten leicht an- und abstellen" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Reiterleiste" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "_Reiterleiste" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" @@ -2684,15 +2718,15 @@ msgstr "Private Daten beim _Beenden von Midori löschen" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:298 +#: ../midori/midori-privatedata.c:302 msgid "Saved logins and _passwords" msgstr "Gespeicherte Anmeldungen und Passwörter" -#: ../midori/midori-privatedata.c:300 +#: ../midori/midori-privatedata.c:304 msgid "Cookies and Website data" msgstr "Cookies und Webseitendaten" -#: ../midori/midori-privatedata.c:307 +#: ../midori/midori-privatedata.c:311 msgid "Website icons" msgstr "Symbole von Internetseiten" @@ -2700,7 +2734,7 @@ msgid "Open tabs" msgstr "Reiter öffnen" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 #, fuzzy msgid "More open tabs…" msgstr "_Zuletzt geöffnete Seiten" @@ -2751,35 +2785,35 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s" -#: ../midori/midori-session.c:187 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht " "überprüft werden." -#: ../midori/midori-session.c:355 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht gespeichert werden. %s" -#: ../midori/midori-session.c:376 ../midori/midori-frontend.c:447 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:454 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/midori-session.c:406 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht gespeichert werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:125 +#: ../midori/midori-frontend.c:128 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/midori-frontend.c:308 +#: ../midori/midori-frontend.c:314 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." @@ -2787,49 +2821,323 @@ "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/midori-frontend.c:318 +#: ../midori/midori-frontend.c:324 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:328 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/midori-frontend.c:331 +#: ../midori/midori-frontend.c:337 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen, nachdem Midori abgestürzt ist" -#: ../midori/midori-frontend.c:336 +#: ../midori/midori-frontend.c:342 msgid "Discard old tabs" msgstr "Alte Reiter verwerfen" -#: ../midori/midori-frontend.c:399 +#: ../midori/midori-frontend.c:406 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/midori-frontend.c:432 +#: ../midori/midori-frontend.c:439 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/midori-frontend.c:463 +#: ../midori/midori-frontend.c:470 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/midori-frontend.c:471 +#: ../midori/midori-frontend.c:478 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/midori-frontend.c:482 +#: ../midori/midori-frontend.c:489 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:494 msgid "_Ignore" msgstr "_Ignorieren" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 +#, c-format, fuzzy +msgid "SQL fails: %s" +msgstr "SQL schlägt fehl: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 +#, fuzzy +msgid "Accept" +msgstr "Cookies annehmen" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 +#, fuzzy +msgid "Accept for session" +msgstr "Cookies annehmen" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 +#, fuzzy +msgid "Block" +msgstr "Blockieren" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 +#, fuzzy, c-format +msgid "Could not open database of extenstion: %s" +msgstr "Datenbank konnte nicht geöffnet werden: %s\n" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 +#, fuzzy, c-format +msgid "Failed to execute database statement: %s" +msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 +#, fuzzy +msgid "Do you really want to delete all cookie permissions?" +msgstr "Sind Sie sicher, dass alle Cookies entfernt werden sollen?" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#, fuzzy +msgid "Delete all cookie permissions?" +msgstr "Alle Cookie Berechtigungen löschen?" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 +#, fuzzy +msgid "" +"This action will delete all cookie permissions. You will be asked for " +"permissions again for each web site visited." +msgstr "Dieser Vorgang löscht alle Cookie Berechtigungen. " + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 +#, fuzzy +msgid "Cookie permission manager" +msgstr "Cookieverwaltung" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 +msgid "Instance of current cookie permission manager" +msgstr "" + +#. Set up dialog +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 +msgid "Configure cookie permission" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 +#, c-format +msgid "" +"Below is a list of all web sites and the policy set for them. You can delete " +"policies by marking the entries and clicking on Delete.You can also " +"add a policy for a domain manually by entering the domain below, choosing " +"the policy and clicking on Add." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 +msgid "Domain" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 +msgid "Policy" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 +#, fuzzy +msgid "Delete _all" +msgstr "Alle löschen" + +#. Add "ask-for-unknown-policy" checkbox +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 +msgid "A_sk for policy if unknown for a domain" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 +msgid "" +"A fatal error occurred which prevents the cookie permission manager " +"extension to continue. You should disable it." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 +msgid "Error in cookie permission manager extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 +msgid "Reason" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 +msgid "Could not get path to configuration of extension: path is NULL" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 +msgid "Could not get path to configuration of extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#, c-format +msgid "Could not create configuration folder for extension: %s" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 +msgid "Could not create configuration folder for extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 +#, fuzzy +msgid "Could not open database of extension." +msgstr "Datenbank konnte nicht geöffnet werden: %s\n" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 +msgid "Could not set up database structure of extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 +#, c-format +msgid "Could not determine global cookie policy to set for domain: %s" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +#, fuzzy +msgid "Till session end" +msgstr "Bis Ende der Session" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 +#, c-format, fuzzy +msgid "The website %s wants to store %d cookies." +msgstr "Die Internetseite %s möchte %d Cookies speichern." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 +#, c-format, fuzzy +msgid "The website %s wants to store a cookie." +msgstr "Die Internetseite möchte einen Cookie speichern" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 +#, c-format, fuzzy +msgid "Multiple websites want to store %d cookies in total." +msgstr "Verschiedene Internetseiten möchten insgesamt %d Cookies speichern." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +#, fuzzy +msgid "_Accept" +msgstr "_Akzeptieren" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +#, fuzzy +msgid "Accept for this _session" +msgstr "Die letzte _Sitzung zurücksetzen" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 +msgid "Path" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 +msgid "Value" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 +msgid "Expire date" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 +#, fuzzy +msgid "Extension instance" +msgstr "Erweiterungen" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 +msgid "The Midori extension instance for this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 +#, fuzzy +msgid "Application instance" +msgstr "Anwendungen" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 +msgid "The Midori application instance this extension belongs to" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 +msgid "Database instance" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 +msgid "Pointer to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 +msgid "Ask for unknown policy" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 +msgid "" +"If true this extension ask for policy for every unknown domain.If false this " +"extension uses the global cookie policy set in Midori settings." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 +msgid "Undetermined" +msgstr "" + +#: ../extensions/cookie-permissions/main.c:62 +#, fuzzy +msgid "Cookie Security Manager" +msgstr "Cookieverwaltung" + +#: ../extensions/cookie-permissions/main.c:63 +msgid "Manage cookie permission per site" +msgstr "" + +#~ msgid "Writing failed." +#~ msgstr "Schreiben fehlgeschlagen." + +#~ msgid "_Window" +#~ msgstr "_Fenster" + +#~ msgid "Custom..." +#~ msgstr "Benutzerdefiniert …" + +#~ msgid "What to identify as to web pages" +#~ msgstr "" +#~ "Legt fest, wie gegenüber Seiten im Internet identifiziert werden soll" + +#~ msgid "Kinetic scrolling" +#~ msgstr "Sanfter Bildlauf" + +#~ msgid "Whether scrolling should kinetically move according to speed" +#~ msgstr "Legt fest ob der Bildlauf sanft schneller und langsamer wird" + #~ msgid "Redirects console warnings to the specified FILENAME" #~ msgstr "Konsolenwarnungen in DATEINAME umleiten" @@ -3274,9 +3582,6 @@ #~ msgid "Big" #~ msgstr "Groß" -#~ msgid "Reset the last _session" -#~ msgstr "Die letzte _Sitzung zurücksetzen" - #~ msgid "Configure _Advertisement filters…" #~ msgstr "Werbefilter einstellen…" @@ -3301,9 +3606,6 @@ #~ msgid "Delete old cookies after 1 week" #~ msgstr "Alte Cookies after 1 Woche löschen" -#~ msgid "Delete old cookies after 1 month" -#~ msgstr "Alte Cookies nach 1 Monat löschen" - #~ msgid "Delete old cookies after 1 year" #~ msgstr "Alte Cookies nach 1 Jahr löschen" @@ -3346,9 +3648,6 @@ #~ msgid "Where to open externally opened pages" #~ msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#~ msgid "Accept cookies" -#~ msgstr "Cookies annehmen" - #~ msgid "What type of cookies to accept" #~ msgstr "Welche Art von Profildateien (Cookies) angenommen werden" @@ -3382,9 +3681,6 @@ #~ msgid "Interface" #~ msgstr "Oberfläche" -#~ msgid "Applications" -#~ msgstr "Anwendungen" - #~ msgid "External applications" #~ msgstr "Externe Anwendungen" @@ -3412,9 +3708,6 @@ #~ msgid "Quit the application" #~ msgstr "Programm beenden" -#~ msgid "Show Blank page" -#~ msgstr "Leere Seite anzeigen" - #~ msgid "Download with Download _Manager" #~ msgstr "Mit Übertragungs_manager herunterladen" @@ -3574,9 +3867,6 @@ #~ msgid "Open _Link" #~ msgstr "Ver_weis öffnen" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Bild in neuem Fe_nster öffnen" - #~ msgid "" #~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "" diff -Nru midori-0.4.9/po/el.po midori-0.5.0/po/el.po --- midori-0.4.9/po/el.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/el.po 2013-04-04 20:31:20.000000000 +0000 @@ -3,24 +3,24 @@ # This file is distributed under the same license as the midori package. # Evaggelos Balaskas 2008-2009 # Efstathios Iosifidis , 2012. -# +# msgid "" msgstr "" "Project-Id-Version: midori git version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-18 07:27+0000\n" +"POT-Creation-Date: 2013-03-08 19:09+0000\n" "PO-Revision-Date: 2013-01-18 14:47+0200\n" "Last-Translator: Γιώργος Στεφανάκης \n" "Language-Team: Ελληνικά, Σύγχρονα \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: GREECE\n" "Language: el\n" +"X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Country: GREECE\n" -"X-Generator: Lokalize 0.2\n" #: ../data/midori.desktop.in.h:1 msgid "Browse the Web" @@ -30,11 +30,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 -#: ../midori/main.c:138 -#: ../midori/main.c:151 -#: ../midori/midori-app.c:1443 -#: ../midori/midori-websettings.c:201 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 +#: ../midori/midori-app.c:1442 ../midori/midori-websettings.c:201 +#: ../midori/midori-view.c:3816 msgid "Midori" msgstr "Midori" @@ -46,13 +44,11 @@ msgid "New Private Browsing Window" msgstr "Νέο Παράθυρο Ιδιωτικής Περιήγησης" -#: ../data/midori.desktop.in.h:6 -#: ../midori/midori-browser.c:1268 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 msgid "New Tab" msgstr "Νέα καρτέλα" -#: ../data/midori.desktop.in.h:7 -#: ../midori/midori-browser.c:1265 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 msgid "New Window" msgstr "Νέο παράθυρο" @@ -68,162 +64,165 @@ msgid "Open a new private browsing window" msgstr "Άνοιγμα ενός νέου παραθύρου ιδιωτικής περιήγησης" -#: ../data/midori-private.desktop.in.h:3 -#: ../midori/midori-view.c:3929 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4123 msgid "Private Browsing" msgstr "Ιδιωτική περιήγηση" -#: ../midori/main.c:62 +#: ../midori/main.c:63 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "Private browsing, no changes are saved" msgstr "Ιδιωτική περιήγηση, οι τροποποιήσεις δεν αποθηκεύονται" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "Portable mode, all runtime files are stored in one place" -msgstr "" +msgstr "Φορητή μορφή, όλα τα εκετελέσιμα αρχεία αποθηκεύονται σε ένα μέρος" -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" msgstr "" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "Show a diagnostic dialog" msgstr "Εμφάνιση του διαλόγου διάγνωσης" -#: ../midori/main.c:101 +#: ../midori/main.c:104 +msgid "Run within gdb and save a backtrace on crash" +msgstr "" + +#: ../midori/main.c:106 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:103 +#: ../midori/main.c:108 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:105 +#: ../midori/main.c:110 msgid "Execute the specified command" msgstr "Εκτέλεση της συγκεκριμένης εντολής" -#: ../midori/main.c:107 +#: ../midori/main.c:112 msgid "List available commands to execute with -e/ --execute" msgstr "Εμφάνιση των διαθέσιμων εντολών προς εκτέλεση με e-/ --execute" -#: ../midori/main.c:109 +#: ../midori/main.c:114 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:111 +#: ../midori/main.c:116 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "Block URIs according to regular expression PATTERN" msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "PATTERN" msgstr "ΜΟΤΙΒΟ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας" -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "SECONDS" msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ" -#: ../midori/main.c:152 +#: ../midori/main.c:155 +#, c-format +msgid "Error: \"gdb\" can't be found\n" +msgstr "" + +#: ../midori/main.c:182 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:154 +#: ../midori/main.c:184 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" -#: ../midori/main.c:299 +#: ../midori/main.c:339 msgid "An unknown error occured" msgstr "Ένα άγνωστο σφάλμα προέκυψε" -#: ../midori/midori-app.c:1129 -#: ../midori/midori-browser.c:524 +#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:542 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-app.c:1351 -#: ../midori/midori-browser.c:5999 +#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6103 msgid "_Bookmarks" msgstr "_Σελιδοδείκτες" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1351 msgid "Add Boo_kmark" msgstr "Προσθήκη σ_ελιδοδείκτη" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1352 msgid "_Extensions" msgstr "_Επεκτάσεις" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 -#: ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Ιστορικό" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1354 msgid "_Userscripts" msgstr "_Δέσμες εντολών χρήστη" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1355 msgid "User_styles" msgstr "_Στυλ χρήστη" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1356 msgid "New _Tab" msgstr "Νέα _καρτέλα" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1357 msgid "_Transfers" msgstr "_Μεταφορές" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1358 msgid "Netscape p_lugins" msgstr "Α_ρθρωμάτων netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1359 msgid "_Closed Tabs" msgstr "_Κλειστές καρτέλες" -#: ../midori/midori-app.c:1361 -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5242 msgid "New _Window" msgstr "Νέο _παράθυρο" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1361 msgid "New _Folder" msgstr "Νέος _φάκελος" -#: ../midori/midori-app.c:1417 -#: ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419 +#: ../midori/midori-app.c:1422 msgid "[Addresses]" msgstr "[Διευθύνσεις]" @@ -231,10 +230,8 @@ msgid "File not found." msgstr "Το αρχείο δεν βρέθηκε." -#: ../midori/midori-array.c:547 -#: ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 -#: ../midori/midori-array.c:619 +#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 +#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 msgid "Malformed document." msgstr "Κακοσχηματισμένο έγγραφο." @@ -242,650 +239,640 @@ msgid "Unrecognized bookmark format." msgstr "Άγνωστος τύπος συνδέσμου." -#: ../midori/midori-array.c:915 -msgid "Writing failed." -msgstr "Αποτυχία εγγραφής." - -#: ../midori/midori-browser.c:337 -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5378 msgid "Go forward to the next page" msgstr "Μετάβαση στην επόμενη σελίδα" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 -#: ../midori/midori-browser.c:5282 -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5389 msgid "Go to the next sub-page" msgstr "Μετάβαση στην επόμενη υπό-σελίδα" -#: ../midori/midori-browser.c:431 -#: ../midori/midori-browser.c:5223 -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5327 +#: ../midori/midori-browser.c:5336 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:439 -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5333 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:527 #, c-format msgid "Failed to update title: %s\n" msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n" -#: ../midori/midori-browser.c:604 +#: ../midori/midori-browser.c:622 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Ιδιωτική περιήγηση)" -#: ../midori/midori-browser.c:714 -#: ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:828 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:828 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:830 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:830 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:846 +#: ../midori/midori-browser.c:864 msgid "Type a name for this bookmark and choose where to keep it." -msgstr "Πληκτρολογήστε ένα όνομα γι'αυτόν τον σελιδοδείκτη και επιλέξτε που θα τον αποθηκεύσετε." +msgstr "" +"Πληκτρολογήστε ένα όνομα γι'αυτόν τον σελιδοδείκτη και επιλέξτε που θα τον " +"αποθηκεύσετε." -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:920 msgid "Add to _Speed Dial" msgstr "Προσθήκη στην _γρήγορη σύνδεση" -#: ../midori/midori-browser.c:908 +#: ../midori/midori-browser.c:926 msgid "Show in the tool_bar" msgstr "Εμφάνιση στην εργαλειο_θήκη" -#: ../midori/midori-browser.c:916 +#: ../midori/midori-browser.c:934 msgid "Run as _web application" msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή" -#: ../midori/midori-browser.c:1026 -#: ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4479 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1036 +#: ../midori/midori-browser.c:1060 msgid "Save associated _resources" msgstr "" -#: ../midori/midori-browser.c:1265 +#: ../midori/midori-browser.c:1290 msgid "A new window has been opened" msgstr "Ένα νέο παράθυρο έχει ανοιχθεί" -#: ../midori/midori-browser.c:1268 +#: ../midori/midori-browser.c:1293 msgid "A new tab has been opened" msgstr "Μια νέα καρτέλα έχει ανοιχθεί" -#: ../midori/midori-browser.c:1285 +#: ../midori/midori-browser.c:1311 msgid "Error opening the image!" msgstr "Σφάλμα ανοίγματος εικόνας!" -#: ../midori/midori-browser.c:1286 +#: ../midori/midori-browser.c:1312 msgid "Can not open selected image in a default viewer." -msgstr "Αδυναμία ανοίγματος επιλεγμένης εικόνας στον προεπιλεγμένο πρόγραμμα προβολής εικόνων." +msgstr "" +"Αδυναμία ανοίγματος επιλεγμένης εικόνας στον προεπιλεγμένο πρόγραμμα " +"προβολής εικόνων." -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1318 msgid "Error downloading the image!" msgstr "Σφάλμα κατά την λήψη της εικόνας!" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1319 msgid "Can not download selected image." msgstr "Αδυναμία λήψης επιλεγμένης εικόνας." -#: ../midori/midori-browser.c:1350 +#: ../midori/midori-browser.c:1378 msgid "Save file" msgstr "Αποθήκευση αρχείου" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2353 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:2444 +#: ../midori/midori-browser.c:2480 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Για την χρήση του παραπάνω URI ανοίξτε έναν συλλέκτη νέων. Υπάρχει συνήθως ένα μενού ή ένα πλήκτρο \"Νέα Συνδρομή\", \"Νέα Νέα Ροή\" ή παρόμοια.\n" -"Εναλλακτικά πήγαινε στις προτιμήσεις, εφαρμογές στο midori, κι επιλέξτε έναν συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, θα προστεθεί αυτόματα." +"Για την χρήση του παραπάνω URI ανοίξτε έναν συλλέκτη νέων. Υπάρχει συνήθως " +"ένα μενού ή ένα πλήκτρο \"Νέα Συνδρομή\", \"Νέα Νέα Ροή\" ή παρόμοια.\n" +"Εναλλακτικά πήγαινε στις προτιμήσεις, εφαρμογές στο midori, κι επιλέξτε έναν " +"συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, " +"θα προστεθεί αυτόματα." -#: ../midori/midori-browser.c:2450 -#: ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2486 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Νέα ροή" -#: ../midori/midori-browser.c:2493 -#: ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:2521 ../midori/midori-browser.c:5402 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Προσθήκη ενός νέου σελιδοδείκτη" -#: ../midori/midori-browser.c:3017 -#: ../midori/midori-searchaction.c:481 +#: ../midori/midori-browser.c:3053 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Άδειο" -#: ../midori/midori-browser.c:3412 -#: ../midori/midori-browser.c:3413 +#: ../midori/midori-browser.c:3450 ../midori/midori-browser.c:3451 msgid "Toggle text cursor navigation" msgstr "Εναλλαγή κειμένου κέρσορα πλοήγησης" -#: ../midori/midori-browser.c:3415 -msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites." +#: ../midori/midori-browser.c:3453 +msgid "" +"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " +"all websites." msgstr "" -#: ../midori/midori-browser.c:3418 +#: ../midori/midori-browser.c:3456 msgid "_Enable Caret Browsing" msgstr "_Ενεργοποίηση Περιήγησης Δρομέα" -#: ../midori/midori-browser.c:3802 -#: ../midori/midori-browser.c:5746 +#: ../midori/midori-browser.c:3883 ../midori/midori-browser.c:5850 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n" -#: ../midori/midori-browser.c:4128 -#: ../panels/midori-bookmarks.c:840 -#: ../panels/midori-history.c:797 +#: ../midori/midori-browser.c:4211 ../panels/midori-bookmarks.c:835 +#: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:4135 -#: ../panels/midori-bookmarks.c:846 -#: ../panels/midori-history.c:803 -#: ../extensions/feed-panel/feed-panel.c:519 +#: ../midori/midori-browser.c:4218 ../panels/midori-bookmarks.c:841 +#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:4138 -#: ../midori/midori-view.c:2637 -#: ../midori/midori-view.c:4435 -#: ../panels/midori-bookmarks.c:848 -#: ../panels/midori-history.c:805 -#: ../extensions/feed-panel/feed-panel.c:521 +#: ../midori/midori-browser.c:4221 ../midori/midori-view.c:2725 +#: ../midori/midori-view.c:4598 ../panels/midori-bookmarks.c:843 +#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:4310 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4228 +#: ../midori/midori-browser.c:4311 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4229 +#: ../midori/midori-browser.c:4312 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4313 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4231 +#: ../midori/midori-browser.c:4314 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:4315 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4233 +#: ../midori/midori-browser.c:4316 msgid "Midori 0.2.6" msgstr "Μιντόρι 0.2.6" -#: ../midori/midori-browser.c:4251 +#: ../midori/midori-browser.c:4334 msgid "Import bookmarks…" msgstr "_Εισαγωγή σελιδοδεικτών..." -#: ../midori/midori-browser.c:4254 -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:4337 ../midori/midori-browser.c:5407 msgid "_Import bookmarks" msgstr "_Εισαγωγή σελιδοδεικτών..." -#: ../midori/midori-browser.c:4265 +#: ../midori/midori-browser.c:4348 msgid "_Application:" msgstr "_Εφαρμογή:" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4413 msgid "Import from XBEL or HTML file" msgstr "Εισαγωγή από αρχείο XBEL ή HTML" -#: ../midori/midori-browser.c:4358 +#: ../midori/midori-browser.c:4441 msgid "Import from a file" msgstr "Εισαγωγή από αρχείο" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4453 msgid "Failed to import bookmarks" msgstr "Αποτυχία εισαγωγής σελιδοδεικτών" -#: ../midori/midori-browser.c:4401 +#: ../midori/midori-browser.c:4484 msgid "XBEL Bookmarks" msgstr "Σελιδοδείκτες XBEL" -#: ../midori/midori-browser.c:4406 +#: ../midori/midori-browser.c:4489 msgid "Netscape Bookmarks" msgstr "Σελιδοδείκτες Netscape" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4503 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" -msgstr "Το Midori μπορεί κάνει εξαγωγή μόνο σε XBEL (*.xbel) και Netscape (*.html)" +msgstr "" +"Το Midori μπορεί κάνει εξαγωγή μόνο σε XBEL (*.xbel) και Netscape (*.html)" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4518 msgid "Failed to export bookmarks" msgstr "Αποτυχία εξαγωγής σελιδοδεικτών" -#: ../midori/midori-browser.c:4656 +#: ../midori/midori-browser.c:4740 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4741 msgid "See about:version for version info." msgstr "Δείτε στο about:version για πληροφορίες έκδοσης." -#: ../midori/midori-browser.c:4659 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." -msgstr "Η βιβλιοθήκη είναι ελεύθερο λογισμικό - μπορείτε να το αναδιανέμεται και/ή να το τροποποιήσετε κάτω από την άδεια χρήστης GNU Lesser General Public License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη." +#: ../midori/midori-browser.c:4743 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" +"Η βιβλιοθήκη είναι ελεύθερο λογισμικό - μπορείτε να το αναδιανέμεται και/ή " +"να το τροποποιήσετε κάτω από την άδεια χρήστης GNU Lesser General Public " +"License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 " +"της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη." -#: ../midori/midori-browser.c:4689 +#: ../midori/midori-browser.c:4778 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008,2009" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5240 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:5243 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5246 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5248 msgid "New P_rivate Browsing Window" msgstr "Νέο παράθυρο ιδιωτικής περιήγησης" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:5252 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:5150 +#: ../midori/midori-browser.c:5254 msgid "_Save Page As…" msgstr "_Αποθήκευση Σελίδας ως..." -#: ../midori/midori-browser.c:5151 +#: ../midori/midori-browser.c:5255 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:5153 +#: ../midori/midori-browser.c:5257 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5261 msgid "Create _Launcher" msgstr "Δημιουργία _εκκινητή" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5264 msgid "Subscribe to News _feed" msgstr "Εγγραφή σε _ροή νέων" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5270 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:5167 +#: ../midori/midori-browser.c:5271 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:5169 +#: ../midori/midori-browser.c:5273 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5277 msgid "_Share" msgstr "_Κοινόχρηστο" -#: ../midori/midori-browser.c:5174 +#: ../midori/midori-browser.c:5278 msgid "Share this page" msgstr "Μοιραστείτε αυτή την σελίδα" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:5282 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:5181 +#: ../midori/midori-browser.c:5285 msgid "Close a_ll Windows" msgstr "Κλείσιμο _όλων των παραθύρων" -#: ../midori/midori-browser.c:5184 +#: ../midori/midori-browser.c:5288 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../midori/midori-browser.c:5207 +#: ../midori/midori-browser.c:5311 msgid "_Find…" msgstr "_Εύρεση..." -#: ../midori/midori-browser.c:5208 +#: ../midori/midori-browser.c:5312 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:5314 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:5213 +#: ../midori/midori-browser.c:5317 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:5321 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5323 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5324 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:5225 +#: ../midori/midori-browser.c:5329 msgid "Reload page without caching" msgstr "Ανανέωση σελίδας χωρίς προσωρινή μνήμη" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5339 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5342 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:5242 +#: ../midori/midori-browser.c:5346 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5348 msgid "View So_urce" msgstr "Προβολή κ_ώδικα" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5351 msgid "Ca_ret Browsing" msgstr "Περιήγηση κέρσορα κειμένου" -#: ../midori/midori-browser.c:5251 +#: ../midori/midori-browser.c:5355 msgid "Toggle fullscreen view" msgstr "Εναλλαγή σε πλήρη οθόνη" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5357 msgid "Scroll _Left" msgstr "Μετακίνηση _αριστερά" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5360 msgid "Scroll _Down" msgstr "Μετακίνηση _κάτω" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5363 msgid "Scroll _Up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5366 msgid "Scroll _Right" msgstr "Μετακίνηση _δεξιά" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5369 msgid "_Readable" msgstr "_Αναγνώσιμο" -#: ../midori/midori-browser.c:5268 +#: ../midori/midori-browser.c:5372 msgid "_Go" msgstr "_Μετάβαση" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:5375 msgid "Go back to the previous page" msgstr "Μετάβαση στην προηγούμενη σελίδα" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:5382 msgid "Go to the previous sub-page" msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5391 msgid "_Homepage" msgstr "_Αρχική σελίδα" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5392 msgid "Go to your homepage" msgstr "Μετάβαση στην αρχική σελίδα" -#: ../midori/midori-browser.c:5290 +#: ../midori/midori-browser.c:5394 msgid "Empty Trash" msgstr "Άδειασμα απορριμμάτων" -#: ../midori/midori-browser.c:5293 +#: ../midori/midori-browser.c:5397 msgid "Undo _Close Tab" msgstr "Αναίρεση κλ_είσιμο καρτέλας" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5404 msgid "Add a new _folder" msgstr "Προσθήκη ενός νέου φ_ακέλου" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5410 msgid "_Export bookmarks" msgstr "_Εξαγωγή σελιδοδεικτών" -#: ../midori/midori-browser.c:5309 -#: ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5413 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5416 msgid "_Clear Private Data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5419 msgid "_Inspect Page" msgstr "_Εξέταση σελίδας" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5423 msgid "_Previous Tab" msgstr "_Προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5426 msgid "_Next Tab" msgstr "Επόμε_νη καρτέλα" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5428 msgid "Move Tab to _first position" msgstr "Μετακίνηση καρτέλας στη _πρώτη θέση" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:5430 msgid "Move Tab _Backward" msgstr "Μετακίνηση καρτέλας _πίσω" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:5432 msgid "_Move Tab Forward" msgstr "_Μετακίνηση καρτέλας εμπρός" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5434 msgid "Move Tab to _last position" msgstr "Μετακίνηση καρτέλας στην _τελευταία θέση" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:5437 msgid "Focus _Current Tab" msgstr "Εστίαση στην _ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5440 msgid "Focus _Next view" msgstr "Εστίαση στην _επόμενη προβολή" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5443 msgid "Only show the Icon of the _Current Tab" msgstr "Εμφάνιση μόνο του εικονιδίου της _τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5446 msgid "_Duplicate Current Tab" msgstr "_Διπλασίασε την τρέχουσα καρτέλα" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5449 msgid "Close Ot_her Tabs" msgstr "Κλείσιμο των άλλ_ων καρτελών" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5452 msgid "Open last _session" msgstr "Επαναφορά της τελευταίας _συνεδρίας" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:5455 msgid "_Help" msgstr "_Βοήθεια" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5457 msgid "_Frequent Questions" msgstr "Σ_υχνές ερωτήσεις" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5460 msgid "_Report a Problem…" msgstr "_Αναφορά προβλήματος..." -#: ../midori/midori-browser.c:5361 -#: ../midori/midori-browser.c:6018 +#: ../midori/midori-browser.c:5465 ../midori/midori-browser.c:6122 msgid "_Tools" msgstr "_Εργαλεία" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5472 msgid "_Menubar" msgstr "_Μπάρα μενού" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5476 msgid "_Navigationbar" msgstr "_Μπάρα περιήγησης" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5480 msgid "Side_panel" msgstr "Πλαϊνό _πλαίσιο" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5481 msgid "Sidepanel" msgstr "Πλαϊνό πλαίσιο" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5484 msgid "_Bookmarkbar" msgstr "_Μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5488 msgid "_Statusbar" msgstr "_Γραμμή κατάστασης" -#: ../midori/midori-browser.c:5393 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5497 ../midori/midori-websettings.c:200 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:5396 -#: ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5500 ../midori/midori-websettings.c:124 msgid "Chinese Traditional (BIG5)" msgstr "Παραδοσιακά Κινέζικα (BIG5)" -#: ../midori/midori-browser.c:5399 -#: ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5503 ../midori/midori-websettings.c:125 msgid "Chinese Simplified (GB18030)" msgstr "Απλοποιημένα Κινέζικα (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5507 msgid "Japanese (SHIFT__JIS)" msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:5406 -#: ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:127 msgid "Korean (EUC-KR)" msgstr "Κορεάτικα (EUC-KR)" -#: ../midori/midori-browser.c:5409 -#: ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:128 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:5412 -#: ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:129 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5415 -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5519 ../midori/midori-websettings.c:130 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5522 msgid "Custom…" msgstr "Προσαρμοσμένο..." -#: ../midori/midori-browser.c:5924 +#: ../midori/midori-browser.c:6028 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:5931 +#: ../midori/midori-browser.c:6035 msgid "_Location…" msgstr "_Τοποθεσία..." -#: ../midori/midori-browser.c:5933 +#: ../midori/midori-browser.c:6037 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:5955 +#: ../midori/midori-browser.c:6059 msgid "_Web Search…" msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:5957 +#: ../midori/midori-browser.c:6061 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:5984 +#: ../midori/midori-browser.c:6088 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:6001 +#: ../midori/midori-browser.c:6105 msgid "Show the saved bookmarks" msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" -#: ../midori/midori-browser.c:6034 -msgid "_Window" -msgstr "_Παράθυρο" +#: ../midori/midori-browser.c:6138 +msgid "_Tabs" +msgstr " _Καρτέλες" -#: ../midori/midori-browser.c:6036 +#: ../midori/midori-browser.c:6140 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες" -#: ../midori/midori-browser.c:6050 +#: ../midori/midori-browser.c:6154 msgid "_Menu" msgstr "_Μενού" -#: ../midori/midori-browser.c:6052 +#: ../midori/midori-browser.c:6156 msgid "Menu" msgstr "Μενού" -#: ../midori/midori-browser.c:6832 +#: ../midori/midori-browser.c:6938 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" @@ -895,8 +882,7 @@ msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" msgstr "Η ρύθμιση της επέκτασης '%s' δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/midori-extension.c:879 -#: ../extensions/addons.c:1676 +#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Οι ρυθμίσεις της επέκτασης '%s' δεν μπορεί να αποθηκευτεί: %s\n" @@ -910,8 +896,12 @@ msgstr "Άγνωστος δημιουργός υπογεγραμμένου πιστοποιητικού." #: ../midori/midori-locationaction.c:1362 -msgid "The certificate does not match the expected identity of the site that it was retrieved from." -msgstr "Το πιστοποιητικό δεν ταιριάζει με την αναμενόμενη ταυτότητα της ιστοσελίδας από την οποία έχει ληφθεί." +msgid "" +"The certificate does not match the expected identity of the site that it was " +"retrieved from." +msgstr "" +"Το πιστοποιητικό δεν ταιριάζει με την αναμενόμενη ταυτότητα της ιστοσελίδας " +"από την οποία έχει ληφθεί." #: ../midori/midori-locationaction.c:1364 msgid "The certificate's activation time is still in the future." @@ -922,7 +912,9 @@ msgstr "Το πιστοποιητικό έχει λήξει" #: ../midori/midori-locationaction.c:1368 -msgid "The certificate has been revoked according to the GTlsConnection's certificate revocation list." +msgid "" +"The certificate has been revoked according to the GTlsConnection's " +"certificate revocation list." msgstr "" #: ../midori/midori-locationaction.c:1370 @@ -933,49 +925,45 @@ msgid "Some other error occurred validating the certificate." msgstr "Παρουσιάστηκαν άλλα σφάλματα κατά τον έλεγχο του πιστοποιητικού." -#: ../midori/midori-locationaction.c:1419 +#: ../midori/midori-locationaction.c:1420 msgid "_Export certificate" msgstr "_Εξαγωγή πιστοποιητικού" -#: ../midori/midori-locationaction.c:1434 +#: ../midori/midori-locationaction.c:1435 msgid "Self-signed" -msgstr "" +msgstr "Αυτό-υπογραφόμενο" -#: ../midori/midori-locationaction.c:1468 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Λεπτομέρειες ασφαλείας" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1555 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Επικόλληση και σ_υνέχεια" -#: ../midori/midori-locationaction.c:1787 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Μη επαληθευμένο" -#: ../midori/midori-locationaction.c:1795 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Επαληθευμένη και κρυπτογραφημένη σύνδεση" -#: ../midori/midori-locationaction.c:1802 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Άνοιγμα, μη κρυπτογραφημένης σύνδεσης" -#: ../midori/midori-panel.c:314 -#: ../midori/midori-panel.c:316 -#: ../midori/midori-panel.c:480 -#: ../midori/midori-panel.c:483 +#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316 +#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483 msgid "Align sidepanel to the right" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" -#: ../midori/midori-panel.c:326 -#: ../midori/midori-panel.c:327 +#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327 msgid "Close panel" msgstr "Κλείσιμο πλαισίου" -#: ../midori/midori-panel.c:481 -#: ../midori/midori-panel.c:484 +#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484 msgid "Align sidepanel to the left" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αριστερά" @@ -987,13 +975,11 @@ msgid "Show Homepage" msgstr "Εμφάνιση αρχικής σελίδας" -#: ../midori/midori-websettings.c:108 -#: ../midori/midori-frontend.c:339 +#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 msgid "Show last open tabs" msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών" -#: ../midori/midori-websettings.c:109 -#: ../midori/midori-frontend.c:338 +#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 msgid "Show last tabs without loading" msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση" @@ -1001,8 +987,7 @@ msgid "Japanese (SHIFT_JIS)" msgstr "Ιαπωνικά (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 #: ../katze/katze-utils.c:603 msgid "Custom..." msgstr "Προσαρμογή..." @@ -1075,345 +1060,331 @@ msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Στυλ εργαλειοθήκης:" - #: ../midori/midori-websettings.c:281 msgid "The style of the toolbar" msgstr "Το στυλ της εργαλειοθήκης" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Κατά την εκκίνηση του midori:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Άνοιγμα νέων σελίδων σε:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Αναγνώριση ως" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:473 msgid "Always use my font choices" msgstr "Πάντα χρήση των δικών μου επιλογών γραμματοσειράς" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:474 msgid "Override fonts picked by websites with user preferences" -msgstr "Παράκαμψη της επιλογής των γραμματοσειρών των ιστότοπων με τις επιλογές του χρήστη" +msgstr "" +"Παράκαμψη της επιλογής των γραμματοσειρών των ιστότοπων με τις επιλογές του " +"χρήστη" -#: ../midori/midori-websettings.c:1305 -#: ../midori/midori-websettings.c:1311 +#: ../midori/midori-websettings.c:1309 ../midori/midori-websettings.c:1315 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/midori-websettings.c:1360 +#: ../midori/midori-websettings.c:1364 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s" -#: ../midori/midori-websettings.c:1365 -#: ../midori/midori-websettings.c:1476 +#: ../midori/midori-websettings.c:1369 ../midori/midori-websettings.c:1480 #, c-format msgid "Invalid configuration value '%s'" msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" -#: ../midori/midori-tab.vala:117 +#: ../midori/midori-tab.vala:118 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s" -#: ../midori/midori-view.c:725 -#: ../midori/midori-view.c:866 +#: ../midori/midori-view.c:767 ../midori/midori-view.c:911 msgid "Trust this website" msgstr "Έμπιστη ιστοσελίδα" -#: ../midori/midori-view.c:864 +#: ../midori/midori-view.c:909 msgid "Security unknown" msgstr "Άγνωστη ασφάλεια" -#: ../midori/midori-view.c:1162 +#: ../midori/midori-view.c:1212 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s θέλει να σώσει μια βάση δεδομένων HTML5." -#: ../midori/midori-view.c:1166 -#: ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1216 ../midori/midori-view.c:1248 msgid "_Deny" msgstr "_Άρνηση" -#: ../midori/midori-view.c:1166 -#: ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1216 ../midori/midori-view.c:1248 msgid "_Allow" msgstr "_Αποδοχή" -#: ../midori/midori-view.c:1194 +#: ../midori/midori-view.c:1244 #, c-format msgid "%s wants to know your location." msgstr "%s θέλει να ξέρει τη θέση σας." -#: ../midori/midori-view.c:1305 +#: ../midori/midori-view.c:1375 #, c-format msgid "Error - %s" msgstr "Σφάλμα- %s" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1376 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί." -#: ../midori/midori-view.c:1308 +#: ../midori/midori-view.c:1378 msgid "Try again" msgstr "Δοκιμάστε ξανά" -#: ../midori/midori-view.c:1507 -#: ../midori/midori-view.c:2578 +#: ../midori/midori-view.c:1580 ../midori/midori-view.c:2666 #, c-format msgid "Send a message to %s" msgstr "Αποστολή μηνύματος στο: %s" -#: ../midori/midori-view.c:2362 +#: ../midori/midori-view.c:2454 msgid "Add _search engine..." msgstr "Προσθήκη _μηχανής αναζήτησης..." -#: ../midori/midori-view.c:2405 -#: ../midori/midori-view.c:2713 +#: ../midori/midori-view.c:2497 ../midori/midori-view.c:2801 msgid "Inspect _Element" msgstr "Εξέταση _στοιχείου" -#: ../midori/midori-view.c:2457 +#: ../midori/midori-view.c:2549 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:2461 +#: ../midori/midori-view.c:2553 msgid "Open Link in _Foreground Tab" msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο" -#: ../midori/midori-view.c:2462 +#: ../midori/midori-view.c:2554 msgid "Open Link in _Background Tab" msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο" -#: ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2557 msgid "Open Link in New _Window" msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο" -#: ../midori/midori-view.c:2468 +#: ../midori/midori-view.c:2560 msgid "Open Link as Web A_pplication" msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή" -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2565 msgid "Copy Link de_stination" msgstr "Αντιγραφή συνδέσμου πρ_οορισμού" -#: ../midori/midori-view.c:2489 +#: ../midori/midori-view.c:2571 +msgid "Save _As…" +msgstr "_Αποθήκευση ως..." + +#: ../midori/midori-view.c:2580 msgid "Open _Image in New Tab" msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα" -#: ../midori/midori-view.c:2492 +#: ../midori/midori-view.c:2583 msgid "Copy Im_age" msgstr "Αντιγραφή εικό_νας" -#: ../midori/midori-view.c:2495 +#: ../midori/midori-view.c:2586 msgid "Save I_mage" msgstr "Αποθήκευση ει_κόνας" -#: ../midori/midori-view.c:2498 +#: ../midori/midori-view.c:2589 msgid "Open in Image _Viewer" msgstr "Άνοιγμα σε Πρόγραμμα _Προβολής Εικόνας" -#: ../midori/midori-view.c:2505 +#: ../midori/midori-view.c:2596 msgid "Copy Video _Address" msgstr "Αντιγραφή _διεύθυνσης βίντεο" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2599 msgid "Save _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2599 msgid "Download _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2534 +#: ../midori/midori-view.c:2625 msgid "Search _with" msgstr "Αναζήτηση _με" -#: ../midori/midori-view.c:2566 +#: ../midori/midori-view.c:2654 msgid "_Search the Web" msgstr "_Αναζήτηση στον ιστό" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2674 msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2721 msgid "Open _Frame in New Tab" msgstr "Άνοιγμα _Πλαισίου σε Νέα Καρτέλα" -#: ../midori/midori-view.c:2845 +#: ../midori/midori-view.c:2938 #, c-format msgid "Open or download file from %s" msgstr "Άνοιγμα ή λήψη αρχείου από %s" -#: ../midori/midori-view.c:2858 +#: ../midori/midori-view.c:2951 #, c-format msgid "File Name: %s" msgstr "Όνομα Αρχείου: %s" -#: ../midori/midori-view.c:2863 +#: ../midori/midori-view.c:2956 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:2865 +#: ../midori/midori-view.c:2958 #, c-format msgid "File Type: %s ('%s')" msgstr "Τύπος αρχείου: %s ('%s')" -#: ../midori/midori-view.c:2902 +#: ../midori/midori-view.c:2995 #, c-format msgid "Size: %s" msgstr "Μέγεθος: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2913 +#: ../midori/midori-view.c:3006 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:3439 +#: ../midori/midori-view.c:3534 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:3854 +#: ../midori/midori-view.c:4048 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" -#: ../midori/midori-view.c:3930 +#: ../midori/midori-view.c:4124 msgid "Midori doesn't store any personal data:" msgstr "Ο Midori δεν αποθηκεύει προσωπικά δεδομένα:" -#: ../midori/midori-view.c:3931 +#: ../midori/midori-view.c:4125 msgid "No history or web cookies are being saved." msgstr "Δεν αποθηκεύτηκαν ιστορικό ή cookies." -#: ../midori/midori-view.c:3932 +#: ../midori/midori-view.c:4126 msgid "Extensions are disabled." msgstr "Τα πρόσθετα είναι απενεργοποιημένα." -#: ../midori/midori-view.c:3933 +#: ../midori/midori-view.c:4127 msgid "HTML5 storage, local database and application caches are disabled." -msgstr "Απενεργοποιήθηκαν η αποθήκευση HTML5, η λανθάνουσα μνήμη της τοπική βάση δεδομένων και εφαρμογών." +msgstr "" +"Απενεργοποιήθηκαν η αποθήκευση HTML5, η λανθάνουσα μνήμη της τοπική βάση " +"δεδομένων και εφαρμογών." -#: ../midori/midori-view.c:3934 +#: ../midori/midori-view.c:4128 msgid "Midori prevents websites from tracking the user:" msgstr "Ο Midori αποτρέπει τις ιστοσελίδες να απομνημονεύσουν τον χρήστη:" -#: ../midori/midori-view.c:3935 +#: ../midori/midori-view.c:4129 msgid "Referrer URLs are stripped down to the hostname." msgstr "" -#: ../midori/midori-view.c:3936 +#: ../midori/midori-view.c:4130 msgid "DNS prefetching is disabled." msgstr "Απενεργοποίηση προανάκτησης DNS." -#: ../midori/midori-view.c:3937 +#: ../midori/midori-view.c:4131 msgid "The language and timezone are not revealed to websites." msgstr "Η γλώσσα και η ζώνη ώρας δεν εμφανίζονται στις ιστοσελίδες." -#: ../midori/midori-view.c:3938 +#: ../midori/midori-view.c:4132 msgid "Flash and other Netscape plugins cannot be listed by websites." -msgstr "Το Flash και άλλα πρόσθετα του Netscape δεν μπορούν να βρεθούν σε λίστα από ιστοσελίδες." +msgstr "" +"Το Flash και άλλα πρόσθετα του Netscape δεν μπορούν να βρεθούν σε λίστα από " +"ιστοσελίδες." -#: ../midori/midori-view.c:4017 +#: ../midori/midori-view.c:4172 msgid "Version numbers in brackets show the version used at runtime." -msgstr "Οι αριθμοί έκδοσης στις παρενθέσεις δείχνουν την έκδοση που χρησιμοποιήθηκε κατά την εκτέλεση." +msgstr "" +"Οι αριθμοί έκδοσης στις παρενθέσεις δείχνουν την έκδοση που χρησιμοποιήθηκε " +"κατά την εκτέλεση." -#: ../midori/midori-view.c:4063 +#: ../midori/midori-view.c:4220 msgid "Page loading delayed" msgstr "Καθυστέρηση φόρτωση σελίδας" -#: ../midori/midori-view.c:4064 +#: ../midori/midori-view.c:4221 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Καθυστέρηση φόρτωσης είτε λόγω πρόσφατης κατάρρευσης ή εφαρμογής ρυθμίσεων εκκίνησης." +msgstr "" +"Καθυστέρηση φόρτωσης είτε λόγω πρόσφατης κατάρρευσης ή εφαρμογής ρυθμίσεων " +"εκκίνησης." -#: ../midori/midori-view.c:4065 +#: ../midori/midori-view.c:4222 msgid "Load Page" msgstr "Φόρτωση σελίδας" -#: ../midori/midori-view.c:4229 +#: ../midori/midori-view.c:4388 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-view.c:4439 +#: ../midori/midori-view.c:4602 msgid "_Duplicate Tab" msgstr "_Διπλότυπη καρτέλα" -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:4607 msgid "Show Tab _Label" msgstr "Εμφάνιση _ετικέτας καρτέλας" -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:4607 msgid "Show Tab _Icon Only" msgstr "Εμφάνιση μόνο των πλακ_ιδίων καρτέλας" -#: ../midori/midori-view.c:4451 +#: ../midori/midori-view.c:4614 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Κλείσιμο της άλλ_ης καρτέλας" msgstr[1] "Κλείσιμο των άλλ_ων καρτελών" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5126 +#: ../midori/midori-view.c:5303 msgid "previous" msgstr "προηγούμενο" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5145 +#: ../midori/midori-view.c:5322 msgid "next" msgstr "επόμενο" -#: ../midori/midori-view.c:5158 +#: ../midori/midori-view.c:5335 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-view.c:5159 +#: ../midori/midori-view.c:5336 msgid "Whether background images should be printed" msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" -#: ../midori/midori-view.c:5191 +#: ../midori/midori-view.c:5361 msgid "Features" msgstr "Χαρακτηριστικά" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:54 +#: ../midori/midori-download.vala:63 #, c-format msgid "%s of %s" msgstr "%s από %s" -#: ../midori/midori-download.vala:70 +#: ../midori/midori-download.vala:79 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ώρα" msgstr[1] "%d ώρες" -#: ../midori/midori-download.vala:71 +#: ../midori/midori-download.vala:80 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d λεπτό" msgstr[1] "%d λεπτά" -#: ../midori/midori-download.vala:72 +#: ../midori/midori-download.vala:81 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1421,45 +1392,49 @@ msgstr[1] "%d δευτερόλεπτα" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:87 +#: ../midori/midori-download.vala:96 #, c-format msgid " - %s remaining" msgstr " - %s απομένει" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:98 +#: ../midori/midori-download.vala:107 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:100 +#: ../midori/midori-download.vala:109 #, c-format msgid " (%s/s)" msgstr " (%s/s)" -#: ../midori/midori-download.vala:197 +#: ../midori/midori-download.vala:224 msgid "The downloaded file is erroneous." msgstr "Το αρχείο που κατέβηκε είναι εσφαλμένο." -#: ../midori/midori-download.vala:198 -msgid "The checksum provided with the link did not match. This means the file is probably incomplete or was modified afterwards." -msgstr "Το άθροισμα ελέγχου που παρέχεται με το σύνδεσμο δεν ταιριάζει. Αυτό σημαίνει ότι το αρχείο είναι μάλλον ελλιπές ή τροποποιήθηκε στη συνέχεια." +#: ../midori/midori-download.vala:225 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "" +"Το άθροισμα ελέγχου που παρέχεται με το σύνδεσμο δεν ταιριάζει. Αυτό " +"σημαίνει ότι το αρχείο είναι μάλλον ελλιπές ή τροποποιήθηκε στη συνέχεια." -#: ../midori/midori-download.vala:312 +#: ../midori/midori-download.vala:345 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "Το αρχείο \"%s\" δεν μπορεί να αποθηκευτεί σε αυτόν τον φάκελο." -#: ../midori/midori-download.vala:314 +#: ../midori/midori-download.vala:347 msgid "You don't have permission to write in this location." msgstr "Δεν έχετε δικαιώματα εγγραφής σε αυτή την τοποθεσία" -#: ../midori/midori-download.vala:317 +#: ../midori/midori-download.vala:350 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"." -#: ../midori/midori-download.vala:319 +#: ../midori/midori-download.vala:352 #, c-format msgid "The file needs %s but only %s are left." msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s." @@ -1468,8 +1443,7 @@ msgid "Speed Dial" msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-speeddial.vala:181 -#: ../midori/midori-speeddial.vala:261 +#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" @@ -1489,300 +1463,317 @@ msgid "Startup" msgstr "Εκκίνηση" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Κατά την εκκίνηση του midori:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Αρχική σελίδα:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Χρήση _τρέχουσας σελίδας" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Τρέχουσα σελίδα ως αρχική" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Γραμματοσειρές" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Αναλογική οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" -msgstr "Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση του κειμένου" +msgstr "" +"Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση " +"του κειμένου" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" -msgstr "Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού μεγέθους κειμένου" +msgstr "" +"Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού " +"μεγέθους κειμένου" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" -msgstr "Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου σταθερού μεγέθους" +msgstr "" +"Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου " +"σταθερού μεγέθους" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Ελάχιστο μέγεθος γραμματοσειράς" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Προτιμώμενη κωδικοποίηση" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Συμπεριφορά" -#: ../midori/midori-preferences.c:364 -#: ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Αυτόματη φόρτωση εικόνων" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Ενεργοποίηση ορθογραφίας" -#: ../midori/midori-preferences.c:381 -#: ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Ενεργοποίηση δεσμών εντολών" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Ενεργοποίηση υποστήριξης WebGL" -#: ../midori/midori-preferences.c:388 -#: ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:389 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Ενεργοποίηση αρθρωμάτων netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:394 msgid "Zoom Text and Images" msgstr "Εστίαση κειμένου και εικόνων" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:397 msgid "Allow scripts to open popups" msgstr "Να επιτρέπονται στις δέσμες εντολών να ανοίγουν αναδυόμενα παράθυρα." -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:398 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα παράθυρα" - -#: ../midori/midori-preferences.c:403 -msgid "Kinetic scrolling" -msgstr "Κινητική κύλιση" - -#: ../midori/midori-preferences.c:404 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα " +msgstr "" +"Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα " +"παράθυρα" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:401 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:402 msgid "Load an address from the selection via middle click" msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:406 msgid "Flash window on background tabs" msgstr "Αναβόσβησε το παράθυρο στις παρασκήνιες καρτέλες" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:411 msgid "Preferred languages" msgstr "Προτιμώμενες γλώσσες" -#: ../midori/midori-preferences.c:424 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Μία διαχωρισμένη λίστα των προτιμώμενων γλωσσών με κόμμα για επεξεργασία των πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-preferences.c:415 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Μία διαχωρισμένη λίστα των προτιμώμενων γλωσσών με κόμμα για επεξεργασία των " +"πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;" +"q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:417 msgid "Save downloaded files to:" msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:" #. Page "Interface" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:424 msgid "Browsing" msgstr "Περιήγηση" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:428 +msgid "Toolbar Style:" +msgstr "Στυλ εργαλειοθήκης:" + +#: ../midori/midori-preferences.c:433 +msgid "Open new pages in:" +msgstr "Άνοιγμα νέων σελίδων σε:" + +#: ../midori/midori-preferences.c:438 msgid "Close Buttons on Tabs" msgstr "Κουμπιά κλεισίματος στις καρτέλες" -#: ../midori/midori-preferences.c:451 +#: ../midori/midori-preferences.c:442 msgid "Always Show Tabbar" msgstr "Εμφάνιση πάντα της γραμμής καρτελών" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:446 msgid "Open Tabs next to Current" msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:447 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" +msgstr "" +"Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την " +"τελευταία" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:450 msgid "Open tabs in the background" msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:454 msgid "Text Editor" msgstr "Κειμενογράφος" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:459 msgid "News Aggregator" msgstr "Διαχειριστής νέων" #. Page "Network" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:466 msgid "Network" msgstr "Δίκτυο" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:468 msgid "Proxy server" msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:473 msgid "Hostname" msgstr "Όνομα διακομιστή" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:481 msgid "Port" msgstr "Πόρτα" #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:501 -#: ../extensions/web-cache.c:461 -#: ../extensions/web-cache.c:470 -#: ../midori/midori-privatedata.c:304 +#: ../midori/midori-preferences.c:493 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Προσωρινής μνήμης ιστού" -#: ../midori/midori-preferences.c:502 -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:494 ../midori/midori-preferences.c:497 msgid "The maximum size of cached pages on disk" msgstr "Το μέγιστο μέγεθος των προσωρινά αποθηκευμένων σελίδων στο δίσκο" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:499 msgid "MB" msgstr "ΜΒ" -#: ../midori/midori-preferences.c:526 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:506 +msgid "Identify as" +msgstr "Αναγνώριση ως" + +#: ../midori/midori-preferences.c:521 msgid "Privacy" msgstr "Προσωπικό απόρρητο" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:523 msgid "Delete old Cookies after:" msgstr "Διαγραφή παλιών cookies μετά από:" -#: ../midori/midori-preferences.c:530 -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:525 ../midori/midori-preferences.c:528 msgid "The maximum number of days to save cookies for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:532 msgid "Only accept Cookies from sites you visit" msgstr "Αποδοχή Cookies μόνο από τα επισκεπτόμενους ιστότοπους" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:533 msgid "Block cookies sent by third-party websites" msgstr "Εμπόδισε cookies που στέλνονται από τρίτους ιστότοπους " -#: ../midori/midori-preferences.c:543 -msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." -msgstr "Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή προφίλ χρηστών για διαφημιστικούς λόγους." +#: ../midori/midori-preferences.c:538 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Τα cookies αποθηκεύουν δεδομένα σύνδεσης, αποθηκεύουν παιχνίδια ή προφίλ " +"χρηστών για διαφημιστικούς λόγους." -#: ../midori/midori-preferences.c:550 +#: ../midori/midori-preferences.c:545 msgid "Enable offline web application cache" msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-preferences.c:553 +#: ../midori/midori-preferences.c:548 msgid "Enable HTML5 local storage support" msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:557 +#: ../midori/midori-preferences.c:552 msgid "Strip referrer details sent to websites" msgstr "Αφαίρεση λεπτομερειών referrer που αποστέλλονται σε ιστοσελίδες" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:554 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Εάν η κεφαλίδα \"Referer\" θα πρέπει να συντομεύσει στο hostname" -#: ../midori/midori-preferences.c:562 +#: ../midori/midori-preferences.c:557 msgid "Delete pages from history after:" msgstr "Διαγραφή σελίδων από το ιστορικό μετά από:" -#: ../midori/midori-preferences.c:564 -#: ../midori/midori-preferences.c:567 +#: ../midori/midori-preferences.c:559 ../midori/midori-preferences.c:562 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-preferences.c:604 -#: ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:599 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Επεκτάσεις" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1047 msgid "Add search engine" msgstr "Προσθήκη μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1047 msgid "Edit search engine" msgstr "Επεξεργασία μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:1096 +#: ../midori/midori-searchaction.c:1075 msgid "_Name:" msgstr "_Όνομα:" -#: ../midori/midori-searchaction.c:1111 +#: ../midori/midori-searchaction.c:1090 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-searchaction.c:1124 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-searchaction.c:1143 +#: ../midori/midori-searchaction.c:1122 msgid "_Token:" msgstr "_Μορφότυπο:" -#: ../midori/midori-searchaction.c:1441 +#: ../midori/midori-searchaction.c:1412 msgid "Manage Search Engines" msgstr "Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-searchaction.c:1541 +#: ../midori/midori-searchaction.c:1512 msgid "Use as _default" msgstr "Χρήση ως _προκαθορισμένο" -#: ../midori/midori-searchaction.c:1652 +#: ../midori/midori-searchaction.c:1623 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n" -#: ../midori/midori-searchaction.c:1707 +#: ../midori/midori-searchaction.c:1678 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/midori-historycompletion.vala:17 -#: ../panels/midori-history.c:111 +#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111 msgid "History" msgstr "Ιστορικό" @@ -1802,27 +1793,26 @@ msgid "Search for %s" msgstr "Αναζήτηση για %s" -#: ../midori/midori-searchcompletion.vala:23 +#: ../midori/midori-searchcompletion.vala:20 #: ../midori/midori-searchcompletion.vala:60 msgid "Search with…" msgstr "Αναζήτηση με..." -#: ../midori/midori-searchcompletion.vala:50 +#: ../midori/midori-searchcompletion.vala:48 #, c-format msgid "Search with %s" msgstr "Αναζήτηση με %s" -#: ../midori/sokoke.c:251 +#: ../midori/sokoke.c:243 msgid "Open with" msgstr "Άνοιγμα με" -#: ../midori/sokoke.c:259 +#: ../midori/sokoke.c:251 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Επιλέξτε μια εφαρμογή ή εντολή για να ανοίξει το \"%s\":" -#: ../midori/sokoke.c:374 -#: ../midori/sokoke.c:388 +#: ../midori/sokoke.c:368 ../midori/sokoke.c:388 msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." @@ -1847,30 +1837,28 @@ msgid "Close Findbar" msgstr "Κλείσιμο μπάρας εύρεσης" -#: ../toolbars/midori-transferbar.c:109 +#: ../toolbars/midori-transferbar.c:110 #, c-format msgid "The file '%s' has been downloaded." msgstr "Το αρχείο '%s' έχει κατέβει." -#: ../toolbars/midori-transferbar.c:114 +#: ../toolbars/midori-transferbar.c:115 msgid "Transfer completed" msgstr "Η μεταφορά ολοκληρώθηκε" -#: ../toolbars/midori-transferbar.c:239 -#: ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Καθαρισμός όλων" -#: ../toolbars/midori-transferbar.c:272 -#: ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 msgid "Some files are being downloaded" msgstr "Μερικά αρχεία κατεβαίνουν" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:284 msgid "_Quit Midori" msgstr "_Τερματισμός του Μιντόρι" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:286 msgid "The transfers will be cancelled if Midori quits." msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori." @@ -1896,48 +1884,43 @@ msgid "Add a new folder" msgstr "Προσθήκη ενός νέου φακέλου" -#: ../panels/midori-bookmarks.c:687 -#: ../panels/midori-history.c:629 +#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629 msgid "Separator" msgstr "Διαχωριστικό" #. Create the filter entry -#: ../panels/midori-bookmarks.c:1017 +#: ../panels/midori-bookmarks.c:1009 msgid "Search Bookmarks" msgstr "Αναζήτηση Σελιδοδεικτών" -#: ../panels/midori-history.c:158 -#: ../panels/midori-history.c:191 +#: ../panels/midori-history.c:158 ../panels/midori-history.c:191 msgid "Today" msgstr "Σήμερα" -#: ../panels/midori-history.c:160 -#: ../panels/midori-history.c:193 +#: ../panels/midori-history.c:160 ../panels/midori-history.c:193 msgid "Yesterday" msgstr "Χθες" -#: ../panels/midori-history.c:162 -#: ../panels/midori-history.c:188 +#: ../panels/midori-history.c:162 ../panels/midori-history.c:188 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d μέρα πριν" msgstr[1] "%d μέρες πριν" -#: ../panels/midori-history.c:165 -#: ../panels/midori-history.c:186 +#: ../panels/midori-history.c:165 ../panels/midori-history.c:186 msgid "A week ago" msgstr "Μια βδομάδα πριν" -#: ../panels/midori-history.c:234 -#: ../midori/midori-bookmarks.c:59 +#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" #: ../panels/midori-history.c:362 msgid "Are you sure you want to remove all history items?" -msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" +msgstr "" +"Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" #: ../panels/midori-history.c:409 msgid "Bookmark the selected history item" @@ -1952,7 +1935,7 @@ msgstr "Καθαρισμός ολόκληρου του ιστορικού" #. Create the filter entry -#: ../panels/midori-history.c:988 +#: ../panels/midori-history.c:981 msgid "Search History" msgstr "Αναζήτηση Ιστορικού" @@ -1960,11 +1943,11 @@ msgid "Transfers" msgstr "Μεταφορές" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:442 msgid "Open Destination _Folder" msgstr "Άνοιγμα _φακέλου προορισμού" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:445 msgid "Copy Link Loc_ation" msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου" @@ -2007,13 +1990,11 @@ msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" #: ../katze/katze-utils.c:422 -#: ../katze/katze-utils.c:811 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s" -#: ../katze/katze-utils.c:459 -#: ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Επιλογή αρχείου" @@ -2026,28 +2007,27 @@ msgid "None" msgstr "Κανένα" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:688 msgid "1 hour" msgstr "1 ώρα" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:689 msgid "1 day" msgstr "1 ημέρα" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:690 msgid "1 week" msgstr "1 Εβδομάδα" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:691 msgid "1 month" msgstr "1 μήνας" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "1 year" msgstr "1 έτος" -#: ../katze/katze-preferences.c:72 -#: ../extensions/delayed-load.vala:24 +#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 #: ../extensions/history-list.vala:235 #, c-format @@ -2062,43 +2042,50 @@ msgid "SHA1-Checksum:" msgstr "SHA1-Checksum:" -#: ../extensions/adblock.c:492 +#: ../extensions/adblock.c:483 msgid "Configure Advertisement filters" msgstr "Ρύθμιση φίλτρων διαφημίσεων" -#: ../extensions/adblock.c:523 +#: ../extensions/adblock.c:512 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." -msgstr "Πληκτρολογήστε την διεύθυνση σε μία προ ρυθμισμένη λίστα φίλτρων στην εισαγωγή κειμένου και πατήστε \"Προσθήκη\" για να την προσθέσετε στην λίστα. Μπορείτε να βρείτε περισσότερες λίστες στο %s." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Πληκτρολογήστε την διεύθυνση σε μία προ ρυθμισμένη λίστα φίλτρων στην " +"εισαγωγή κειμένου και πατήστε \"Προσθήκη\" για να την προσθέσετε στην λίστα. " +"Μπορείτε να βρείτε περισσότερες λίστες στο %s." -#: ../extensions/adblock.c:937 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Επεξεργασία κανόνα" -#: ../extensions/adblock.c:951 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Κανόνας:" -#: ../extensions/adblock.c:1005 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Φρ_αγή εικόνας" -#: ../extensions/adblock.c:1010 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Φρ_αγή συνδέσμου" -#: ../extensions/adblock.c:1936 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Εμποδιστής διαφημίσεων" -#: ../extensions/adblock.c:1937 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα" #. i18n: An infobar shows up when viewing a script on userscripts.org #: ../extensions/addons.c:222 msgid "This page appears to contain a user script. Do you wish to install it?" -msgstr "Αυτή η σελίδα φαίνεται να περιλαμβάνει ένα σενάριο χρήστη. Θέλετε να το εγκαταστήσετε;" +msgstr "" +"Αυτή η σελίδα φαίνεται να περιλαμβάνει ένα σενάριο χρήστη. Θέλετε να το " +"εγκαταστήσετε;" #: ../extensions/addons.c:223 msgid "_Install user script" @@ -2107,7 +2094,9 @@ #. i18n: An infobar shows up when viewing a style on userstyles.org #: ../extensions/addons.c:228 msgid "This page appears to contain a user style. Do you wish to install it?" -msgstr "Αυτή η σελίδα φαίνεται να περιέχει ένα στυλ χρήστη. Θέλετε να το εγκαταστήσετε;" +msgstr "" +"Αυτή η σελίδα φαίνεται να περιέχει ένα στυλ χρήστη. Θέλετε να το " +"εγκαταστήσετε;" #: ../extensions/addons.c:229 msgid "_Install user style" @@ -2117,19 +2106,16 @@ msgid "Don't install" msgstr "Να μην εγκατασταθεί" -#: ../extensions/addons.c:320 -#: ../extensions/addons.c:675 +#: ../extensions/addons.c:320 ../extensions/addons.c:675 msgid "Userscripts" msgstr "Δέσμες εντολών χρηστών" -#: ../extensions/addons.c:325 -#: ../extensions/addons.c:677 +#: ../extensions/addons.c:325 ../extensions/addons.c:677 msgid "Userstyles" msgstr "Θέματα χρήστη" -#: ../extensions/addons.c:371 -#: ../extensions/addons.c:450 -#: ../extensions/feed-panel/main.c:128 +#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/feed-panel/main.c:120 msgid "Error" msgstr "Σφάλμα" @@ -2151,13 +2137,11 @@ msgid "The file %s will be permanently deleted." msgstr "Το αρχείο %s θα διαγραφεί μόνιμα." -#: ../extensions/addons.c:564 -#: ../extensions/addons.c:641 +#: ../extensions/addons.c:564 ../extensions/addons.c:641 msgid "Open in Text Editor" msgstr "Άνοιγμα στον κειμενογράφο" -#: ../extensions/addons.c:566 -#: ../extensions/addons.c:650 +#: ../extensions/addons.c:566 ../extensions/addons.c:650 msgid "Open Target Folder" msgstr "Άνοιγμα φακέλου προορισμού" @@ -2169,8 +2153,7 @@ msgid "Remove selected addon" msgstr "Απομάκρυνση της επιλεγμένης επέκτασης" -#: ../extensions/addons.c:1677 -#: ../extensions/addons.c:1893 +#: ../extensions/addons.c:1677 ../extensions/addons.c:1893 msgid "User addons" msgstr "Προσθήκες χρήστη" @@ -2201,8 +2184,12 @@ msgstr "Διαγραφή όλων" #: ../extensions/cookie-manager/cookie-manager-page.c:105 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Διαγράφει όλα τα cookies που φαίνονται. Εάν ένα φίλτρο έχει δοθεί, μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." +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:120 msgid "Expand All" @@ -2212,23 +2199,23 @@ msgid "Collapse All" msgstr "Μάζεμα όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:575 msgid "Do you really want to delete all cookies?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:577 msgid "Question" msgstr "Ερώτηση" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:588 msgid "Only cookies which match the filter will be deleted." msgstr "Μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "At the end of the session" msgstr "Στο τέλος της συνεδρίας" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:683 #, c-format msgid "" "Host: %s\n" @@ -2246,15 +2233,15 @@ "Λήγει: %s" #. i18n: is this cookie secure (SSL)? yes/ no -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "Yes" msgstr "Ναι" -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "No" msgstr "Όχι" -#: ../extensions/cookie-manager/cookie-manager-page.c:699 +#: ../extensions/cookie-manager/cookie-manager-page.c:705 #, c-format msgid "" "Domain: %s\n" @@ -2263,19 +2250,20 @@ "Τομέας: %s\n" "Cookies: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1022 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 msgid "Name" msgstr "Όνομα" -#: ../extensions/cookie-manager/cookie-manager-page.c:1074 +#: ../extensions/cookie-manager/cookie-manager-page.c:1080 msgid "_Expand All" msgstr "_Ανάπτυξη όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:1082 +#: ../extensions/cookie-manager/cookie-manager-page.c:1088 msgid "_Collapse All" msgstr "_Μάζεμα όλων" -#: ../extensions/cookie-manager/cookie-manager-page.c:1134 +#: ../extensions/cookie-manager/cookie-manager-page.c:1140 msgid "Search Cookies by Name or Domain" msgstr "Αναζήτηση Cookies ανά Όνομα ή Τομέα" @@ -2295,8 +2283,7 @@ msgid "Copy the addresses of all tabs to the clipboard" msgstr "Αντιγραφή των διευθύνσεων όλων των καρτέλων στο πρόχειρο" -#: ../extensions/delayed-load.vala:24 -#: ../extensions/delayed-load.vala:209 +#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209 #, c-format msgid "Delayed load" msgstr "Καθυστέρηση φόρτωσης" @@ -2310,8 +2297,12 @@ msgstr "Καθυστέρηση φόρτωσης σελίδας μέχρι να χρησιμοποιήσετε την μπάρα." #: ../extensions/external-download-manager.vala:124 -msgid "An error occurred when attempting to download a file with the following plugin:\n" -msgstr "Ένα σφάλμα προκλήθηκε κατα την απόπειρα κατεβάσματος ενός αρχείου με το ακόλουθω πρόσθετο:\n" +msgid "" +"An error occurred when attempting to download a file with the following " +"plugin:\n" +msgstr "" +"Ένα σφάλμα προκλήθηκε κατα την απόπειρα κατεβάσματος ενός αρχείου με το " +"ακόλουθω πρόσθετο:\n" #: ../extensions/external-download-manager.vala:175 msgid "External Download Manager - Aria2" @@ -2338,38 +2329,40 @@ msgid "Download files with \"%s\" or a custom command" msgstr "Κατέβασμα αρχείων με \"%s\" ή με χειροκίνητη εντολη" -#: ../extensions/external-download-manager.vala:318 +#: ../extensions/external-download-manager.vala:320 msgid "External Download Manager - CommandLine" msgstr "Εξωτερικός διαχειριστής μεταφορτώσεων - Γραμμή εντολών" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML." +msgstr "" +"Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"feed\" στα δεδομένα XML." +msgstr "" +"Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"feed\" στα δεδομένα XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:378 +#: ../extensions/feed-panel/feed-panel.c:375 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Τελευταία ενημέρωση: %s." -#: ../extensions/feed-panel/feed-panel.c:644 +#: ../extensions/feed-panel/feed-panel.c:629 msgid "Feeds" msgstr "Ροές νέων" -#: ../extensions/feed-panel/feed-panel.c:697 +#: ../extensions/feed-panel/feed-panel.c:682 msgid "Add new feed" msgstr "Προσθήκη ενός νέας ροής" -#: ../extensions/feed-panel/feed-panel.c:704 +#: ../extensions/feed-panel/feed-panel.c:689 msgid "Delete feed" msgstr "Διαγραφή ροής" -#: ../extensions/feed-panel/feed-panel.c:784 +#: ../extensions/feed-panel/feed-panel.c:769 msgid "_Feeds" msgstr "_Ροές" @@ -2402,23 +2395,24 @@ #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"channel\" στα XML δεδομένα." +msgstr "" +"Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"channel\" στα XML δεδομένα." -#: ../extensions/feed-panel/main.c:130 +#: ../extensions/feed-panel/main.c:122 #, c-format msgid "Feed '%s' already exists" msgstr "Η ροή '%s' ήδη υπάρχει" -#: ../extensions/feed-panel/main.c:207 +#: ../extensions/feed-panel/main.c:199 #, c-format msgid "Error loading feed '%s'" msgstr "Σφάλμα κατά την φόρτωση ροής '%s'" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:509 msgid "Feed Panel" msgstr "Πλαίσιο ροής" -#: ../extensions/feed-panel/main.c:518 +#: ../extensions/feed-panel/main.c:510 msgid "Read Atom/ RSS feeds" msgstr "Ανάγνωση Atom / RSS ροών" @@ -2461,10 +2455,11 @@ #: ../extensions/formhistory/formhistory.c:428 msgid "Activate or deactivate form history for the current tab." -msgstr "Ενεργοποίηση ή απενεργοποίηση ιστορικότητας φόρμας για την τελευταία τρέχουσα καρτέλα." +msgstr "" +"Ενεργοποίηση ή απενεργοποίηση ιστορικότητας φόρμας για την τελευταία " +"τρέχουσα καρτέλα." -#: ../extensions/formhistory/formhistory.c:515 -#: ../midori/midori-history.c:47 +#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47 #: ../midori/midori-bookmarks.c:155 #, c-format msgid "Failed to open database: %s\n" @@ -2478,7 +2473,8 @@ #: ../extensions/formhistory/formhistory.c:624 msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" -msgstr "Ενεργοποίηση ιστορικού φόρμας μέσω συντόμευσης(Ctrl+Shift+F) ανά καρτέλα" +msgstr "" +"Ενεργοποίηση ιστορικού φόρμας μέσω συντόμευσης(Ctrl+Shift+F) ανά καρτέλα" #: ../extensions/formhistory/formhistory.c:681 msgid "Form history filler" @@ -2549,7 +2545,9 @@ #: ../extensions/history-list.vala:572 msgid "Move to the last used tab when switching or closing tabs" -msgstr "Μετακίνηση στην τελευταία χρησιμοποιημένη καρτέλα όταν εναλλάσσονται ή κλείνονται οι καρτέλες" +msgstr "" +"Μετακίνηση στην τελευταία χρησιμοποιημένη καρτέλα όταν εναλλάσσονται ή " +"κλείνονται οι καρτέλες" #: ../extensions/mouse-gestures.c:297 msgid "Mouse Gestures" @@ -2563,19 +2561,19 @@ msgid "Reload page or stop loading" msgstr "Ανανέωση σελίδας ή διακοπή φόρτωσης" -#: ../extensions/shortcuts.c:176 +#: ../extensions/shortcuts.c:168 msgid "Customize Keyboard shortcuts" msgstr "Προσαρμογή συντομεύσεων πληκτρολογίου" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:275 msgid "Customize Sh_ortcuts..." msgstr "Προσαρμογή σ_υντομεύσεων..." -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:312 msgid "Shortcuts" msgstr "Συντομεύσεις" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:313 msgid "View and edit keyboard shortcuts" msgstr "Εμφάνιση και επεξεργασία συντομεύσεων πληκτρολογίου" @@ -2605,10 +2603,11 @@ #: ../extensions/statusbar-features.c:260 msgid "Easily toggle features on web pages on and off" -msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και απενεργοποίηση" +msgstr "" +"Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και " +"απενεργοποίηση" -#: ../extensions/tab-panel.c:584 -#: ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 msgid "Tab Panel" msgstr "Πλαίσιο καρτέλας" @@ -2633,8 +2632,12 @@ msgstr "Προσαρμογή εργαλειοθήκης" #: ../extensions/toolbar-editor.c:411 -msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." -msgstr "Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά." +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Επιλέξτε τα αντικείμενα που θα εμφανίζονται στην εργαλειοθήκη. Τα " +"αντικείμενα μπορούνε να ταξινομηθούν κατά την μεταφορά." #: ../extensions/toolbar-editor.c:427 msgid "Available Items" @@ -2687,15 +2690,15 @@ msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:298 +#: ../midori/midori-privatedata.c:302 msgid "Saved logins and _passwords" msgstr "Αποθηκευμένες συνδέσεις και _συνθηματικά" -#: ../midori/midori-privatedata.c:300 +#: ../midori/midori-privatedata.c:304 msgid "Cookies and Website data" msgstr "Δεδομένα ιστοσελίδας και Cookies" -#: ../midori/midori-privatedata.c:307 +#: ../midori/midori-privatedata.c:311 msgid "Website icons" msgstr "Εικονίδια ιστότοπων" @@ -2703,7 +2706,7 @@ msgid "Open tabs" msgstr "Ανοιχτές καρτέλες" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Περισσότερες ανοιχτές καρτέλες..." @@ -2749,79 +2752,339 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/midori-session.c:187 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν μπορούν να επιβεβαιωθούν." +#: ../midori/midori-session.c:188 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν " +"μπορούν να επιβεβαιωθούν." -#: ../midori/midori-session.c:355 +#: ../midori/midori-session.c:357 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" -#: ../midori/midori-session.c:376 -#: ../midori/midori-frontend.c:448 +#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/midori-session.c:406 +#: ../midori/midori-session.c:408 #, c-format msgid "The session couldn't be saved. %s" msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:126 +#: ../midori/midori-frontend.c:127 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/midori-frontend.c:309 -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-frontend.c:312 +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-frontend.c:319 +#: ../midori/midori-frontend.c:322 msgid "Modify _preferences" msgstr "Τροποποίηση _προτιμήσεων" -#: ../midori/midori-frontend.c:323 +#: ../midori/midori-frontend.c:326 msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/midori-frontend.c:332 +#: ../midori/midori-frontend.c:335 msgid "Show a dialog after Midori crashed" msgstr "Εμφάνιση διαλόγου μετά από αποτυχία" -#: ../midori/midori-frontend.c:337 +#: ../midori/midori-frontend.c:340 msgid "Discard old tabs" msgstr "Απόρριψη παλιών καρτελών" -#: ../midori/midori-frontend.c:400 +#: ../midori/midori-frontend.c:404 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n" -#: ../midori/midori-frontend.c:433 +#: ../midori/midori-frontend.c:437 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/midori-frontend.c:464 +#: ../midori/midori-frontend.c:468 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n" -#: ../midori/midori-frontend.c:472 +#: ../midori/midori-frontend.c:476 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n" -#: ../midori/midori-frontend.c:483 +#: ../midori/midori-frontend.c:487 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/midori-frontend.c:488 +#: ../midori/midori-frontend.c:492 msgid "_Ignore" msgstr "Α_γνόησε" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#, c-format +msgid "SQL fails: %s" +msgstr "Αποτυχία SQL: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +msgid "Accept" +msgstr "Αποδοχή" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +msgid "Accept for session" +msgstr "Αποδοχή για αυτήν την συνεδρία" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +msgid "Block" +msgstr "Φραγή" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#, c-format +msgid "Could not open database of extenstion: %s" +msgstr "Αποτυχία ανοίγματος της βάσης δεδομένων των επεκτάσεων: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#, c-format +msgid "Failed to execute database statement: %s" +msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +msgid "Do you really want to delete all cookie permissions?" +msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#, fuzzy +msgid "Delete all cookie permissions?" +msgstr "Διαγραφή παλιών cookies μετά από:" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +msgid "" +"This action will delete all cookie permissions. You will be asked for " +"permissions again for each web site visited." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +msgid "Cookie permission manager" +msgstr "Διαχειριστής cookie" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +msgid "Instance of current cookie permission manager" +msgstr "" + +#. Set up dialog +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +msgid "Configure cookie permission" +msgstr "Ρύθμιση αδειών cookie" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#, c-format +msgid "" +"Below is a list of all web sites and the policy set for them. You can delete " +"policies by marking the entries and clicking on Delete.You can also " +"add a policy for a domain manually by entering the domain below, choosing " +"the policy and clicking on Add." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +msgid "Domain" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +msgid "Policy" +msgstr "Πολιτική" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +msgid "Delete _all" +msgstr "Διαγραφή ό_λων" + +#. Add "ask-for-unknown-policy" checkbox +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +msgid "A_sk for policy if unknown for a domain" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +msgid "" +"A fatal error occurred which prevents the cookie permission manager " +"extension to continue. You should disable it." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +msgid "Error in cookie permission manager extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +msgid "Reason" +msgstr "Αιτία" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +msgid "Could not get path to configuration of extension: path is NULL" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +msgid "Could not get path to configuration of extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#, c-format +msgid "Could not create configuration folder for extension: %s" +msgstr "Αδυναμια δημιουργείας φακέλου ρυθμίσεων για την επέκταση:%s" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +msgid "Could not create configuration folder for extension." +msgstr "Αδυναμία δημιουργείας φακέλου ρυθμίσεων για την επέκταση." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +msgid "Could not open database of extension." +msgstr "Αποτυχία κατά το άνοιγμα της βάσης των επεκτάσεων: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +msgid "Could not set up database structure of extension." +msgstr "Αδυναμία δημιουργείας της δομής τηε βάσης δεδομέων για την επέκταση." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#, c-format +msgid "Could not determine global cookie policy to set for domain: %s" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 +msgid "Confirm storing cookie" +msgstr "Επιβεβαίωση αποθήκευσης cookie" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#, c-format +msgid "The website %s wants to store %d cookies." +msgstr "Η ιστοσελίδα %s θέλει να αποθηκεύση %d cookies." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#, c-format +msgid "The website %s wants to store a cookie." +msgstr "Η ιστοσελίδα %s θέλει να αποθηκεύση ένα cookie." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#, c-format +msgid "Multiple websites want to store %d cookies in total." +msgstr "Πολλαπλές ιστοσελίδες θέλουν να αποθηκεύσουν στο σύνολο %d cookies." + +#. Create expander for details +#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 +msgid "_Details" +msgstr "_Λεπτομέρειες" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +msgid "Path" +msgstr "Διαδρομή" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +msgid "Value" +msgstr "Τιμή" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +msgid "Expire date" +msgstr "Ημερομηνία λήξης" + +#. Create buttons for dialog +#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 +msgid "_Accept" +msgstr "_Αποδοχή" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 +msgid "Accept for this _session" +msgstr "Αποδοχή για αυτή την _συνεδρία" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 +msgid "De_ny" +msgstr "Άρ_νηση" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#, fuzzy +msgid "Extension instance" +msgstr "Επεκτάσεις" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +msgid "The Midori extension instance for this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#, fuzzy +msgid "Application instance" +msgstr "Εκτός σύνδεσης προσωρινή μνήμη εφαρμογής" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +msgid "The Midori application instance this extension belongs to" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +msgid "Database instance" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +msgid "Pointer to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +msgid "Ask for unknown policy" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +msgid "" +"If true this extension ask for policy for every unknown domain.If false this " +"extension uses the global cookie policy set in Midori settings." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +msgid "Undetermined" +msgstr "Απροσδιόριστο" + +#: ../extensions/cookie-permissions/main.c:62 +#, fuzzy +msgid "Cookie Security Manager" +msgstr "Διαχειριστής cookie" + +#: ../extensions/cookie-permissions/main.c:63 +msgid "Manage cookie permission per site" +msgstr "" + +#~ msgid "Writing failed." +#~ msgstr "Αποτυχία εγγραφής." + +#~ msgid "_Window" +#~ msgstr "_Παράθυρο" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" + +#~ msgid "Kinetic scrolling" +#~ msgstr "Κινητική κύλιση" + +#~ msgid "Whether scrolling should kinetically move according to speed" +#~ msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα " + #~ msgid "Redirects console warnings to the specified FILENAME" #~ msgstr "Ανακατεύθυνση μηνυμάτων κονσόλας στο συγκεκριμένο ΑΡΧΕΙΟ" @@ -3099,9 +3362,6 @@ #~ msgid "HTML5 _Databases" #~ msgstr "_Βάσεις δεδομένων HTML5" -#~ msgid "Offline Application Cache" -#~ msgstr "Εκτός σύνδεσης προσωρινή μνήμη εφαρμογής" - #~ msgid "Not available: %s" #~ msgstr "Μη διαθέσιμα: %s" diff -Nru midori-0.4.9/po/es.po midori-0.5.0/po/es.po --- midori-0.4.9/po/es.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/es.po 2013-04-04 20:31:20.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-03 00:03+0000\n" +"POT-Creation-Date: 2013-03-22 20:13+0000\n" "PO-Revision-Date: 2012-05-13 11:54-0600\n" "Last-Translator: Sergio García \n" "Language-Team: Spanish/es \n" @@ -33,8 +33,8 @@ msgstr "Internet;WWW;Explorador" #: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3856 ../midori/sokoke.c:561 msgid "Midori" msgstr "Midori" @@ -46,11 +46,11 @@ msgid "New Private Browsing Window" msgstr "Ventana de navegación privada nueva" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1287 msgid "New Tab" msgstr "Pestaña nueva" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1284 msgid "New Window" msgstr "Ventana nueva" @@ -66,7 +66,7 @@ msgid "Open a new private browsing window" msgstr "Abrir una ventana nueva de navegación privada" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4176 msgid "Private Browsing" msgstr "Navegación privada" @@ -159,197 +159,197 @@ msgid "Error: \"gdb\" can't be found\n" msgstr "Error: no se encontró «gdb»\n" -#: ../midori/main.c:181 +#: ../midori/main.c:182 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:183 +#: ../midori/main.c:184 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" -#: ../midori/main.c:338 +#: ../midori/main.c:339 msgid "An unknown error occured" msgstr "Se produjo un error desconocido" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 +#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:540 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada «%s»." -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6041 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1351 msgid "Add Boo_kmark" msgstr "Añadir _marcador" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1352 msgid "_Extensions" msgstr "_Extensiones" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Historial" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1354 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1355 msgid "User_styles" msgstr "_Estilos de usuario" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1356 msgid "New _Tab" msgstr "_Pestaña nueva" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1357 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1358 msgid "Netscape p_lugins" msgstr "C_omplementos de Netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1359 msgid "_Closed Tabs" msgstr "Pestañas _cerradas" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5180 msgid "New _Window" msgstr "_Ventana nueva" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1361 msgid "New _Folder" msgstr "_Carpeta nueva" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419 +#: ../midori/midori-app.c:1422 msgid "[Addresses]" msgstr "[Direcciones]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:524 msgid "File not found." msgstr "Archivo no encontrado." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:549 ../midori/midori-array.c:588 +#: ../midori/midori-array.c:612 ../midori/midori-array.c:622 msgid "Malformed document." msgstr "Documento defectuoso." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:631 msgid "Unrecognized bookmark format." msgstr "Formato de marcador no reconocido." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5316 msgid "Go forward to the next page" msgstr "Avanzar a la siguiente página" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5327 msgid "Go to the next sub-page" msgstr "Ir a la subpágina siguiente" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5274 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5271 msgid "Stop loading the current page" msgstr "Detener la carga de la página actual" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "No se pudo actualizar el título: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:616 #, c-format msgid "%s (Private Browsing)" msgstr "%s (navegación privada)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:726 ../midori/midori-browser.c:768 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Marcadores" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:822 msgid "New folder" msgstr "Carpeta nueva" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:822 msgid "Edit folder" msgstr "Editar carpeta" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:824 msgid "New bookmark" msgstr "Marcador nuevo" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:824 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:858 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Escriba un nombre para este marcador y elija dónde guardarlo." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:914 msgid "Add to _Speed Dial" msgstr "Añadir a marcado _rápido" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:920 msgid "Show in the tool_bar" msgstr "Mostrar en la _barra de herramientas" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:928 msgid "Run as _web application" msgstr "Ejecutar como aplicación _web" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1044 ../midori/midori-browser.c:4423 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1054 msgid "Save associated _resources" msgstr "Guardar _recursos asociados" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1284 msgid "A new window has been opened" msgstr "Se ha abierto una ventana nueva" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1287 msgid "A new tab has been opened" msgstr "Se ha abierto una pestaña nueva" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1305 msgid "Error opening the image!" msgstr "Hubo un error al abrir la imagen." -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1306 msgid "Can not open selected image in a default viewer." msgstr "No se puede abrir la imagen seleccionada en el visor predeteminado." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1312 msgid "Error downloading the image!" msgstr "Hubo un error al descargar la imagen." -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1313 msgid "Can not download selected image." msgstr "No se puede descargar la imagen seleccionada." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1372 msgid "Save file" msgstr "Guardar archivo" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2344 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2472 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -363,24 +363,24 @@ "de noticias. La próxima vez que haga clic en un icono de canal de noticias " "se añadirá automáticamente." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2478 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Canal nuevo" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2510 ../midori/midori-browser.c:5340 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Añadir un marcador nuevo" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3036 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3418 ../midori/midori-browser.c:3419 msgid "Toggle text cursor navigation" msgstr "Activar o desactivar la navegación con el cursor del texto" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3421 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -388,110 +388,110 @@ "Presione y mantenga F7 para alternar a la navegación intercalada. Cuando se " "active, El cursor de texto aparecerá en todas las páginas." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3424 msgid "_Enable Caret Browsing" msgstr "_Activar navegación con cursor" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3840 ../midori/midori-browser.c:5788 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No se pudo insertar un elemento nuevo en el histórico: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4155 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Abrir todo en _pestañas" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4162 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Abrir en una _pestaña nueva" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4165 ../midori/midori-view.c:2771 +#: ../midori/midori-view.c:4654 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Abrir en una _ventana nueva" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4254 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4255 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4256 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4257 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4258 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4259 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4260 msgid "Midori 0.2.6" msgstr "Midori" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4278 msgid "Import bookmarks…" msgstr "Importar marcadores…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4281 ../midori/midori-browser.c:5345 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4292 msgid "_Application:" msgstr "_Aplicación:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4357 msgid "Import from XBEL or HTML file" msgstr "Importar desde archivo XBEL o HTML" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4385 msgid "Import from a file" msgstr "Importar desde un archivo" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4397 msgid "Failed to import bookmarks" msgstr "No se pudieron importar los marcadores" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4428 msgid "XBEL Bookmarks" msgstr "Marcadores XBEL" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4433 msgid "Netscape Bookmarks" msgstr "Marcadores de Netscape " -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4447 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "" "Midori sólo puede exportar a formatos XBEL (*.xbel) y Netscape (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4462 msgid "Failed to export bookmarks" msgstr "No se pudieron exportar los marcadores" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4678 msgid "A lightweight web browser." msgstr "Un navegador web ligero." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4679 msgid "See about:version for version info." msgstr "Consulte about:version para ver información de la versión." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4681 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -503,7 +503,7 @@ "publicada por la Free Software Foundation; bien versión 2.1 de la licencia o " "(según su criterio) cualquier versión posterior." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4716 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -513,374 +513,374 @@ "Guillermo Iguarán \n" "Abel Martín " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5178 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5181 msgid "Open a new window" msgstr "Abrir una ventana nueva" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5184 msgid "Open a new tab" msgstr "Abrir una pestaña nueva" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5186 msgid "New P_rivate Browsing Window" msgstr "Ventana nueva de navegación p_rivada" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5190 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5192 msgid "_Save Page As…" msgstr "_Guardar página como…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5193 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5195 msgid "Add to Speed _dial" msgstr "Añadir a _marcado rápido" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5199 msgid "Create _Launcher" msgstr "Crear _lanzador" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5202 msgid "Subscribe to News _feed" msgstr "Suscribirse al _canal de noticias" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5208 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5209 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5211 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5215 msgid "_Share" msgstr "_Compartir" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5216 msgid "Share this page" msgstr "Compartir esta página" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5220 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5223 msgid "Close a_ll Windows" msgstr "Cerrar _todas las ventanas" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5226 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5249 msgid "_Find…" msgstr "_Buscar…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5250 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5252 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5255 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5259 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5261 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5262 msgid "_Toolbars" msgstr "_Barras de herramientas" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5267 msgid "Reload page without caching" msgstr "Recargar página sin caché" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5277 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5280 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5284 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5286 msgid "View So_urce" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5289 msgid "Ca_ret Browsing" msgstr "Navegación con cu_rsor" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5293 msgid "Toggle fullscreen view" msgstr "Activar o desactivar pantalla completa" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5295 msgid "Scroll _Left" msgstr "Desplazar hacia la _izquierda" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5298 msgid "Scroll _Down" msgstr "Desplazar hacia a_bajo" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5301 msgid "Scroll _Up" msgstr "Desplazar hacia a_rriba" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5304 msgid "Scroll _Right" msgstr "Desplazar hacia la _derecha" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5307 msgid "_Readable" msgstr "_Legible" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5310 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5313 msgid "Go back to the previous page" msgstr "Ir a la página anterior" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5320 msgid "Go to the previous sub-page" msgstr "Ir a la subpágina anterior" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5329 msgid "_Homepage" msgstr "_Página de inicio" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5330 msgid "Go to your homepage" msgstr "Abrir la página de inicio" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5332 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5335 msgid "Undo _Close Tab" msgstr "Deshacer el _cierre de pestaña" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5342 msgid "Add a new _folder" msgstr "Añadir una _carpeta nueva" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5348 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5351 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Gestionar motores de búsqueda" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5354 msgid "_Clear Private Data" msgstr "_Limpiar datos privados" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5357 msgid "_Inspect Page" msgstr "_Inspeccionar página" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5361 msgid "_Previous Tab" msgstr "Pestaña _anterior" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5364 msgid "_Next Tab" msgstr "Pestaña _siguiente" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5366 msgid "Move Tab to _first position" msgstr "Mover pestana a la _primera posición" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5368 msgid "Move Tab _Backward" msgstr "Mover pestaña hacia _atrás" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5370 msgid "_Move Tab Forward" msgstr "_Mover pestaña hacia adelante" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5372 msgid "Move Tab to _last position" msgstr "Mover pestaña a la _última posición" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5375 msgid "Focus _Current Tab" msgstr "Enfocar la pestaña a_ctual" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5378 msgid "Focus _Next view" msgstr "Enfocar la vista _siguiente" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5381 msgid "Only show the Icon of the _Current Tab" msgstr "Solo mostrar el icono de la pestaña actual" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5384 msgid "_Duplicate Current Tab" msgstr "_Duplicar pestaña actual" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5387 msgid "Close Ot_her Tabs" msgstr "Cerrar las o_tras pestañas" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5390 msgid "Open last _session" msgstr "Abrir la última _sesión" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5393 msgid "_Help" msgstr "Ay_uda" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5395 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5398 msgid "_Report a Problem…" msgstr "_Informar de un problema…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5403 ../midori/midori-browser.c:6060 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5410 msgid "_Menubar" msgstr "Barra de _menús" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5414 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5418 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5419 msgid "Sidepanel" msgstr "Panel lateral" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5422 msgid "_Bookmarkbar" msgstr "Barra de _marcadores" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5426 msgid "_Statusbar" msgstr "Barra de _estado" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Chino tradicional (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Chino simplificado (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5445 msgid "Japanese (SHIFT__JIS)" msgstr "Japonés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Koreano (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5454 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5457 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5460 msgid "Custom…" msgstr "Personalizado…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:5966 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:5973 msgid "_Location…" msgstr "_Ubicación…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:5975 msgid "Open a particular location" msgstr "Abrir una dirección en particular" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:5997 msgid "_Web Search…" msgstr "_Buscar en la web…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:5999 msgid "Run a web search" msgstr "Realizar una búsqueda en la web" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6026 msgid "Reopen a previously closed tab or window" msgstr "Reabrir una pestaña o ventana cerrada" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6043 msgid "Show the saved bookmarks" msgstr "Mostrar los marcadores guardados" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6076 msgid "_Tabs" msgstr "_Pestañas" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6078 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pestañas abiertas" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6092 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6094 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6863 #, c-format msgid "Unexpected setting '%s'" msgstr "Configuración no esperada «%s»" @@ -943,24 +943,24 @@ msgid "Self-signed" msgstr "Autofirmado" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Detalles de seguridad" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Pegar y c_ontinuar" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Sin verificar" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Conexión verificada y cifrada" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Conexión abierta y sin cifrar" @@ -977,145 +977,136 @@ msgid "Align sidepanel to the left" msgstr "Alinear el panel a la izquierda" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Mostrar marcado rápido" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Mostrar página de inicio" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:344 msgid "Show last open tabs" msgstr "Mostrar las últimas pestañas abiertas" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:343 msgid "Show last tabs without loading" msgstr "Mostrar las últimas etiquetas sin cargar" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Visualizar página en blanco" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Visualizar motor de búsqueda predeterminado" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Visualizar página personalizada" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:158 ../midori/midori-websettings.c:234 #: ../katze/katze-utils.c:603 msgid "Custom..." msgstr "Personalizar…" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Pestaña nueva" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Ventana nueva" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Iconos pequeños" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Iconos y texto" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Texto al lado de los iconos" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME o entorno)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Sin servidor proxy" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Estilo de la barra de herramientas:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "El estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Cuando Midori inicie:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Abrir las páginas nuevas en:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Identificar como" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Identificar como páginas web" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Siempre usar las tipografías que elija" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "" "Usar las tipografías elegidas por el usuario en vez de las elegidas por los " "sitios web" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/midori-websettings.c:1365 +#: ../midori/midori-websettings.c:1430 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración no válido «%s»" @@ -1125,273 +1116,277 @@ msgid "Failed to inject stylesheet: %s" msgstr "Fallo al inyectar hoja de estilos:: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:767 ../midori/midori-view.c:895 msgid "Trust this website" msgstr "Confiar en este sitio" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:893 msgid "Security unknown" msgstr "Seguridad desconocida" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1194 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s quiere guardar una base de datos HTML5." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Deny" msgstr "_Denegar " -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Allow" msgstr "_Permitir" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1226 #, c-format msgid "%s wants to know your location." msgstr "%s quiere conocer su ubicación actual." -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1357 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1358 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No se pudo cargar la página «%s»." -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1360 msgid "Try again" msgstr "Inténtelo de nuevo" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1620 ../midori/midori-view.c:2712 #, c-format msgid "Send a message to %s" msgstr "Enviar un mensaje a %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2497 msgid "Add _search engine..." msgstr "Añadir motor de _búsqueda…" -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2540 ../midori/midori-view.c:2847 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2592 msgid "Open Link in New _Tab" msgstr "Abrir enlace en una _pestaña nueva" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2596 msgid "Open Link in _Foreground Tab" msgstr "Abrir enlace en pestaña en p_rimer plano" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2597 msgid "Open Link in _Background Tab" msgstr "Abrir enlace en pestaña en _segundo plano" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2600 msgid "Open Link in New _Window" msgstr "Abrir enlace en una _ventana nueva" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2603 msgid "Open Link as Web A_pplication" msgstr "Abrir enlace como a_plicación web" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2608 msgid "Copy Link de_stination" msgstr "Copiar de_stino del enlace" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2614 msgid "Save _As…" msgstr "_Guardar como…" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2624 +msgid "Open _Image in New Window" +msgstr "Abrir _imagen en nueve ventana" + +#: ../midori/midori-view.c:2625 msgid "Open _Image in New Tab" msgstr "Abrir _imagen en una pestaña nueva" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2629 msgid "Copy Im_age" msgstr "Copiar im_agen" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2632 msgid "Save I_mage" msgstr "Guardar i_magen" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2635 msgid "Open in Image _Viewer" msgstr "Abrir en _Visor de imágenes" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2642 msgid "Copy Video _Address" msgstr "Copiar _dirección del vídeo" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2645 msgid "Save _Video" msgstr "Guardar _vídeo" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2645 msgid "Download _Video" msgstr "Descargar _vídeo" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2671 msgid "Search _with" msgstr "Buscar _con" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2700 msgid "_Search the Web" msgstr "_Buscar en la web" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2720 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una _pestaña nueva" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2767 msgid "Open _Frame in New Tab" msgstr "Abrir _marco en una pestaña nueva" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:2984 #, c-format msgid "Open or download file from %s" msgstr "Abrir o descargar el archivo desde %s" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:2997 #, c-format msgid "File Name: %s" msgstr "Nombre de archivo: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3002 #, c-format msgid "File Type: '%s'" msgstr "Tipo de archivo: «%s»" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3004 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de archivo: %s («%s»)" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3041 #, c-format msgid "Size: %s" msgstr "Tamaño: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3052 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3581 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4101 #, c-format msgid "No documentation installed" msgstr "No hay documentación instalada" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4177 msgid "Midori doesn't store any personal data:" msgstr "Midori no almacena información personal:" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4178 msgid "No history or web cookies are being saved." msgstr "No se está almacenando ningún histórico o cookie web." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4179 msgid "Extensions are disabled." msgstr "Las extensiones están desactivadas." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4180 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "El almacenamento de HTML5, las bases de datos locales y las cachés de " "aplicación están desactivadas." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4181 msgid "Midori prevents websites from tracking the user:" msgstr "Midori evita que los sitios web rastreen al usuario:" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4182 msgid "Referrer URLs are stripped down to the hostname." msgstr "Las URL de referencia se reducen al nombre de equipo." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4183 msgid "DNS prefetching is disabled." msgstr "La prelectura de DNS está desactivada." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4184 msgid "The language and timezone are not revealed to websites." msgstr "El idioma y la zona horaria no son revelados a los sitios web." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4185 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "" "Flash y otros complementos Netscape no pueden ser mostrados por los sitios " "web." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4225 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "Los números en paréntesis corresponden a la versión que está usando en este " "momento." -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4275 msgid "Page loading delayed" msgstr "Carga de página retrasada" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4276 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "La carga se ha retrasado debido a un cuelgue reciente o a las preferencias " "de inicio" -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4277 msgid "Load Page" msgstr "Cargar página" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4444 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4658 msgid "_Duplicate Tab" msgstr "_Duplicar pestaña" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Label" msgstr "Mostrar títu_lo de la pestaña" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Icon Only" msgstr "Mostrar solo el _icono de la pestaña" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4670 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Cerrar la o_tra pestaña" msgstr[1] "Cerrar las o_tras pestañas" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5359 msgid "previous" msgstr "anterior" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5378 msgid "next" msgstr "siguiente" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5391 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5392 msgid "Whether background images should be printed" msgstr "Define si se deberían imprimir las imágenes de fondo" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5417 msgid "Features" msgstr "Características" @@ -1494,117 +1489,121 @@ msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Cuando Midori inicie:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Página de inicio:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Usar _página actual" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Usar la página actual como página de inicio" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Tipografías" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Familia tipográfica proporcional" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Tipo de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Tamaño de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Familia tipográfica de ancho fijo" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Tipo de letra utilizado para mostrar el texto de ancho fijo" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "Tamaño de letra utilizado para mostrar el texto de ancho fijo" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Tamaño mínimo de tipografía" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Tamaño mínimo de tipografía utilizado para mostrar texto" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Codificación preferida" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Cargar imágenes automáticamente" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Activar corrección ortográfica" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Activar scripts" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Habilitar soporte WebGL" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:389 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Activar complementos de Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:394 msgid "Zoom Text and Images" msgstr "Ampliar textos e imágenes" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:397 msgid "Allow scripts to open popups" msgstr "Permitir ventanas emergentes de scripts" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:398 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Configura si se permite que los scripts puedan abrir ventanas emergentes " "automáticamente" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:401 msgid "Middle click opens Selection" msgstr "Abrir la selección con pulsación central" -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:402 msgid "Load an address from the selection via middle click" msgstr "" "Cargar una dirección desde la selección a través del botón del medio del " "ratón" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:406 msgid "Flash window on background tabs" msgstr "Destellar ventana en pestañas en segundo plano" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:411 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:415 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1613,97 +1612,118 @@ "multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;" "q=0.667\"" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:417 msgid "Save downloaded files to:" msgstr "Guardar los archivos descargados en:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:424 msgid "Browsing" msgstr "Navegación" +#: ../midori/midori-preferences.c:428 +msgid "Toolbar Style:" +msgstr "Estilo de la barra de herramientas:" + +#: ../midori/midori-preferences.c:433 +msgid "Open new pages in:" +msgstr "Abrir las páginas nuevas en:" + #: ../midori/midori-preferences.c:437 +msgid "New tab behavior:" +msgstr "Comportamiento de pestaña nueva:" + +#: ../midori/midori-preferences.c:442 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:446 msgid "Always Show Tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:450 msgid "Open Tabs next to Current" msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:451 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o " "después de la última" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:454 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:458 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:463 msgid "News Aggregator" msgstr "Agregador de noticias" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:470 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:472 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:477 msgid "Hostname" msgstr "Nombre de host" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:485 msgid "Port" msgstr "Puerto" +#: ../midori/midori-preferences.c:498 +msgid "Supported proxy types:" +msgstr "Tipos de proxy soportados:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:518 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Caché web" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:519 ../midori/midori-preferences.c:522 msgid "The maximum size of cached pages on disk" msgstr "El tamaño máximo de páginas de caché en el disco" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:524 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:531 +msgid "Identify as" +msgstr "Identificar como" + +#: ../midori/midori-preferences.c:546 msgid "Privacy" msgstr "Privacidad" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:548 msgid "Delete old Cookies after:" msgstr "Eliminar cookies antiguas después de:" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:550 ../midori/midori-preferences.c:553 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de días para conservar las cookies" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:557 msgid "Only accept Cookies from sites you visit" msgstr "Solo aceptar cookies de los sitios que visite" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:558 msgid "Block cookies sent by third-party websites" msgstr "Bloquear cookies enviadas por sitios de terceros" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:563 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1711,33 +1731,33 @@ "Las cookies almacenan datos de inicio de sesión, juegos guardados o perfiles " "de usuario para fines publicitarios." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:570 msgid "Enable offline web application cache" msgstr "Activar caché local de aplicación web" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:573 msgid "Enable HTML5 local storage support" msgstr "Activar soporte de almacenamiento local HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:577 msgid "Strip referrer details sent to websites" msgstr "Franja de detalles referentes enviados a los sitios web" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:579 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Si se debe acortar la cabecera del \\ \"Referer\\ \"" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:582 msgid "Delete pages from history after:" msgstr "Eliminar páginas del histórico después de:" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:584 ../midori/midori-preferences.c:587 msgid "The maximum number of days to save the history for" msgstr "Número máximo de días para conservar el histórico" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:624 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Extensiones" @@ -1826,6 +1846,10 @@ msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." +#: ../midori/sokoke.c:561 +msgid "Invalid URI" +msgstr "URI inválido" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1847,28 +1871,28 @@ msgid "Close Findbar" msgstr "Cerrar la barra de búsqueda" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "El archivo '%s' ha sido descargado." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Transferencia completa" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Limpiar todo" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Se está descargando algunos archivos" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Cerrar Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Se cancelarán las descargas si Midori se cierra." @@ -1998,7 +2022,7 @@ msgid "Animation frames are broken" msgstr "Los cuadros de animación están rotos" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:422 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" @@ -2016,23 +2040,23 @@ msgid "None" msgstr "Ninguna" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:688 msgid "1 hour" msgstr "1 hora" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:689 msgid "1 day" msgstr "1 día" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:690 msgid "1 week" msgstr "1 semana" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:691 msgid "1 month" msgstr "1 mes" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "1 year" msgstr "1 año" @@ -2055,7 +2079,7 @@ msgid "Configure Advertisement filters" msgstr "Configurar los filtros de publicidad" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2065,27 +2089,27 @@ "texto y haga clic en \"Añadir\" para añadirlo a la lista. Puede encontrar " "más listas en %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Editar regla" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Regla:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Bl_oquear imagen" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Bl_oquear enlace" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Bloqueador de publicidad" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidad de acuerdo a una lista de filtros" @@ -2764,35 +2788,35 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "No hay ningún archivo de cerficado raíz disponible. Los certificados SSL no " "se pueden verificar." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:454 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:128 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:314 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." @@ -2801,46 +2825,46 @@ "repetidamente, pruebe una de las siguientes opciones para resolver el " "problema." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:324 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:328 msgid "Disable all _extensions" msgstr "Desactivar todas las _extensiones" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:337 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un dialogo después de que Midori se cuelgue" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:342 msgid "Discard old tabs" msgstr "Descartar las pestañas viejas" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:406 msgid "An instance of Midori is already running but not responding.\n" msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:439 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No se pudieron cargar los marcadores: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:470 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:478 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el histórico: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:489 msgid "The following errors occured:" msgstr "Ocurrieron los errores siguientes:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:494 msgid "_Ignore" msgstr "_Ignorar" @@ -3096,6 +3120,9 @@ msgid "Manage cookie permission per site" msgstr "Gestionar permisos de cookie por sitio" +#~ msgid "What to identify as to web pages" +#~ msgstr "Identificar como páginas web" + #~ msgid "Writing failed." #~ msgstr "Falló la escritura." @@ -3558,9 +3585,6 @@ #~ msgid "Failed to execute database statement\n" #~ msgstr "Fallo al ejecutar sentencia de base de datos\n" -#~ msgid "Show Blank page" -#~ msgstr "Mostrar página en blanco" - #~ msgid "All cookies" #~ msgstr "Todas las cookies" @@ -3832,9 +3856,6 @@ #~ msgid "Open _Link" #~ msgstr "Abrir en_lace" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Abrir imagen en nueve ve_ntana" - #~ msgid "View Selection Source" #~ msgstr "Ver código fuente de la selección" diff -Nru midori-0.4.9/po/fr.po midori-0.5.0/po/fr.po --- midori-0.4.9/po/fr.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/fr.po 2013-04-04 20:31:20.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: midori 0.2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-28 18:33+0000\n" +"POT-Creation-Date: 2013-03-27 07:12+0000\n" "PO-Revision-Date: 2012-12-07 14:55+0100\n" "Last-Translator: \n" "Language-Team: French \n" @@ -31,9 +31,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" @@ -45,11 +45,11 @@ msgid "New Private Browsing Window" msgstr "Nouvelle fenêtre de navigation privée" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "Nouvel onglet" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "Nouvelle fenêtre" @@ -65,7 +65,7 @@ msgid "Open a new private browsing window" msgstr "Ouvrir une nouvelle fenêtre (Navigation privée)" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Navigation privée" @@ -152,204 +152,209 @@ msgid "SECONDS" msgstr "SECONDES" -#: ../midori/main.c:155 -#, c-format +#: ../midori/main.c:147 msgid "Error: \"gdb\" can't be found\n" msgstr "Erreur : « gdb » est introuvable\n" -#: ../midori/main.c:181 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "" "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:183 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:338 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Une erreur inconnue est survenue." -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Action inattendue « %s »." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6116 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "Ajouter un s_ignet" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "_Extensions" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Historique" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "Styles utilisateur" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "Nouvel o_nglet" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "Greffons _Netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "Onglets _fermés" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5255 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "Nouveau dossier" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Format de signets inconnus." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5391 msgid "Go forward to the next page" msgstr "Aller à la page suivante" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5402 msgid "Go to the next sub-page" msgstr "Aller à la sous-page suivante" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5349 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5346 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Impossible de mettre à jour le titre : %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "La valeur « %s » n'est pas valide pour %s" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Action inattendue « %s »." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Navigation privée)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Signets" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Nouveau dossier" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Modifier le dossier" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Taper un nom pour ce signet et choisisser où le conserver." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "Ajouter à la page d'appel rapide" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "Afficher dans la _barre d'outils" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "Lancer comme une application _internet" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4498 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "sauver les _ressources associées" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "Une nouvelle fenêtre a été ouverte" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "Un nouvel onglet a été ouvert" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "Erreur pendant l'ouverture de l'image !" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "" "Impossible d'ouvrir l'image sélectionnée dans la visionneuse par défaut." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "Erreur lors du téléchargement de l'image !" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "Ne peut pas télécharger l'image sélectionnez." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Enregistrer le fichier" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -363,24 +368,24 @@ "de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous " "cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Nouveau flux" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5415 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3111 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Vide" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3493 ../midori/midori-browser.c:3494 msgid "Toggle text cursor navigation" msgstr "Activer ou désactiver la navigation au curseur" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3496 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -388,113 +393,113 @@ "Appuyer sur F7 permet de basculer à la navigation au curseur. Lorsqu'elle " "est activée, un curseur texte apparaît sur tous les sites." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3499 msgid "_Enable Caret Browsing" msgstr "Navigation au _curseur" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3915 ../midori/midori-browser.c:5863 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Impossible d'ajouter l'élément de l'historique : %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4329 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4330 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4331 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4332 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4333 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4334 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4335 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4353 msgid "Import bookmarks…" msgstr "Importer des signets…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4356 ../midori/midori-browser.c:5420 msgid "_Import bookmarks" msgstr "_Importer des signets" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4367 msgid "_Application:" msgstr "_Application :" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4432 msgid "Import from XBEL or HTML file" msgstr "Importer depuis un fichier XBEL ou HTML" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4460 msgid "Import from a file" msgstr "Importer depuis un fichier" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4472 msgid "Failed to import bookmarks" msgstr "Impossible d'importer les signets" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4503 msgid "XBEL Bookmarks" msgstr "Signets XBEL" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4508 msgid "Netscape Bookmarks" msgstr "Signets Netscape" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4522 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "" "Midori peut exporter uniquement vers les formats XBEL (*.xbel) et Netscape " "(*.html)." -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4537 msgid "Failed to export bookmarks" msgstr "Impossible d'exporter les signets" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4753 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4754 msgid "See about:version for version info." msgstr "" "Consultez about:version pour obtenir des informations à propos de la version " "de Midori." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4756 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -506,7 +511,7 @@ "que publiée par la Free Software Foundation; soit la version 2.1 de la " "licence ou, à votre choix, toutes versions ultérieures." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4791 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -516,374 +521,375 @@ "Jérôme Geulfucci \n" "Iliyas Jorio " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5253 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5256 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5259 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5261 msgid "New P_rivate Browsing Window" msgstr "Nouvelle fenêtre (Navigation _privée)" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5265 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5267 msgid "_Save Page As…" msgstr "_Sauvegarder la page sous…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5268 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5270 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5274 msgid "Create _Launcher" msgstr "Créer un _lanceur" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5277 msgid "Subscribe to News _feed" msgstr "Souscrire au flux de _nouvelles" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5283 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5284 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5286 msgid "C_lose Window" msgstr "Fer_mer la fenêtre" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5290 msgid "_Share" msgstr "Partager" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5291 msgid "Share this page" msgstr "Partager cette page" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5295 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5298 msgid "Close a_ll Windows" msgstr "Fermer _toutes les fenêtres" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5301 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5324 msgid "_Find…" msgstr "_Trouver" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5325 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5327 msgid "Find _Next" msgstr "Rechercher le sui_vant" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5330 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5334 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5336 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5337 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5342 msgid "Reload page without caching" msgstr "Actualiser la page sans mettre en cache" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5352 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5355 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5359 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5361 msgid "View So_urce" msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5364 msgid "Ca_ret Browsing" msgstr "Navigation au _curseur" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5368 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5370 msgid "Scroll _Left" msgstr "Défilement à _gauche" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5373 msgid "Scroll _Down" msgstr "Défilement en _bas" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5376 msgid "Scroll _Up" msgstr "Défilement en _haut" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5379 msgid "Scroll _Right" msgstr "Défilement à _droite" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5382 msgid "_Readable" msgstr "Lisible" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5385 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5388 msgid "Go back to the previous page" msgstr "Aller à la page précédente" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5395 msgid "Go to the previous sub-page" msgstr "Aller à la sous-page précédente" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5404 msgid "_Homepage" msgstr "Page d'a_ccueil" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5405 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5407 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5410 msgid "Undo _Close Tab" msgstr "A_nnuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5417 msgid "Add a new _folder" msgstr "Ajouter un nouveau _dossier" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5423 msgid "_Export bookmarks" msgstr "_Exporter des signets" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5426 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5429 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5432 msgid "_Inspect Page" msgstr "_Inspecter la page" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5436 msgid "_Previous Tab" msgstr "Onglet _précédent" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5439 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5441 msgid "Move Tab to _first position" msgstr "Déplacer l'onglet à la première position" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5443 msgid "Move Tab _Backward" msgstr "Déplacer l'onglet en _arrière" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5445 msgid "_Move Tab Forward" msgstr "_Déplacer l'onglet en avant" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5447 msgid "Move Tab to _last position" msgstr "Déplacer l'onglet à la dernière position" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5450 msgid "Focus _Current Tab" msgstr "Mettre le focus sur l'onglet _actuel" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5453 msgid "Focus _Next view" msgstr "Mettre le focus sur la vue _suivante" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5456 msgid "Only show the Icon of the _Current Tab" msgstr "Afficher uniquement l'icône de l'onglet _courant" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5459 msgid "_Duplicate Current Tab" msgstr "_Dupliquer l'onglet actif" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5462 msgid "Close Ot_her Tabs" msgstr "Fermer les _autres onglets" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5465 msgid "Open last _session" msgstr "Ouvrir la _dernière session" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5468 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5470 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5473 msgid "_Report a Problem…" msgstr "_Signaler un _problème" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5478 ../midori/midori-browser.c:6135 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5485 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5489 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5493 msgid "Side_panel" msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5494 msgid "Sidepanel" msgstr "Panneau latéral" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5497 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5501 msgid "_Statusbar" msgstr "Barre d'ét_at" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Chinois traditionnel (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Chinois simplifié (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5520 msgid "Japanese (SHIFT__JIS)" msgstr "Japonais (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5523 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Coréen (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5526 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5529 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5532 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5535 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Personnalisé…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6041 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6048 msgid "_Location…" msgstr "_Emplacement…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6050 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6072 msgid "_Web Search…" msgstr "Recherche _Internet…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6074 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6101 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6118 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6151 msgid "_Tabs" msgstr "O_nglets" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6153 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6167 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6169 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6934 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" @@ -946,24 +952,24 @@ msgid "Self-signed" msgstr "Auto-signé" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Détails de sécurité" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Coller et continue_r" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Non vérifié" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Connection sécurisée" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Ouvrir une connection sécurisée" @@ -980,419 +986,414 @@ msgid "Align sidepanel to the left" msgstr "Aligner le panneau latéral sur la gauche" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Montrer l'Appel rapide" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Afficher la page d'accueil" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Afficher les derniers onglets ouverts" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "Afficher les derniers onglets sans les charger" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Voir page blanche" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Voir le moteur de recherche par défaut" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Voir la page personnalisée" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Personnalisé…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Petites icônes" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Icônes et texte" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Texte à côté des icônes" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Automatique (GNOME ou de l'environnement)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Pas de serveur mandataire" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Style de la barre d'outils" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Au lancement de Midori :" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Ouvrir les nouvelles pages dans :" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "S'identifier comme" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Comment s'identifier sur les pages Internet" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Toujours utiliser les polices choisies" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "Forcer toute page web à utiliser les polices ci-dessus" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "La valeur « %s » n'est pas valide pour %s" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Impossible d'injecter feuille de style :%s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Faire confiance à ce site" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Sécurité inconnue" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s veut enregistrer une base de donnée HTML5." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Refuser" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Autoriser" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s veut connaître votre position" -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Erreur - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Réessayer" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Oups - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Quelque chose a mal tournél avec « %s »." + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Envoyer un message à %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "Inspecter l'élé_ment" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Ouvrir le lien en a_vant plan" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Ouvrir le lien en a_rrière plan" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Ouvrir le lien comme une appli_cation internet" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "Copier l'adre_sse du lien" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "_Sauvegarder sous…" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Ouvrir l'image dans une nouvelle fenêtre" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Ouvrir l'image dans un _nouvel onglet" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Copier l'im_age" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Enregistrer l'i_mage" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Ouvrir dans la _Visionneuse d'images" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Copier l'_adresse de la vidéo" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Enregistrer la _vidéo" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Télécharger la _vidéo" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Rechercher _avec" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Rechercher sur Internet" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Ouvrir le cadre dans un _nouvel onglet" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Ouvrir ou télécharger le fichier depuis %s" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Nom du fichier : %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Taille : %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "Midori ne stocke aucune donnée personnelle :" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Aucun historique ou cookie n'est enregistré." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Les extensions sont désactivées." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "Le stockage HTML5, la base de donnée locale et le cache de l'application " "sont désactivés." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Midori empêche les sites web de traquer l'utilisateur :" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "Les URL référantes sont réduites au nom d'hôte." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "Le DNS préchargé est désactivé." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "La langue et le fuseau horaire ne sont pas révélés aux sites web." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "" "Les sites web ne peuvent pas connaître les greffons Netscape (tels que " "Flash) installés." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "Les numéros de version entre parenthèses montrent la version que vous " "utilisez." -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Chargement de la page différé" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Chargement différé, soit en raison d'un incident récent soit des préférences " "de démarrage." -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Charger la page" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "_Dupliquer l'onglet" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "Afficher l'intitulé de l'onglet" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "Afficher l'icône de l'onglet uniquement" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Fermer l'_autre onglet" msgstr[1] "Fermer les _autres onglets" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "précedent" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "suivant" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Fonctionnalités" @@ -1495,118 +1496,122 @@ msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Au lancement de Midori :" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Utiliser la page _actuelle" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Polices" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Police proportionnelle" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "La police utilisée par défaut pour afficher les textes" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "La taille par défaut de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Police à largeur fixe" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "" "La taille de la police utilisée pour afficher les textes à largeur fixe" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "La taille minimale de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Encodage favori" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Activer la vérification de l'orthographe" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Activer le support WebGL" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Activer les greffons Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Autoriser les scripts à ouvrir des popups" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives " "(popups) automatiquement" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Un clic milieu ouvre la sélection" -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "" "Charger l'addresse de la sélection avec un clic du bouton central de la " "souris" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Clignoter en cas d'onglet en arrière-plan" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Langues préférés" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1615,98 +1620,119 @@ "pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;" "q=0.667\"" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Enregistrer les téléchargements dans :" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Style de la barre d'outils" + +#: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Ouvrir les nouvelles pages dans :" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Comportement du nouvel onglet :" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Boutons de fermeture sur les onglets" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'onglet actif" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actif ou " "après le dernier" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Agrégateur de flux" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Serveur mandataire" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Nom de l'hôte" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Port" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Types de proxy supportés :" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Cache internet" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "La taille maximale des pages mises en cache sur le disque" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "Mo" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "S'identifier comme" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Effacer les anciens cookies après :" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "" "Le nombre maximal de jours durant lesquels conserver les fichiers témoins" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "N'accepter les cookies que de sites que vous visitez" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Bloquer les cookies envoyés par des sites tiers" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1715,76 +1741,76 @@ "jeu ou des profils informations\n" " sur vous utilisées à des fins publicitaires." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Activer le cache d'applications web hors ligne" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Activer le support de stockage local de HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Raccourcir l'en-tête « Referer » envoyée aux sites" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "" "Si l'en-tête « Referer » (qui fournit des informations à propos de la page " "précédente où vous vous trouviez) doit être raccourcie au nom d'hôte" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Effacer les pages de l'historique après :" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Extensions" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresse :" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "_Identifiant :" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Par dé_faut" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" @@ -1829,9 +1855,14 @@ msgstr "Choisir une application ou une commande pour ouvrir \"%s\":" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Impossible de lancer le programme externe." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "URI invalide" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1853,28 +1884,28 @@ msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "Le fichier « %s » a été téléchargé." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Transfert terminé" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Effacer tout" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Des fichiers sont en cours de téléchargement" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Quitter Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Les transferts seront annulés si Midori se ferme." @@ -2004,47 +2035,47 @@ msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Choisissez un dossier" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "Aucun" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 heure" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 jour" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 semaine" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mois" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 an" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Préférences pour %s" @@ -2061,7 +2092,7 @@ msgid "Configure Advertisement filters" msgstr "Configurer les filtres de publicité" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2071,27 +2102,27 @@ "et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de " "listes à %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Modifier les règles" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Règles :" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "_Bloquer l'image" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "B_loquer le lien" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" @@ -2179,11 +2210,11 @@ msgid "Support for userscripts and userstyles" msgstr "Support des scripts et styles utilisateur" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Onglets colorés" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" @@ -2264,7 +2295,7 @@ "Fichiers témoins: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Nom" @@ -2508,68 +2539,68 @@ msgid "Failed to select suggestions\n" msgstr "Impossible de sélectionner les suggestions\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Ils n'y a pas d'onglets qui n'ont pas été visités" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Liste historique" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Comportement de la fermeture d'onglet" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Ne rien faire" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Basculer vers le dernier onglet vu" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Basculer vers l'onglet le plus récent" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "Nouvel onglet suivant (depuis l'historique)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "Onglet suivant dans l'historique" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "Nouvel onglet précédent (depuis l'historique)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "Onglet précédent dans l'historique" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "Afficher l'onglet en arrière-plan (liste de l'historique)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "Afficher les onglets sélectionnés en arrière-plan" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "Liste de l'historique des onglets" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "Aller au onglets utilisé quand on change ou ferme des onglets" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Mouvements de souris" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" @@ -2582,8 +2613,8 @@ msgstr "Personnaliser les raccourcis clavier" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." -msgstr "_Personnaliser les raccourcis…" +msgid "Customize Sh_ortcuts…" +msgstr "Personnaliser les racc_ourcis…" #: ../extensions/shortcuts.c:312 msgid "Shortcuts" @@ -2622,15 +2653,15 @@ msgstr "" "Activer et désactiver facilement des fonctionnalités sur les pages Internet" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Panneau d'onglets" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "P_anneau d'onglets" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Afficher les onglets dans un panneau vertical" @@ -2642,11 +2673,11 @@ msgid "New tabs have no label by default" msgstr "Les nouveaux onglets n'ont qu'une icône par défaut" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personnaliser la barre d'outils" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2654,23 +2685,23 @@ "Sélectionnez les éléments à afficher sur la barre d'outils.\n" "Ils peuvent être réorganisés par glisser-déposer." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Éléments disponibles" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Éléments affichés" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "Personnaliser la barre d'outi_ls…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Éditeur de barre d'outils" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "Éditer facilement la disposition de la barre d'outils" @@ -2721,7 +2752,7 @@ msgid "Open tabs" msgstr "Onglets ouverts" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Plus onglets ouverts..." @@ -2767,35 +2798,35 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pas pu être enregistrés. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Aucun fichier de certificat racine disponible. Les certificats SSL ne " "peuvent être vérifiés." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pas pu être chargée : %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2804,99 +2835,107 @@ "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/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Ignorer les derniers onglets" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Afficher le journal de la dernière panne" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "Exécuter dans _debugger" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Ignorer" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "SQL échoué : %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "Accepter" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "Accepter pour la session" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "Bloquer" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format msgid "Could not open database of extenstion: %s" msgstr "Impossible d'ouvrir la base de données des extensions : %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, c-format msgid "Failed to execute database statement: %s" msgstr "Impossible d'exécuter l'instruction de la base de données : %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Voulez-vous vraiment supprimer toutes les autorisations cookies?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Supprimer toutes les autorisations cookies?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." @@ -2904,20 +2943,20 @@ "Cette action permet de supprimer toutes les permissions cookies. Il vous " "sera demandé pour les permissions à nouveau pour chaque site Web visité." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Gestionnaire de permission de cookies" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "Instance du manager de permission cookie courant" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "Configurer la permission cookie" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2931,25 +2970,25 @@ "pour un domaine manuellement en entrant le nom de domaine ci-dessous, en " "choisissant la politique et en cliquant sur Ajouter." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "Domaine" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "Politique" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "Supprimer tous" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "Demander la politique si elle est inconnue pour un domaine" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." @@ -2957,128 +2996,136 @@ "Une erreur fatale s'est produite qui empêche l'extension gestionnaire de " "permission cookie de continuer. Vous devriez le désactiver." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "Erreur dans le extension du gestionnaire de cookie de permission" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "Raison" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "" "Impossible d'obtenir le chemin d'accès à la configuration d'extension : " "chemin est VIDE" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "Impossible d'obtenir le chemin d'accès à la configuration d'extension." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "Impossible de créer le dossier de configuration pour extension : %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "Impossible de créer le dossier de configuration pour extension." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 msgid "Could not open database of extension." msgstr "Impossible d'ouvrir la base de données des extensions." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "Impossible de configurer la structure de la base de données extension." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "" "Impossible de déterminer la politique cookie globale à définir pour le " "domaine : %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "Confirmer cookie de stockage" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "Jusqu'à fin de la session" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "Le sites Web %s veut stocker %d cookies." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "Le sites Web %s veut stocker un cookie." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "Plusieurs sites Web veulent stocker %d cookies au total." -#. Create expander for details -#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 -msgid "_Details" -msgstr "_Détails" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "_Accepter" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Accepter pour cette _session" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "De_nier" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "Refuser ce_tte fois" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 msgid "Path" msgstr "Chemin" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 msgid "Value" msgstr "Valeur" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 msgid "Expire date" msgstr "Date d'expiration" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" -msgstr "_Accepter" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "Accepter pour cette _session" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" -msgstr "De_nier" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "Instance d'extension" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "L'instance d'extension Midori pour cette extension" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "Instance d'application" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "L'instance de l'application Midori cette extension appartient à" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "Instance base de données" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "" "Pointer vers l'instance de base de données SQLite utilisée par cette " "extension" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "Chemin base de données" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "" +"Pointer vers l'instance de base de données SQLite utilisée par cette " +"extension" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "Interroger pour une politique inconnue" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 msgid "" "If true this extension ask for policy for every unknown domain.If false this " "extension uses the global cookie policy set in Midori settings." @@ -3087,7 +3134,7 @@ "Si faux cette extension utilise la politique cookie globale définie dans " "les paramètres midori." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "Indéterminé" @@ -3099,6 +3146,18 @@ msgid "Manage cookie permission per site" msgstr "gérer les permissions cookies par site" +#~ msgid "Custom..." +#~ msgstr "Personnalisé…" + +#~ msgid "Confirm storing cookie" +#~ msgstr "Confirmer cookie de stockage" + +#~ msgid "_Details" +#~ msgstr "_Détails" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Comment s'identifier sur les pages Internet" + #~ msgid "Writing failed." #~ msgstr "L'écriture a échoué." @@ -3222,9 +3281,6 @@ #~ msgid "The homepage" #~ msgstr "La page d'accueil" -#~ msgid "Show crash dialog" -#~ msgstr "Fenêtre de fermeture inattendue" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "Le dossier où enregistrer les fichiers téléchargés" diff -Nru midori-0.4.9/po/hr.po midori-0.5.0/po/hr.po --- midori-0.4.9/po/hr.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/hr.po 2013-04-04 20:31:20.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-24 07:33+0000\n" +"POT-Creation-Date: 2013-03-27 12:33+0000\n" "PO-Revision-Date: 2010-12-22 21:45+0100\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" @@ -26,9 +26,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:157 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3768 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" @@ -40,11 +40,11 @@ msgid "New Private Browsing Window" msgstr "Novi prozor privatnog pretraživanja" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "Nova kartica" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "Novi prozor" @@ -60,7 +60,7 @@ msgid "Open a new private browsing window" msgstr "Novi prozor privatnog pretraživanja" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4060 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr " (Privatno pretraživanje)" @@ -146,201 +146,207 @@ msgid "SECONDS" msgstr "SEKUNDE" -#: ../midori/main.c:176 +#: ../midori/main.c:147 +msgid "Error: \"gdb\" can't be found\n" +msgstr "" + +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Prijavite komentare,sugestije i probleme u:" -#: ../midori/main.c:178 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Provjeri za nove verzije na:" -#: ../midori/main.c:327 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Nepoznata greška" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Neočekivana radnja '%s'." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6116 msgid "_Bookmarks" msgstr "_Zabilješke" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "Dodaj za_bilješku" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "_Proširenja" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Povijest" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "_Korisničke skripte" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "Korisnički_stilovi" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "Nova _kartica" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "_Prijenosi" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "Netscape p_riključci" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5255 msgid "New _Window" msgstr "Novi _prozor" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "Nova _mapa" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[Adrese]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Datoteka nije pronađena." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Deformirani dokument." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Neprepoznati format zabilješke." -#: ../midori/midori-array.c:915 -msgid "Writing failed." -msgstr "Neuspjelo pisanje." - -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5391 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5402 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5349 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5346 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Neuspjeh u ažuriranju naslova: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Vrijednost '%s' nije valjana za %s" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Neočekivana radnja '%s'." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Privatno pretraživanje)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Zabilješke" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Ukucajte ima za ovu zabilješku i odaberite gdje će te je držati." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "Dodaj u _brzo biranje" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4498 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "Otvoren je novi prozor" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "Otvorena je nova kartica" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "Greška pri otvaranju slike!" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "Ne mogu otvoriti odabranu sliku u zadanom pregledniku." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "Greška pri preuzimanju slike!" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "Ne mogu preuzeti odabranu sliku." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -349,132 +355,132 @@ "automatically." msgstr "" -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5415 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3111 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Prazno" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3493 ../midori/midori-browser.c:3494 msgid "Toggle text cursor navigation" msgstr "" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3496 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." msgstr "" -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3499 msgid "_Enable Caret Browsing" msgstr "" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3915 ../midori/midori-browser.c:5863 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Otvori u novoj _kartici" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2680 -#: ../midori/midori-view.c:4530 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Otvori u novom _prozoru" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4329 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4330 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4331 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4332 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4333 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4334 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4335 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4353 msgid "Import bookmarks…" msgstr "Uvezi zabilješke..." -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4356 ../midori/midori-browser.c:5420 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4367 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4432 msgid "Import from XBEL or HTML file" msgstr "Uvezi iz XBEL ili HTML datoteke" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4460 msgid "Import from a file" msgstr "Uvezi iz datoteke" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4472 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4503 msgid "XBEL Bookmarks" msgstr "XBEL zabilješke" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4508 msgid "Netscape Bookmarks" msgstr "Netscape zabilješke" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4522 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "MIdori može izvesti samo u XBEL (*.xbel) i Netscape (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4537 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4753 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4754 msgid "See about:version for version info." msgstr "Vidi about:version za informacije o verziji" -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4756 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -482,378 +488,379 @@ "option) any later version." msgstr "" -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4791 msgid "translator-credits" msgstr "Ivica Kolić " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5253 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5256 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5259 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5261 msgid "New P_rivate Browsing Window" msgstr "Novi p_rozor privatnog pretraživanja" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5265 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5267 msgid "_Save Page As…" msgstr "_Spremi stranicu kao..." -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5268 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5270 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo _biranje" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5274 msgid "Create _Launcher" msgstr "Napravi _pokretač" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5277 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5283 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5284 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5286 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5290 msgid "_Share" msgstr "_Dijeli" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5291 msgid "Share this page" msgstr "Dijeli ovu stranicu" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5295 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5298 msgid "Close a_ll Windows" msgstr "Zatvori s_ve prozore" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5301 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5324 msgid "_Find…" msgstr "_Nađi..." -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5325 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5327 msgid "Find _Next" msgstr "Nađi _slijedeće" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5330 msgid "Find _Previous" msgstr "Nađi _prethodno" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5334 msgid "Configure the application preferences" msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5336 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5337 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5342 msgid "Reload page without caching" msgstr "" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5352 msgid "Increase the zoom level" msgstr "Povećaj zoom razinu" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5355 msgid "Decrease the zoom level" msgstr "Smanji zoom razinu" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5359 msgid "_Encoding" msgstr "_Kodiranje" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5361 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5364 msgid "Ca_ret Browsing" msgstr "" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5368 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5370 msgid "Scroll _Left" -msgstr "Kliži _Lijevo" +msgstr "Kliži _lijevo" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5373 msgid "Scroll _Down" -msgstr "Kliži _Dolje" +msgstr "Kliži _dolje" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5376 msgid "Scroll _Up" -msgstr "Kliži _Gore" +msgstr "Kliži _gore" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5379 msgid "Scroll _Right" -msgstr "Kližu _Desno" +msgstr "Kližu _desno" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5382 msgid "_Readable" msgstr "_Čitljivo" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5385 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5388 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5395 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5404 msgid "_Homepage" msgstr "_Početna stranica" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5405 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5407 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5410 msgid "Undo _Close Tab" msgstr "Poništi _zatvori karticu" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5417 msgid "Add a new _folder" msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5423 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5426 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Upravljaj tražilicama" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5429 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5432 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5436 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5439 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5441 msgid "Move Tab to _first position" msgstr "" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5443 msgid "Move Tab _Backward" msgstr "_Premjesti karticu unazad" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5445 msgid "_Move Tab Forward" msgstr "_Premjesti karticu naprijed" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5447 msgid "Move Tab to _last position" msgstr "" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5450 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5453 msgid "Focus _Next view" msgstr "" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5456 msgid "Only show the Icon of the _Current Tab" msgstr "Pokaži samo ikonu _trenutne kartice" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5459 msgid "_Duplicate Current Tab" msgstr "_Udvostruči trenutnu karticu" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5462 msgid "Close Ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5465 msgid "Open last _session" msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5468 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5470 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5473 msgid "_Report a Problem…" msgstr "_Prijavite problem..." -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5478 ../midori/midori-browser.c:6135 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5485 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5489 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5493 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5494 msgid "Sidepanel" msgstr "Bočni stupac" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5497 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5501 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Tradicionalni kineski (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Pojednostavljeni kineski (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5520 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5523 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5526 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5529 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5532 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5535 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Prilagođeno..." -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6041 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6048 msgid "_Location…" msgstr "_Lokacija..." -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6050 msgid "Open a particular location" msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6072 msgid "_Web Search…" msgstr "_Web pretraživanje..." -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6074 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6101 msgid "Reopen a previously closed tab or window" msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6118 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabilješke" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6151 msgid "_Tabs" msgstr "_Kartice" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6153 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6167 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6169 msgid "Menu" msgstr "Izbornik" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6934 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekivana postavka '%s'" @@ -912,24 +919,24 @@ msgid "Self-signed" msgstr "" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Sigurnosne pojedinosti" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Zalijepi i n_astavi" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Nije provjereno" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Provjerena i šifrirana veza" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "" @@ -946,388 +953,383 @@ msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Pokaži brzo biranje" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "Pokaži zadnje kartice bez učitavanja" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Pokaži praznu stranicu" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Pokaži zadanu tražilicu" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Pokaži prilagođenu stranicu" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Prilagođeno..." - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Zadano" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Tekst pored ikona" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Automatski (GNOME ili okruženje)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "HTTP proxy poslužitelj" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Nema proxy poslužitelja" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Stil alatne trake" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Kad se Midori pokrene:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Otvori nove stranice u:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Predstavi se kao" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Kako se predstaviti na web stranicama" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Uvijek koristi moj izbor fonta" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfiguracija ne može biti učitana: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Vrijednost '%s' nije valjana za %s" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neispravna konfiguracijska vrijednost '%s'" -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "" -#: ../midori/midori-view.c:730 ../midori/midori-view.c:874 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Vjeruj ovoj web stranici" -#: ../midori/midori-view.c:872 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Sigurnost nepoznata" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s želi spremiti HTML5 bazu podataka." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Uskrati" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Dopusti" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s želi znati vašu lokaciju." -#: ../midori/midori-view.c:1328 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Greška - %s" -#: ../midori/midori-view.c:1329 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stranica '%s' ne može biti učitana" -#: ../midori/midori-view.c:1331 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Pokušaj ponovo" -#: ../midori/midori-view.c:1535 ../midori/midori-view.c:2621 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Oops - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "" + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Pošalji poruku %s" -#: ../midori/midori-view.c:2409 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Dodaj _tražilicu..." -#: ../midori/midori-view.c:2452 ../midori/midori-view.c:2756 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:2504 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Otvori poveznicu u novoj _kartici" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Otvori poveznicu u _prednjoj kartici" -#: ../midori/midori-view.c:2509 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Otvori poveznicu u _pozadinskoj kartici" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Otvori poveznicu u novom _prozoru" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Otvori poveznicu kao web p_rogram" -#: ../midori/midori-view.c:2520 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "Kopiraj odredište po_veznice" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "Spremi _kao..." -#: ../midori/midori-view.c:2535 +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Otvori _sliku u novom _prozoru" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Otvori _sliku u novoj kartici" -#: ../midori/midori-view.c:2538 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Kopiraj sli_ku" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Sačuvaj s_liku" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Otvori u pregledniku _slika" -#: ../midori/midori-view.c:2551 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Kopiraj video _adresu" -#: ../midori/midori-view.c:2554 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Spremi _video" -#: ../midori/midori-view.c:2554 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Preuzmi _video" -#: ../midori/midori-view.c:2580 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Traži _pomoću" -#: ../midori/midori-view.c:2609 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Pretraži web" -#: ../midori/midori-view.c:2629 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj _kartici" -#: ../midori/midori-view.c:2676 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Otvori _okvir u novoj kartici" -#: ../midori/midori-view.c:2892 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Otvori ili preuzmi datoteku sa %s" -#: ../midori/midori-view.c:2905 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Ime datoteke: %s" -#: ../midori/midori-view.c:2910 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Tip datoteke: '%s'" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Tip datoteke: %s ('%s')" -#: ../midori/midori-view.c:2949 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Veličina: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2960 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:3985 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Dokumentacija nije instalirana" -#: ../midori/midori-view.c:4061 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" -msgstr "Midori ne pohranjuje osobne podatke" +msgstr "Midori ne pohranjuje osobne podatke:" -#: ../midori/midori-view.c:4062 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Ni povijest ni kolačići nisu spremljeni." -#: ../midori/midori-view.c:4063 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Proširenja su onemogućena." -#: ../midori/midori-view.c:4064 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" -#: ../midori/midori-view.c:4065 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Midovi sprečava web stranice da prate korisnika:" -#: ../midori/midori-view.c:4066 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "" -#: ../midori/midori-view.c:4067 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "Jezik i vremenska zona se ne otkrivaju web stranicama." -#: ../midori/midori-view.c:4069 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "Web stranice ne mogu izlistati Flash ili druge Netscape priključke." -#: ../midori/midori-view.c:4109 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "Brojevi verzije u zagradama prikazuju verziju korištenu pri pokretanju." -#: ../midori/midori-view.c:4153 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Odgođeno učitavanje stranice" -#: ../midori/midori-view.c:4154 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -#: ../midori/midori-view.c:4155 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Učitaj stranicu" -#: ../midori/midori-view.c:4320 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4534 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "_Udvostruči karticu" -#: ../midori/midori-view.c:4539 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "Pokaži oznaku _kartice" -#: ../midori/midori-view.c:4539 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "Prikaži samo _ikone kartice" -#: ../midori/midori-view.c:4546 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Zatvori dr_ugu karticu" @@ -1335,24 +1337,24 @@ msgstr[2] "Zatvori dr_uge kartice" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5235 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "prethodno" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5254 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "slijedeće" -#: ../midori/midori-view.c:5267 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:5268 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Obilježja" @@ -1456,215 +1458,232 @@ msgid "Startup" msgstr "Pokretanje" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Kad se Midori pokrene:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Početna stranica:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Koristi _trenutnu stranicu" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Koristi trenutnu stranicu kao početnu stranicu" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Fontovi" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Zadana obitelj fonta" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Zadana obitelj fonta koje se koristi za prikaz teksta" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Zadana veličina fonta za prikaz teksta" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Najmanja veličina fonta" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Najmanja veličina fonta korištena za prikaz teksta" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Željeno kodiranje" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Ponašanje" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Učitaj slike automatski" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Omogući provjeru pravopisa" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Omogući WebGL podršku " -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Omogući Netscape priključke" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" -#: ../midori/midori-preferences.c:403 -msgid "Kinetic scrolling" -msgstr "" - -#: ../midori/midori-preferences.c:404 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "" - -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Učitaj adresu iz odabira pomoću srednjeg klika" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Željeni jezici" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" #. Page "Interface" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Pretraživanje" +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Stil alatne trake:" + #: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Otvori nove stranice u:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Zatvori dugmad na karticama" -#: ../midori/midori-preferences.c:451 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Otvori kartice do trenutne" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "" #. Page "Network" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Mreža" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Proxy poslužitelj" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Ime računala" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Port" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:502 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "" -#: ../midori/midori-preferences.c:503 ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:528 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Predstavi se kao" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Privatnost" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Obriši stare kolačiće nakon:" -#: ../midori/midori-preferences.c:532 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Maksimalni broj dana za spremanje kolačića" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Prihvati kolačiće samo sa stranica koje ste posjetili" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Blokiraj kolačiće koje su poslale web stranice treće strane" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1672,74 +1691,74 @@ "Kolačići pohranjuju podatke o prijavi, spremljenim igrama, ili profile " "korisnika za promičbene svrhe." -#: ../midori/midori-preferences.c:552 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-preferences.c:555 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Omogući podršku za HTML5 lokalnu pohranu" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "" -#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Obriši stranice iz povijesti nakon:" -#: ../midori/midori-preferences.c:566 ../midori/midori-preferences.c:569 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Maksimalni broj dana za spremanje povijesti" -#: ../midori/midori-preferences.c:606 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Proširenja" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Dodaj tražilicu" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Uredi tražilicu" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Ime:" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Opis:" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Upravljaj tražilicama" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Koristi kao _zadano" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Tražilice ne nogu biti učitane: %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Tražilice ne mogu biti spremljene. %s" @@ -1784,9 +1803,14 @@ msgstr "Izaberite program ili naredbu za otvaranje \"%s\":" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Ne mogu pokrenuti vanjski program" +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1808,28 +1832,28 @@ msgid "Close Findbar" msgstr "" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "Datoteka '%s' je preuzeta." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Prijenos završen" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Očisti sve" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Neke datoteke su preuzete" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Isključi Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Prijenosi će biti odgođeni ako se Midori isključi" @@ -1960,47 +1984,47 @@ msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Svojstvo '%s' nije valjano za %s" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Izaberi datoteku" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Izaberi mapu" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "Nijedan" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 sat" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dan" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 tjedan" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mjesec" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 godina" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Osobitosti za %s" @@ -2017,34 +2041,34 @@ msgid "Configure Advertisement filters" msgstr "Konfiguriraj filtere oglašavanja" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " "\"Add\" to add it to the list. You can find more lists at %s." msgstr "" -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Uredi pravilo" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Pravilo:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Bl_okiraj sliku" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Bl_okiraj poveznicu" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Blokiraj oglašavanj sukladno sa listom filtera" @@ -2132,11 +2156,11 @@ msgid "Support for userscripts and userstyles" msgstr "Podrška za korisničke skripte i stilove" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Obojane kartice" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "" @@ -2217,7 +2241,7 @@ "Kolačići: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Ime" @@ -2448,68 +2472,68 @@ msgid "Failed to select suggestions\n" msgstr "Neuspjeli odabir prijedloga\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Nema neposjećenih kartica" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Lista povijesti" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Ponašanje zatvaranja kartica" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Ne čini ništa" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Prebaci na zadnju gledanu karticu" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Prebaci na najnoviju stranicu" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "Slijedeća nova kartica (lista povijesti)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "Slijedeća nova kartica iz povijesti" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "Prethodna nova kartica (lista povijesti)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "Prethodna nova kartica iz povijesti" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "Prikaži trenutno odabranu karticu u pozadini" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "Lista povijesti" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Kretnje mišem" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Kontroliraj Midori kretnjom miša" @@ -2522,7 +2546,7 @@ msgstr "Prilagodi kratice tipkovnice" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." +msgid "Customize Sh_ortcuts…" msgstr "Prilagodi kr_atice..." #: ../extensions/shortcuts.c:312 @@ -2561,15 +2585,15 @@ msgid "Easily toggle features on web pages on and off" msgstr "" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Kartica ploče" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "K_artica ploče" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Pokaži kartice u okomitoj ploči" @@ -2581,33 +2605,33 @@ msgid "New tabs have no label by default" msgstr "" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Prilagodi alatnu traku" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Dostupne stavke" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Prikazane stavke" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "_Prilagodi alatnu traku" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Uređivač alatne trake" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "Jednostavno uređivanje izgleda alatnih traka" @@ -2658,7 +2682,7 @@ msgid "Open tabs" msgstr "Otvori kartice" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "" @@ -2704,33 +2728,33 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Zabilješke ne mogu biti spremljene. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfiguracija ne može biti spremljena. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesija ne može biti učitana: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesija ne može biti spremljena. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Smeće ne može biti spremljeno. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2738,118 +2762,126 @@ "Izgleda da se Midori srušio zadnji put kad je bio otvoren.Ako se ovo događa " "učestalo,pokušajte jednu os slijedećih opcija da biste riješili problem." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "Izmjeni _osobitosti" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Onemogući sva _proširenja" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Pokaži dijalog nakon što se Midori sruši" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Odbaci stare kartice" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Pokaži zadnji dijalog _rušenja" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori instanca je već pokrenuta ali ne odgovara.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Zabilješke ne mogu biti učitane: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Smeće ne može biti učitano: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Povijest ne može biti učitana: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "Došlo je do slijedeće greške:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Ignoriraj" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "Prihvati " #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "Prihvati za sesiju" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format msgid "Could not open database of extenstion: %s" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, c-format msgid "Failed to execute database statement: %s" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Želite li zaista izbrisati sve dozvole kolačića?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Obriši sve dozvole kolačića?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Upravitelj dozvolama kolačića" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2858,147 +2890,158 @@ "the policy and clicking on Add." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "Izbriši _sve" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 msgid "Could not open database of extension." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 -msgid "Path" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 -msgid "Value" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Prihvati za ovu _sesiju" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 -msgid "Expire date" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" msgstr "" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 +msgid "Path" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "Prihvati za ovu _sesiju" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 +msgid "Value" +msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 +msgid "Expire date" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 msgid "" "If true this extension ask for policy for every unknown domain.If false this " -"extension uses the global cookie policy set in midori settings." +"extension uses the global cookie policy set in Midori settings." msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "" @@ -3010,6 +3053,15 @@ msgid "Manage cookie permission per site" msgstr "" +#~ msgid "Custom..." +#~ msgstr "Prilagođeno..." + +#~ msgid "Writing failed." +#~ msgstr "Neuspjelo pisanje." + +#~ msgid "What to identify as to web pages" +#~ msgstr "Kako se predstaviti na web stranicama" + #~ msgid "_Window" #~ msgstr "_Prozor" @@ -3115,9 +3167,6 @@ #~ msgid "The homepage" #~ msgstr "početna stranica" -#~ msgid "Show crash dialog" -#~ msgstr "Pokaži dijalog rušenja" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "Mapa preuzetih datoteka je spremljena u" @@ -3430,9 +3479,6 @@ #~ msgid "Quit the application" #~ msgstr "Isključi program" -#~ msgid "Show Blank page" -#~ msgstr "Pokaži praznu stranicu" - #~ msgid "Download with Download _Manager" #~ msgstr "Preuzimanje pomoću upravitelja _preuzimanjima" diff -Nru midori-0.4.9/po/hu.po midori-0.5.0/po/hu.po --- midori-0.4.9/po/hu.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/hu.po 2013-04-04 20:31:20.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-27 16:09+0000\n" +"POT-Creation-Date: 2013-03-15 00:57+0000\n" "PO-Revision-Date: 2012-11-20 00:59+0100\n" "Last-Translator: Imre Benedek \n" "Language-Team: Magyar \n" @@ -27,8 +27,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:138 ../midori/main.c:151 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 +#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:222 +#: ../midori/midori-view.c:3849 ../midori/sokoke.c:561 msgid "Midori" msgstr "Midori" @@ -40,11 +41,11 @@ msgid "New Private Browsing Window" msgstr "Új privát böngészési ablak megnyitása" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1268 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1287 msgid "New Tab" msgstr "Új lap" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1265 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1284 msgid "New Window" msgstr "Új ablak" @@ -60,284 +61,289 @@ msgid "Open a new private browsing window" msgstr "Új privát böngészési ablak megnyitása" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:3929 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4169 msgid "Private Browsing" msgstr "Privát böngészés" -#: ../midori/main.c:62 +#: ../midori/main.c:63 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Pillanatkép mentve ide: %s\n" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "Run ADDRESS as a web application" msgstr "A CÍM futtatása webalkalmazásként" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "ADDRESS" msgstr "CÍM" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "Use FOLDER as configuration folder" msgstr "A MAPPA használata konfigurációs mappaként" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "FOLDER" msgstr "MAPPA" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "Private browsing, no changes are saved" msgstr "Privát böngészés, nem lesznek mentve változtatások" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "Portable mode, all runtime files are stored in one place" msgstr "" "Hordozható mód, a futtatáshoz szükséges minden fájl egy helyen tárolódik" -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" msgstr "Egyszerű GTK+ ablak WebKit-tel, a GtkLauncher-hez hasonló" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "Show a diagnostic dialog" msgstr "Diagnosztikai ablak megjelenítése" -#: ../midori/main.c:101 +#: ../midori/main.c:104 +msgid "Run within gdb and save a backtrace on crash" +msgstr "" + +#: ../midori/main.c:106 msgid "Run the specified filename as javascript" msgstr "A megadott fájl futtatása javascriptként" -#: ../midori/main.c:103 +#: ../midori/main.c:108 msgid "Take a snapshot of the specified URI" msgstr "Pillanatkép készítése a megadott URI-ről" -#: ../midori/main.c:105 +#: ../midori/main.c:110 msgid "Execute the specified command" msgstr "A megadott parancs futtatása" -#: ../midori/main.c:107 +#: ../midori/main.c:112 msgid "List available commands to execute with -e/ --execute" msgstr "A -e/--execute segítségével végrehajtható parancsok felsorolása" -#: ../midori/main.c:109 +#: ../midori/main.c:114 msgid "Display program version" msgstr "A program verziójának megjelenítése" -#: ../midori/main.c:111 +#: ../midori/main.c:116 msgid "Addresses" msgstr "Címek" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "Block URIs according to regular expression PATTERN" msgstr "URI-címek blokkolása a MINTA reguláris kifejezés alapján" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "PATTERN" msgstr "MINTA" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "A Midori visszaállítása ennyi MÁSODPERC inaktivitás után" -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "SECONDS" msgstr "MÁSODPERC" -#: ../midori/main.c:152 +#: ../midori/main.c:155 +#, c-format +msgid "Error: \"gdb\" can't be found\n" +msgstr "Hiba: \"gdb\" nem található\n" + +#: ../midori/main.c:182 msgid "Please report comments, suggestions and bugs to:" msgstr "A megjegyzéseit, javaslatait és a hibákat ide küldje:" -#: ../midori/main.c:154 +#: ../midori/main.c:184 msgid "Check for new versions at:" msgstr "Új verziókért lásd:" -#: ../midori/main.c:299 +#: ../midori/main.c:339 msgid "An unknown error occured" msgstr "Ismeretlen hiba történt" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:524 +#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:540 #, c-format msgid "Unexpected action '%s'." msgstr "Váratlan művelet: „%s”." -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5999 +#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6041 msgid "_Bookmarks" msgstr "_Könyvjelzők" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1351 msgid "Add Boo_kmark" msgstr "Köny_vjelző hozzáadása" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1352 msgid "_Extensions" msgstr "Kit_erjesztések" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Előzmények" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1354 msgid "_Userscripts" msgstr "_Felhasználói parancsfájlok" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1355 msgid "User_styles" msgstr "Felhasználói _stílusok" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1356 msgid "New _Tab" msgstr "Új _lap" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1357 msgid "_Transfers" msgstr "Á_tvitelek" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1358 msgid "Netscape p_lugins" msgstr "_Netscape bővítmények" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1359 msgid "_Closed Tabs" msgstr "_Bezárt lapok" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5138 +#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5180 msgid "New _Window" msgstr "Új _ablak" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1361 msgid "New _Folder" msgstr "Új _mappa" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419 +#: ../midori/midori-app.c:1422 msgid "[Addresses]" msgstr "[Címek]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:524 msgid "File not found." msgstr "A fájl nem található." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:549 ../midori/midori-array.c:588 +#: ../midori/midori-array.c:612 ../midori/midori-array.c:622 msgid "Malformed document." msgstr "Rosszul formált dokumentum." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:631 msgid "Unrecognized bookmark format." msgstr "Ismeretlen könyvjelzőformátum." -#: ../midori/midori-array.c:915 -msgid "Writing failed." -msgstr "Az írás meghiúsult." - -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5316 msgid "Go forward to the next page" msgstr "Ugrás a következő oldalra" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5282 -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5327 msgid "Go to the next sub-page" msgstr "Ugrás a következő aloldalra" -#: ../midori/midori-browser.c:431 ../midori/midori-browser.c:5223 -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5274 msgid "Reload the current page" msgstr "Az aktuális oldal újratöltése" -#: ../midori/midori-browser.c:439 ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5271 msgid "Stop loading the current page" msgstr "Az aktuális oldal betöltésének leállítása" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "A cím frissítése meghiúsult: %s\n" -#: ../midori/midori-browser.c:604 +#: ../midori/midori-browser.c:616 #, c-format msgid "%s (Private Browsing)" msgstr "%s (privát böngészés)" -#: ../midori/midori-browser.c:714 ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:726 ../midori/midori-browser.c:768 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Könyvjelzők" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:822 msgid "New folder" msgstr "Új mappa" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:822 msgid "Edit folder" msgstr "Mappa szerkesztése" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:824 msgid "New bookmark" msgstr "Új könyvjelző" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:824 msgid "Edit bookmark" msgstr "Könyvjelző szerkesztése" -#: ../midori/midori-browser.c:846 +#: ../midori/midori-browser.c:858 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Adjon nevet a könyvjelzőnek, és válassza ki hol tárolódjon." -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:914 msgid "Add to _Speed Dial" msgstr "Felvétel a _gyorstárcsázásba" -#: ../midori/midori-browser.c:908 +#: ../midori/midori-browser.c:920 msgid "Show in the tool_bar" msgstr "M_egjelenítés az eszköztáron" -#: ../midori/midori-browser.c:916 +#: ../midori/midori-browser.c:928 msgid "Run as _web application" msgstr "_Futtatás webalkalmazásként" -#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4396 +#: ../midori/midori-browser.c:1044 ../midori/midori-browser.c:4423 msgid "Save file as" msgstr "Fájl mentése másként" -#: ../midori/midori-browser.c:1036 +#: ../midori/midori-browser.c:1054 msgid "Save associated _resources" msgstr "Társított e_rőforrások mentése" -#: ../midori/midori-browser.c:1265 +#: ../midori/midori-browser.c:1284 msgid "A new window has been opened" msgstr "Új ablak nyílt meg" -#: ../midori/midori-browser.c:1268 +#: ../midori/midori-browser.c:1287 msgid "A new tab has been opened" msgstr "Új lap nyílt meg" -#: ../midori/midori-browser.c:1285 +#: ../midori/midori-browser.c:1305 msgid "Error opening the image!" msgstr "Hiba a kép megnyitásakor" -#: ../midori/midori-browser.c:1286 +#: ../midori/midori-browser.c:1306 msgid "Can not open selected image in a default viewer." msgstr "Nem nyitható meg a kiválasztott kép az alapértelmezett megjelenítőben." -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1312 msgid "Error downloading the image!" msgstr "Hiba a kép letöltésekor" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1313 msgid "Can not download selected image." msgstr "A kijelölt kép nem tölthető le." -#: ../midori/midori-browser.c:1350 +#: ../midori/midori-browser.c:1372 msgid "Save file" msgstr "Fájl mentése" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2344 msgid "Open file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:2444 +#: ../midori/midori-browser.c:2472 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -352,24 +358,24 @@ "válasszon egy hírforrásolvasót. A hírforrások ikonjára kattintva ezután az " "automatikusan felvételre kerül." -#: ../midori/midori-browser.c:2450 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2478 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Új hírforrás" -#: ../midori/midori-browser.c:2493 ../midori/midori-browser.c:5298 +#: ../midori/midori-browser.c:2510 ../midori/midori-browser.c:5340 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Új könyvjelző hozzáadása" -#: ../midori/midori-browser.c:3017 ../midori/midori-searchaction.c:481 +#: ../midori/midori-browser.c:3036 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Üres" -#: ../midori/midori-browser.c:3412 ../midori/midori-browser.c:3413 +#: ../midori/midori-browser.c:3418 ../midori/midori-browser.c:3419 msgid "Toggle text cursor navigation" msgstr "Kurzoros szövegnavigáció átváltása" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3421 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -377,110 +383,110 @@ "Az F7 megnyomása ki/bekapcsolja a kurzoros böngészést. Ha ez aktív, szöveges " "kurzor jelenik meg minden weboldalon." -#: ../midori/midori-browser.c:3418 +#: ../midori/midori-browser.c:3424 msgid "_Enable Caret Browsing" msgstr "_Kurzoros böngészés bekapcsolása" -#: ../midori/midori-browser.c:3802 ../midori/midori-browser.c:5746 +#: ../midori/midori-browser.c:3840 ../midori/midori-browser.c:5788 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Az új előzményelem beszúrása meghiúsult: %s\n" -#: ../midori/midori-browser.c:4128 ../panels/midori-bookmarks.c:840 -#: ../panels/midori-history.c:797 +#: ../midori/midori-browser.c:4155 ../panels/midori-bookmarks.c:835 +#: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Összes _megnyitása lapokon" -#: ../midori/midori-browser.c:4135 ../panels/midori-bookmarks.c:846 -#: ../panels/midori-history.c:803 ../extensions/feed-panel/feed-panel.c:519 +#: ../midori/midori-browser.c:4162 ../panels/midori-bookmarks.c:841 +#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Megnyi_tás új lapon" -#: ../midori/midori-browser.c:4138 ../midori/midori-view.c:2637 -#: ../midori/midori-view.c:4435 ../panels/midori-bookmarks.c:848 -#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:521 +#: ../midori/midori-browser.c:4165 ../midori/midori-view.c:2765 +#: ../midori/midori-view.c:4647 ../panels/midori-bookmarks.c:843 +#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Megnyitás új _ablakban" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:4254 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4228 +#: ../midori/midori-browser.c:4255 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4229 +#: ../midori/midori-browser.c:4256 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4257 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4231 +#: ../midori/midori-browser.c:4258 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:4259 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4233 +#: ../midori/midori-browser.c:4260 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4251 +#: ../midori/midori-browser.c:4278 msgid "Import bookmarks…" msgstr "Könyvjelzők importálása…" -#: ../midori/midori-browser.c:4254 ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:4281 ../midori/midori-browser.c:5345 msgid "_Import bookmarks" msgstr "_Könyvjelzők importálása" -#: ../midori/midori-browser.c:4265 +#: ../midori/midori-browser.c:4292 msgid "_Application:" msgstr "_Alkalmazás:" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4357 msgid "Import from XBEL or HTML file" msgstr "Importálás XBEL vagy HTML fájlból" -#: ../midori/midori-browser.c:4358 +#: ../midori/midori-browser.c:4385 msgid "Import from a file" msgstr "Importálás fájlból" -#: ../midori/midori-browser.c:4370 +#: ../midori/midori-browser.c:4397 msgid "Failed to import bookmarks" msgstr "A könyvjelzők importálása sikertelen" -#: ../midori/midori-browser.c:4401 +#: ../midori/midori-browser.c:4428 msgid "XBEL Bookmarks" msgstr "XBEL-könyvjelzők" -#: ../midori/midori-browser.c:4406 +#: ../midori/midori-browser.c:4433 msgid "Netscape Bookmarks" msgstr "Netscape könyvjelzők" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4447 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "" "A Midori csak XBEL (*.xbel) és Netscape (*.html) formátumba tud exportálni" -#: ../midori/midori-browser.c:4435 +#: ../midori/midori-browser.c:4462 msgid "Failed to export bookmarks" msgstr "A könyvjelzők exportálása sikertelen" -#: ../midori/midori-browser.c:4656 +#: ../midori/midori-browser.c:4678 msgid "A lightweight web browser." msgstr "Könnyűsúlyú webböngésző." -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4679 msgid "See about:version for version info." msgstr "Verzióinformációkért lásd az about:version oldalt." -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4681 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -491,380 +497,380 @@ "Foundation által kiadott GNU Lesser General Public License 2.1 (vagy bármely " "későbbi) változatában foglaltak alapján." -#: ../midori/midori-browser.c:4689 +#: ../midori/midori-browser.c:4716 msgid "translator-credits" msgstr "" "Benedek Imre \n" "Kelemen Gábor " -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5178 msgid "_File" msgstr "_Fájl" -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:5181 msgid "Open a new window" msgstr "Új ablak megnyitása" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5184 msgid "Open a new tab" msgstr "Új lap megnyitása" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5186 msgid "New P_rivate Browsing Window" msgstr "Új _privát böngészési ablak megnyitása" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:5190 msgid "Open a file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:5150 +#: ../midori/midori-browser.c:5192 msgid "_Save Page As…" msgstr "Oldal _mentése másként…" -#: ../midori/midori-browser.c:5151 +#: ../midori/midori-browser.c:5193 msgid "Save to a file" msgstr "Mentés fájlba" -#: ../midori/midori-browser.c:5153 +#: ../midori/midori-browser.c:5195 msgid "Add to Speed _dial" msgstr "Hozzáadás _gyorstárcsázáshoz" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5199 msgid "Create _Launcher" msgstr "_Parancsikon létrehozása" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5202 msgid "Subscribe to News _feed" msgstr "_Feliratkozás hírforrásra" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5208 msgid "_Close Tab" msgstr "Lap _bezárása" -#: ../midori/midori-browser.c:5167 +#: ../midori/midori-browser.c:5209 msgid "Close the current tab" msgstr "A jelenlegi lap bezárása" -#: ../midori/midori-browser.c:5169 +#: ../midori/midori-browser.c:5211 msgid "C_lose Window" msgstr "_Ablak bezárása" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5215 msgid "_Share" msgstr "_Megosztás" -#: ../midori/midori-browser.c:5174 +#: ../midori/midori-browser.c:5216 msgid "Share this page" msgstr "Az oldal megosztása" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:5220 msgid "Print the current page" msgstr "A jelenlegi oldal nyomtatása" -#: ../midori/midori-browser.c:5181 +#: ../midori/midori-browser.c:5223 msgid "Close a_ll Windows" msgstr "Minden _ablak bezárása" -#: ../midori/midori-browser.c:5184 +#: ../midori/midori-browser.c:5226 msgid "_Edit" msgstr "S_zerkesztés" -#: ../midori/midori-browser.c:5207 +#: ../midori/midori-browser.c:5249 msgid "_Find…" msgstr "_Keresés…" -#: ../midori/midori-browser.c:5208 +#: ../midori/midori-browser.c:5250 msgid "Find a word or phrase in the page" msgstr "Szó vagy kifejezés keresése az oldalon" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:5252 msgid "Find _Next" msgstr "_Következő találat" -#: ../midori/midori-browser.c:5213 +#: ../midori/midori-browser.c:5255 msgid "Find _Previous" msgstr "_Előző találat" -#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:5259 msgid "Configure the application preferences" msgstr "Az alkalmazás beállításainak megadása" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5261 msgid "_View" msgstr "_Nézet" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5262 msgid "_Toolbars" msgstr "_Eszköztárak" -#: ../midori/midori-browser.c:5225 +#: ../midori/midori-browser.c:5267 msgid "Reload page without caching" msgstr "Oldal újratöltése gyorsítótárazás nélkül" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5277 msgid "Increase the zoom level" msgstr "Nagyítási szint növelése" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5280 msgid "Decrease the zoom level" msgstr "Nagyítási szint csökkentése" -#: ../midori/midori-browser.c:5242 +#: ../midori/midori-browser.c:5284 msgid "_Encoding" msgstr "_Kódolás" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5286 msgid "View So_urce" msgstr "_Forrás megjelenítése" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5289 msgid "Ca_ret Browsing" msgstr "_Kurzoros böngészés" -#: ../midori/midori-browser.c:5251 +#: ../midori/midori-browser.c:5293 msgid "Toggle fullscreen view" msgstr "Teljes képernyős nézet be- illetve kikapcsolása" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5295 msgid "Scroll _Left" msgstr "Görgetés _balra" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5298 msgid "Scroll _Down" msgstr "Görgetés l_e" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5301 msgid "Scroll _Up" msgstr "Görgetés _fel" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5304 msgid "Scroll _Right" msgstr "Görgetés j_obbra" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5307 msgid "_Readable" msgstr "_Olvasható" -#: ../midori/midori-browser.c:5268 +#: ../midori/midori-browser.c:5310 msgid "_Go" msgstr "_Ugrás" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:5313 msgid "Go back to the previous page" msgstr "Ugrás az előző oldalra" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:5320 msgid "Go to the previous sub-page" msgstr "Ugrás az előző aloldalra" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5329 msgid "_Homepage" msgstr "Kez_dőlap" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5330 msgid "Go to your homepage" msgstr "Ugrás a kezdőlapra" -#: ../midori/midori-browser.c:5290 +#: ../midori/midori-browser.c:5332 msgid "Empty Trash" msgstr "Kuka ürítése" -#: ../midori/midori-browser.c:5293 +#: ../midori/midori-browser.c:5335 msgid "Undo _Close Tab" msgstr "Lapbezárás _visszavonása" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5342 msgid "Add a new _folder" msgstr "Új mappa _hozzáadása" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5348 msgid "_Export bookmarks" msgstr "Könyvjelzők e_xportálása" -#: ../midori/midori-browser.c:5309 ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5351 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Keresőszolgáltatások kezelése" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5354 msgid "_Clear Private Data" msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5357 msgid "_Inspect Page" msgstr "_Oldal vizsgálata" -#: ../midori/midori-browser.c:5319 +#: ../midori/midori-browser.c:5361 msgid "_Previous Tab" msgstr "_Előző lap" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5364 msgid "_Next Tab" msgstr "_Következő lap" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5366 msgid "Move Tab to _first position" msgstr "Lap _első pozícióba mozgatása" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:5368 msgid "Move Tab _Backward" msgstr "Lap mozgatása _hátra" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:5370 msgid "_Move Tab Forward" msgstr "Lap mozgatása _előre" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5372 msgid "Move Tab to _last position" msgstr "Lap _utolsó pozícióba mozgatása" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:5375 msgid "Focus _Current Tab" msgstr "_Aktuális lap előtérbe" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5378 msgid "Focus _Next view" msgstr "_Következő nézet előtérbe" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5381 msgid "Only show the Icon of the _Current Tab" msgstr "Csak _a jelenlegi lap ikonjának megjelenítése" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5384 msgid "_Duplicate Current Tab" msgstr "Jelenlegi lap _kettőzése" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5387 msgid "Close Ot_her Tabs" msgstr "_Többi lap bezárása" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5390 msgid "Open last _session" msgstr "_Utolsó munkamenet megnyitása" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:5393 msgid "_Help" msgstr "_Súgó" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5395 msgid "_Frequent Questions" msgstr "_Gyakori kérdések" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5398 msgid "_Report a Problem…" msgstr "_Hiba jelentése…" -#: ../midori/midori-browser.c:5361 ../midori/midori-browser.c:6018 +#: ../midori/midori-browser.c:5403 ../midori/midori-browser.c:6060 msgid "_Tools" msgstr "_Eszközök" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5410 msgid "_Menubar" msgstr "_Menüsáv" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5414 msgid "_Navigationbar" msgstr "_Navigációs sáv" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5418 msgid "Side_panel" msgstr "_Oldalsáv" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5419 msgid "Sidepanel" msgstr "Oldalsáv" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5422 msgid "_Bookmarkbar" msgstr "_Könyvjelzősáv" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5426 msgid "_Statusbar" msgstr "Á_llapotsor" -#: ../midori/midori-browser.c:5393 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:221 msgid "_Automatic" msgstr "_Automatikus" -#: ../midori/midori-browser.c:5396 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:145 msgid "Chinese Traditional (BIG5)" msgstr "Kínai ‒ hagyományos (BIG5)" -#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:146 msgid "Chinese Simplified (GB18030)" msgstr "Kínai ‒ egyszerűsített (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5445 msgid "Japanese (SHIFT__JIS)" msgstr "Japán (SHIFT__JIS)" -#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:148 msgid "Korean (EUC-KR)" msgstr "Koreai (EUC-KR)" -#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Orosz (KOI8-R)" -#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5454 ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5457 ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Nyugati (ISO-8859-1)" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5460 msgid "Custom…" msgstr "Egyéni…" -#: ../midori/midori-browser.c:5924 +#: ../midori/midori-browser.c:5966 msgid "_Separator" msgstr "_Elválasztó" -#: ../midori/midori-browser.c:5931 +#: ../midori/midori-browser.c:5973 msgid "_Location…" msgstr "He_ly…" -#: ../midori/midori-browser.c:5933 +#: ../midori/midori-browser.c:5975 msgid "Open a particular location" msgstr "Adott hely megnyitása" -#: ../midori/midori-browser.c:5955 +#: ../midori/midori-browser.c:5997 msgid "_Web Search…" msgstr "_Webkeresés…" -#: ../midori/midori-browser.c:5957 +#: ../midori/midori-browser.c:5999 msgid "Run a web search" msgstr "Webkeresés futtatása " -#: ../midori/midori-browser.c:5984 +#: ../midori/midori-browser.c:6026 msgid "Reopen a previously closed tab or window" msgstr "Korábban bezárt lap vagy ablak ismételt megnyitása" -#: ../midori/midori-browser.c:6001 +#: ../midori/midori-browser.c:6043 msgid "Show the saved bookmarks" msgstr "A mentett könyvjelzők megjelenítése" -#: ../midori/midori-browser.c:6034 -msgid "_Window" -msgstr "_Ablak" +#: ../midori/midori-browser.c:6076 +msgid "_Tabs" +msgstr "_Lapok" -#: ../midori/midori-browser.c:6036 +#: ../midori/midori-browser.c:6078 msgid "Show a list of all open tabs" msgstr "Az összes megnyitott lap listájának megjelenítése" -#: ../midori/midori-browser.c:6050 +#: ../midori/midori-browser.c:6092 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6052 +#: ../midori/midori-browser.c:6094 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:6832 +#: ../midori/midori-browser.c:6863 #, c-format msgid "Unexpected setting '%s'" msgstr "Váratlan beállítás: „%s”" @@ -918,32 +924,32 @@ msgid "Some other error occurred validating the certificate." msgstr "Valamilyen más hiba történt a tanúsítvány érvényesítésekor." -#: ../midori/midori-locationaction.c:1419 +#: ../midori/midori-locationaction.c:1420 msgid "_Export certificate" msgstr "Tanúsítvány _exportálása" -#: ../midori/midori-locationaction.c:1434 +#: ../midori/midori-locationaction.c:1435 msgid "Self-signed" msgstr "Önaláírt" -#: ../midori/midori-locationaction.c:1468 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Biztonsági részletek" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1555 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Beillesztés és _folytatás" -#: ../midori/midori-locationaction.c:1787 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Nem ellenőrzött" -#: ../midori/midori-locationaction.c:1795 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Ellenőrzött és titkosított kapcsolat" -#: ../midori/midori-locationaction.c:1802 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Nyílt, titkosítás nélküli kapcsolat" @@ -960,440 +966,435 @@ msgid "Align sidepanel to the left" msgstr "Az oldalsáv balra igazítása" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:108 ../midori/midori-websettings.c:129 msgid "Show Speed Dial" msgstr "Gyorstárcsázó megjelenítése" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:109 ../midori/midori-websettings.c:127 msgid "Show Homepage" msgstr "Kezdőlap megjelenítése" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:339 +#: ../midori/midori-websettings.c:110 ../midori/midori-frontend.c:344 msgid "Show last open tabs" msgstr "A legutóbbi lapok megjelenítése" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:338 +#: ../midori/midori-websettings.c:111 ../midori/midori-frontend.c:343 msgid "Show last tabs without loading" msgstr "A legutóbbi lapok megjelenítése betöltés nélkül" #: ../midori/midori-websettings.c:126 +msgid "Show Blank Page" +msgstr "Üres oldal megjelenítése" + +#: ../midori/midori-websettings.c:128 +msgid "Show default Search Engine" +msgstr "Alapértelmezett keresőszolgáltatás megjelenítése" + +#: ../midori/midori-websettings.c:130 +msgid "Show custom page" +msgstr "Egyéni oldal megjelenítése" + +#: ../midori/midori-websettings.c:147 msgid "Japanese (SHIFT_JIS)" msgstr "Japán (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:152 ../midori/midori-websettings.c:228 #: ../katze/katze-utils.c:603 msgid "Custom..." msgstr "Egyéni…" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Új lap" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Új ablak" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Aktuális lap" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Alapértelmezett" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Ikonok" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:186 msgid "Small icons" msgstr "Kis ikonok" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Szöveg" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:188 msgid "Icons and text" msgstr "Ikonok és szöveg" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:189 msgid "Text beside icons" msgstr "Szöveg az ikonok mellett" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:204 msgid "Automatic (GNOME or environment)" msgstr "Automatikus (GNOME vagy környezet)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:205 msgid "HTTP proxy server" msgstr "HTTP proxykiszolgáló" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:206 msgid "No proxy server" msgstr "Nincs proxykiszolgáló" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:223 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:224 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:225 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:226 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:227 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Eszköztár stílusa:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:302 msgid "The style of the toolbar" msgstr "Az eszköztár stílusa" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "A Midori indulásakor:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Új oldalak megnyitása:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Azonosítás mint" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Miként mutatkozzon be a weboldalaknak" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:504 msgid "Always use my font choices" msgstr "Mindig a saját betűkészletek használata" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:505 msgid "Override fonts picked by websites with user preferences" msgstr "" "A weboldalak által választott betűkészletek felülbírálása felhasználói " "beállításokkal" -#: ../midori/midori-websettings.c:1305 ../midori/midori-websettings.c:1311 +#: ../midori/midori-websettings.c:1369 ../midori/midori-websettings.c:1375 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A beállítások nem tölthetők be: %s\n" -#: ../midori/midori-websettings.c:1360 +#: ../midori/midori-websettings.c:1424 #, c-format msgid "Value '%s' is invalid for %s" msgstr "A(z) „%s” érték érvénytelen ehhez: %s" -#: ../midori/midori-websettings.c:1365 ../midori/midori-websettings.c:1476 +#: ../midori/midori-websettings.c:1429 ../midori/midori-websettings.c:1540 #, c-format msgid "Invalid configuration value '%s'" msgstr "Érvénytelen beállításérték: „%s”" -#: ../midori/midori-tab.vala:117 +#: ../midori/midori-tab.vala:118 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "A stíluslap beillesztése meghiúsult: %s" -#: ../midori/midori-view.c:725 ../midori/midori-view.c:866 +#: ../midori/midori-view.c:767 ../midori/midori-view.c:895 msgid "Trust this website" msgstr "Ez a weboldal megbízható" -#: ../midori/midori-view.c:864 +#: ../midori/midori-view.c:893 msgid "Security unknown" msgstr "Ismeretlen biztonság" -#: ../midori/midori-view.c:1162 +#: ../midori/midori-view.c:1194 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s HTML5 adatbázist szeretne menteni." -#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Deny" msgstr "_Megtagadás" -#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Allow" msgstr "_Engedélyezés" -#: ../midori/midori-view.c:1194 +#: ../midori/midori-view.c:1226 #, c-format msgid "%s wants to know your location." msgstr "%s tudni szeretné az Ön tartózkodási helyét." -#: ../midori/midori-view.c:1305 +#: ../midori/midori-view.c:1357 #, c-format msgid "Error - %s" msgstr "Hiba - %s" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1358 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A(z) „%s” oldal nem tölthető be." -#: ../midori/midori-view.c:1308 +#: ../midori/midori-view.c:1360 msgid "Try again" msgstr "Próbálja újra" -#: ../midori/midori-view.c:1507 ../midori/midori-view.c:2578 +#: ../midori/midori-view.c:1620 ../midori/midori-view.c:2706 #, c-format msgid "Send a message to %s" msgstr "Üzenet küldése a következőnek: %s" -#: ../midori/midori-view.c:2362 +#: ../midori/midori-view.c:2494 msgid "Add _search engine..." msgstr "Keresőszolgáltatás h_ozzáadása…" -#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2713 +#: ../midori/midori-view.c:2537 ../midori/midori-view.c:2841 msgid "Inspect _Element" msgstr "Elem _vizsgálata" -#: ../midori/midori-view.c:2457 +#: ../midori/midori-view.c:2589 msgid "Open Link in New _Tab" msgstr "Hivatkozás megnyitása új _lapon" -#: ../midori/midori-view.c:2461 +#: ../midori/midori-view.c:2593 msgid "Open Link in _Foreground Tab" msgstr "Hi_vatkozás megnyitása az előtérben lévő lapon" -#: ../midori/midori-view.c:2462 +#: ../midori/midori-view.c:2594 msgid "Open Link in _Background Tab" msgstr "_Hivatkozás megnyitása a háttérben lévő lapon" -#: ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2597 msgid "Open Link in New _Window" msgstr "Hivatkozás megnyitása új _ablakban" -#: ../midori/midori-view.c:2468 +#: ../midori/midori-view.c:2600 msgid "Open Link as Web A_pplication" msgstr "Hivatkozás megnyitása _webes alkalmazásként" -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2605 msgid "Copy Link de_stination" msgstr "Hivatkozás _címének másolása" -#: ../midori/midori-view.c:2489 +#: ../midori/midori-view.c:2611 +msgid "Save _As…" +msgstr "_Mentés másként…" + +#: ../midori/midori-view.c:2620 msgid "Open _Image in New Tab" msgstr "Ké_p megnyitása új lapon" -#: ../midori/midori-view.c:2492 +#: ../midori/midori-view.c:2623 msgid "Copy Im_age" msgstr "Kép _másolása" -#: ../midori/midori-view.c:2495 +#: ../midori/midori-view.c:2626 msgid "Save I_mage" msgstr "Kép me_ntése" -#: ../midori/midori-view.c:2498 +#: ../midori/midori-view.c:2629 msgid "Open in Image _Viewer" msgstr "Megnyitás a _képmegjelenítőben" -#: ../midori/midori-view.c:2505 +#: ../midori/midori-view.c:2636 msgid "Copy Video _Address" msgstr "Videó _címének másolása" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2639 msgid "Save _Video" msgstr "Videó me_ntése" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2639 msgid "Download _Video" msgstr "_Videó letöltése" -#: ../midori/midori-view.c:2534 +#: ../midori/midori-view.c:2665 msgid "Search _with" msgstr "_Keresés ezzel" -#: ../midori/midori-view.c:2566 +#: ../midori/midori-view.c:2694 msgid "_Search the Web" msgstr "Keresés a _weben" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2714 msgid "Open Address in New _Tab" msgstr "Cím meg_nyitása új lapon" -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2761 msgid "Open _Frame in New Tab" msgstr "_Keret megnyitása új lapon" -#: ../midori/midori-view.c:2845 +#: ../midori/midori-view.c:2978 #, c-format msgid "Open or download file from %s" msgstr "Fájl megnyitása vagy letöltése innen: %s" -#: ../midori/midori-view.c:2858 +#: ../midori/midori-view.c:2991 #, c-format msgid "File Name: %s" msgstr "Fájlnév: %s" -#: ../midori/midori-view.c:2863 +#: ../midori/midori-view.c:2996 #, c-format msgid "File Type: '%s'" msgstr "Fájltípus: „%s”" -#: ../midori/midori-view.c:2865 +#: ../midori/midori-view.c:2998 #, c-format msgid "File Type: %s ('%s')" msgstr "Fájltípus: %s („%s”)" -#: ../midori/midori-view.c:2902 +#: ../midori/midori-view.c:3035 #, c-format msgid "Size: %s" msgstr "Méret: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2913 +#: ../midori/midori-view.c:3046 #, c-format msgid "Open %s" msgstr "%s megnyitása" -#: ../midori/midori-view.c:3439 +#: ../midori/midori-view.c:3574 #, c-format msgid "Inspect page - %s" msgstr "Oldal vizsgálata - %s" -#: ../midori/midori-view.c:3854 +#: ../midori/midori-view.c:4094 #, c-format msgid "No documentation installed" msgstr "Nincs telepítve dokumentáció" -#: ../midori/midori-view.c:3930 +#: ../midori/midori-view.c:4170 msgid "Midori doesn't store any personal data:" msgstr "A Midori nem tárol személyes adatokat:" -#: ../midori/midori-view.c:3931 +#: ../midori/midori-view.c:4171 msgid "No history or web cookies are being saved." msgstr "Nem kerülnek mentésre előzmények vagy webes sütik." -#: ../midori/midori-view.c:3932 +#: ../midori/midori-view.c:4172 msgid "Extensions are disabled." msgstr "Kiterjesztések letiltva." -#: ../midori/midori-view.c:3933 +#: ../midori/midori-view.c:4173 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "HTML5 tárolás, a helyi adatbázis- és alkalmazás-gyorsítótárak le vannak " "tiltva." -#: ../midori/midori-view.c:3934 +#: ../midori/midori-view.c:4174 msgid "Midori prevents websites from tracking the user:" msgstr "A Midori megakadályozza, hogy a weboldalak kövessék a felhasználót:" -#: ../midori/midori-view.c:3935 +#: ../midori/midori-view.c:4175 msgid "Referrer URLs are stripped down to the hostname." msgstr "A hivatkozó URL-címek le lesznek csupaszítva a gépnévig." -#: ../midori/midori-view.c:3936 +#: ../midori/midori-view.c:4176 msgid "DNS prefetching is disabled." msgstr "A DNS-előtöltés letiltva." -#: ../midori/midori-view.c:3937 +#: ../midori/midori-view.c:4177 msgid "The language and timezone are not revealed to websites." msgstr "A nyelv és időzóna nem kerül megadásra a weboldalaknak." -#: ../midori/midori-view.c:3938 +#: ../midori/midori-view.c:4178 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "" "A Flash és más Netscape bővítmények nem sorolhatók fel a weboldalak által." -#: ../midori/midori-view.c:4017 +#: ../midori/midori-view.c:4218 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "A szögletes zárójelben lévő verziószámok megjelenítik a futás közben " "használt verziót." -#: ../midori/midori-view.c:4063 +#: ../midori/midori-view.c:4268 msgid "Page loading delayed" msgstr "Oldalbetöltés késleltetve" -#: ../midori/midori-view.c:4064 +#: ../midori/midori-view.c:4269 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "A betöltés késleltetve egy nem régi összeomlás vagy az indítási beállítások " "miatt." -#: ../midori/midori-view.c:4065 +#: ../midori/midori-view.c:4270 msgid "Load Page" msgstr "Oldal betöltése" -#: ../midori/midori-view.c:4229 +#: ../midori/midori-view.c:4437 msgid "Blank page" msgstr "Üres oldal" -#: ../midori/midori-view.c:4439 +#: ../midori/midori-view.c:4651 msgid "_Duplicate Tab" msgstr "_Lap kettőzése" -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:4656 msgid "Show Tab _Label" msgstr "Lap_címke megjelenítése" -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:4656 msgid "Show Tab _Icon Only" msgstr "Csak l_apikon megjelenítése" -#: ../midori/midori-view.c:4451 +#: ../midori/midori-view.c:4663 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "_Másik lap bezárása" msgstr[1] "_Többi lap bezárása" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5126 +#: ../midori/midori-view.c:5352 msgid "previous" msgstr "előző" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5145 +#: ../midori/midori-view.c:5371 msgid "next" msgstr "következő" -#: ../midori/midori-view.c:5158 +#: ../midori/midori-view.c:5384 msgid "Print background images" msgstr "Háttérképek nyomtatása" -#: ../midori/midori-view.c:5159 +#: ../midori/midori-view.c:5385 msgid "Whether background images should be printed" msgstr "A háttérképeket ki kell-e nyomtatni" -#: ../midori/midori-view.c:5191 +#: ../midori/midori-view.c:5410 msgid "Features" msgstr "Szolgáltatások" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:54 +#: ../midori/midori-download.vala:63 #, c-format msgid "%s of %s" msgstr "%s / %s" -#: ../midori/midori-download.vala:70 +#: ../midori/midori-download.vala:79 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d óra" msgstr[1] "%d óra" -#: ../midori/midori-download.vala:71 +#: ../midori/midori-download.vala:80 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d perc" msgstr[1] "%d perc" -#: ../midori/midori-download.vala:72 +#: ../midori/midori-download.vala:81 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1401,27 +1402,27 @@ msgstr[1] "%d másodperc" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:87 +#: ../midori/midori-download.vala:96 #, c-format msgid " - %s remaining" msgstr " – %s van hátra" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:98 +#: ../midori/midori-download.vala:107 msgid "?B" msgstr "?B" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:100 +#: ../midori/midori-download.vala:109 #, c-format msgid " (%s/s)" msgstr " (%s/s)" -#: ../midori/midori-download.vala:197 +#: ../midori/midori-download.vala:224 msgid "The downloaded file is erroneous." msgstr "A letöltött fájl hibás." -#: ../midori/midori-download.vala:198 +#: ../midori/midori-download.vala:225 msgid "" "The checksum provided with the link did not match. This means the file is " "probably incomplete or was modified afterwards." @@ -1429,21 +1430,21 @@ "A hivatkozáshoz tartozó ellenőrzőösszeg nem egyezik. Ez azt jelenti, hogy a " "fájl valószínűleg nem teljes, vagy megváltozott." -#: ../midori/midori-download.vala:312 +#: ../midori/midori-download.vala:345 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "A fájl („%s”) nem menthető ebbe a mappába." -#: ../midori/midori-download.vala:314 +#: ../midori/midori-download.vala:347 msgid "You don't have permission to write in this location." msgstr "Nincs jogosultsága erre a helyre írni." -#: ../midori/midori-download.vala:317 +#: ../midori/midori-download.vala:350 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nincs elég szabad lemezhely a(z) „%s” letöltéséhez." -#: ../midori/midori-download.vala:319 +#: ../midori/midori-download.vala:352 #, c-format msgid "The file needs %s but only %s are left." msgstr "A fájl %s helyet igényel, de csak %s maradt." @@ -1472,125 +1473,119 @@ msgid "Startup" msgstr "Indítás" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "A Midori indulásakor:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Kezdőlap:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "_Jelenlegi oldal használata" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Jelenlegi oldal használata kezdőlapként" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Betűkészletek" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Proporcionális betűkészletcsalád" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "" "A szöveg megjelenítésére alapértelmezésben használandó betűkészletcsalád" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "A szöveg megjelenítésére alapértelmezésben használandó betűméret" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Rögzített szélességű betűkészletcsalád" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "" "A rögzített szélességű szöveg megjelenítésére használt betűkészletcsalád" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "A rögzített szélességű szöveg megjelenítésére használt betűméret" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Minimális betűméret" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "A szöveg megjelenítésére használt minimális betűméret" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Előnyben részesített kódolás" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Viselkedés" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Képek automatikus betöltése" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Helyesírás-ellenőrzés engedélyezése" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Parancsfájlok engedélyezése" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "WebGL-támogatás engedélyezése" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:389 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Netscape bővítmények engedélyezése" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:394 msgid "Zoom Text and Images" msgstr "Szöveg és képek nagyítása" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:397 msgid "Allow scripts to open popups" msgstr "A parancsfájlok megnyithatnak felugró ablakokat" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:398 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "A parancsfájlok megnyithatnak-e automatikusan felugró ablakokat" -# Fixme: ez mi? -#: ../midori/midori-preferences.c:403 -msgid "Kinetic scrolling" -msgstr "Kinetikus görgetés" - -# Fixme: ez mi? -#: ../midori/midori-preferences.c:404 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "A görgetés kinetikusan mozogjon-e a sebességnek megfelelően" - -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:401 msgid "Middle click opens Selection" msgstr "A középső kattintás megnyitja a kijelölést" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:402 msgid "Load an address from the selection via middle click" msgstr "Cím betöltése a kijelölésből középső kattintásra" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:406 msgid "Flash window on background tabs" msgstr "Ablak megvillantása háttérben lévő lapok nyitásakor" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:411 msgid "Preferred languages" msgstr "Előnyben részesített nyelvek" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:415 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1599,95 +1594,112 @@ "vesszővel elválasztott listája. Például: „hu”, „hu,en” vagy „en-us;q=1.0, fr-" "fr;q=0.667”" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:417 msgid "Save downloaded files to:" msgstr "Letöltött fájlok mentése ide:" #. Page "Interface" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:424 msgid "Browsing" msgstr "Böngészés" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:428 +msgid "Toolbar Style:" +msgstr "Eszköztár stílusa:" + +#: ../midori/midori-preferences.c:433 +msgid "Open new pages in:" +msgstr "Új oldalak megnyitása:" + +#: ../midori/midori-preferences.c:437 +msgid "New tab behavior:" +msgstr "Új lap viselkedése:" + +#: ../midori/midori-preferences.c:442 msgid "Close Buttons on Tabs" msgstr "Bezárás gombok a lapokon" -#: ../midori/midori-preferences.c:451 +#: ../midori/midori-preferences.c:446 msgid "Always Show Tabbar" msgstr "Mindig jelenjen meg a lapsáv" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:450 msgid "Open Tabs next to Current" msgstr "Lapok megnyitása az aktuális mellett" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:451 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Az új lapok az aktuális mellett vagy az utolsó után nyíljanak-e meg" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:454 msgid "Open tabs in the background" msgstr "Lapok megnyitása a háttérben" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:458 msgid "Text Editor" msgstr "Szövegszerkesztő" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:463 msgid "News Aggregator" msgstr "Hírforrásolvasó" #. Page "Network" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:470 msgid "Network" msgstr "Hálózat" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:472 msgid "Proxy server" msgstr "Proxykiszolgáló" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:477 msgid "Hostname" msgstr "Gépnév" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:485 msgid "Port" msgstr "Port" #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:501 ../extensions/web-cache.c:461 -#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:304 +#: ../midori/midori-preferences.c:497 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Webes gyorsítótár" -#: ../midori/midori-preferences.c:502 ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:498 ../midori/midori-preferences.c:501 msgid "The maximum size of cached pages on disk" msgstr "Gyorsítótárazott oldalak legnagyobb mérete a lemezen" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:503 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:526 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:510 +msgid "Identify as" +msgstr "Azonosítás mint" + +#: ../midori/midori-preferences.c:525 msgid "Privacy" msgstr "Adatvédelem" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:527 msgid "Delete old Cookies after:" msgstr "Régi sütik törlése ennyi után:" -#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:529 ../midori/midori-preferences.c:532 msgid "The maximum number of days to save cookies for" msgstr "Sütik tárolása legfeljebb ennyi napig" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:536 msgid "Only accept Cookies from sites you visit" msgstr "Sütik elfogadása csak az Ön által meglátogatott webhelyekről" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:537 msgid "Block cookies sent by third-party websites" msgstr "Külső weboldalak sütijeinek blokkolása" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:542 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1695,74 +1707,74 @@ "A sütik bejelentkezési adatokat, mentett játékállásokat vagy reklámcéllal " "felhasználói profilokat tárolnak." -#: ../midori/midori-preferences.c:550 +#: ../midori/midori-preferences.c:549 msgid "Enable offline web application cache" msgstr "Webalkalmazások kapcsolat nélküli gyorsítótárának engedélyezése" -#: ../midori/midori-preferences.c:553 +#: ../midori/midori-preferences.c:552 msgid "Enable HTML5 local storage support" msgstr "HTML5 helyi tárolás támogatásának engedélyezése" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:557 +#: ../midori/midori-preferences.c:556 msgid "Strip referrer details sent to websites" msgstr "Weboldalaknak küldött hivatkozási részletek rövidítése" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:558 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "A „Referer” fejlécet rövidíteni kell-e a gépnévre" -#: ../midori/midori-preferences.c:562 +#: ../midori/midori-preferences.c:561 msgid "Delete pages from history after:" msgstr "Oldalak törlése az előzményekből ennyi után:" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 +#: ../midori/midori-preferences.c:563 ../midori/midori-preferences.c:566 msgid "The maximum number of days to save the history for" msgstr "Előzmények tárolása legfeljebb ennyi napig" -#: ../midori/midori-preferences.c:604 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:603 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Kiterjesztések" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1047 msgid "Add search engine" msgstr "Keresőszolgáltatás hozzáadása" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1047 msgid "Edit search engine" msgstr "Keresőszolgáltatás szerkesztése" -#: ../midori/midori-searchaction.c:1096 +#: ../midori/midori-searchaction.c:1075 msgid "_Name:" msgstr "_Név:" -#: ../midori/midori-searchaction.c:1111 +#: ../midori/midori-searchaction.c:1090 msgid "_Description:" msgstr "_Leírás:" -#: ../midori/midori-searchaction.c:1124 ../extensions/feed-panel/main.c:376 +#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Webcím:" -#: ../midori/midori-searchaction.c:1143 +#: ../midori/midori-searchaction.c:1122 msgid "_Token:" msgstr "_Jelsor:" -#: ../midori/midori-searchaction.c:1441 +#: ../midori/midori-searchaction.c:1412 msgid "Manage Search Engines" msgstr "Keresőszolgáltatások kezelése" -#: ../midori/midori-searchaction.c:1541 +#: ../midori/midori-searchaction.c:1512 msgid "Use as _default" msgstr "_Alapértelmezett" -#: ../midori/midori-searchaction.c:1652 +#: ../midori/midori-searchaction.c:1623 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "A keresőmotorok nem tölthetők be. %s\n" -#: ../midori/midori-searchaction.c:1707 +#: ../midori/midori-searchaction.c:1678 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "A keresőmotorok nem menthetők. %s" @@ -1787,29 +1799,33 @@ msgid "Search for %s" msgstr "%s keresése" -#: ../midori/midori-searchcompletion.vala:23 +#: ../midori/midori-searchcompletion.vala:20 #: ../midori/midori-searchcompletion.vala:60 msgid "Search with…" msgstr "Keresés ezzel…" -#: ../midori/midori-searchcompletion.vala:50 +#: ../midori/midori-searchcompletion.vala:48 #, c-format msgid "Search with %s" msgstr "Keresés ezzel: %s" -#: ../midori/sokoke.c:251 +#: ../midori/sokoke.c:243 msgid "Open with" msgstr "Megnyitás ezzel" -#: ../midori/sokoke.c:259 +#: ../midori/sokoke.c:251 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Válasszon egy alkalmazást vagy parancsot „%s” megnyitásához:" -#: ../midori/sokoke.c:374 ../midori/sokoke.c:388 +#: ../midori/sokoke.c:368 ../midori/sokoke.c:388 msgid "Could not run external program." msgstr "A külső program nem futtatható." +#: ../midori/sokoke.c:561 +msgid "Invalid URI" +msgstr "Érvénytelen URI" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1840,19 +1856,19 @@ msgid "Transfer completed" msgstr "Átvitel kész" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Minden mező törlése" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Néhány fájl letöltése folyamatban" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Kilépés a Midoriból" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Az átvitel meg fog szakadni, ha kilép a Midoriból." @@ -1883,7 +1899,7 @@ msgstr "Elválasztó" #. Create the filter entry -#: ../panels/midori-bookmarks.c:1017 +#: ../panels/midori-bookmarks.c:1009 msgid "Search Bookmarks" msgstr "Keresés a könyvjelzőkben" @@ -1928,7 +1944,7 @@ msgstr "Minden előzmény törlése" #. Create the filter entry -#: ../panels/midori-history.c:988 +#: ../panels/midori-history.c:981 msgid "Search History" msgstr "Keresési előzmények" @@ -1936,11 +1952,11 @@ msgid "Transfers" msgstr "Átvitelek" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:442 msgid "Open Destination _Folder" msgstr "_Célmappa megnyitása" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:445 msgid "Copy Link Loc_ation" msgstr "Link _helyének másolása" @@ -1982,7 +1998,7 @@ msgid "Animation frames are broken" msgstr "Az animációs képkockák sérültek" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:422 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A(z) „%s” tulajdonság érvénytelen a következőhöz: %s" @@ -2000,23 +2016,23 @@ msgid "None" msgstr "Nincs" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:688 msgid "1 hour" msgstr "1 óra" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:689 msgid "1 day" msgstr "1 nap" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:690 msgid "1 week" msgstr "1 hét" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:691 msgid "1 month" msgstr "1 hónap" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "1 year" msgstr "1 év" @@ -2035,11 +2051,11 @@ msgid "SHA1-Checksum:" msgstr "SHA1 ellenőrzőösszeg:" -#: ../extensions/adblock.c:492 +#: ../extensions/adblock.c:483 msgid "Configure Advertisement filters" msgstr "Reklámszűrők beállítása" -#: ../extensions/adblock.c:523 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2048,27 +2064,27 @@ "Írja be az előre beállított szűrőlista címét a szövegmezőben, és a listához " "adáshoz nyomja meg a „Hozzáadás” gombot. További listákat itt találhat: %s." -#: ../extensions/adblock.c:937 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Szabály szerkesztése" -#: ../extensions/adblock.c:951 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "S_zabály:" -#: ../extensions/adblock.c:1005 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Kép _blokkolása" -#: ../extensions/adblock.c:1010 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "_Hivatkozás blokkolása" -#: ../extensions/adblock.c:1936 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Reklámblokkoló" -#: ../extensions/adblock.c:1937 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Reklámok blokkolása szűrőlista alapján" @@ -2103,7 +2119,7 @@ msgstr "Felhasználói stílusok" #: ../extensions/addons.c:371 ../extensions/addons.c:450 -#: ../extensions/feed-panel/main.c:128 +#: ../extensions/feed-panel/main.c:120 msgid "Error" msgstr "Hiba" @@ -2187,23 +2203,23 @@ msgid "Collapse All" msgstr "Összes összecsukása" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:575 msgid "Do you really want to delete all cookies?" msgstr "Biztos, hogy az összes sütit törölni akarja?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:577 msgid "Question" msgstr "Kérdés" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:588 msgid "Only cookies which match the filter will be deleted." msgstr "Csak a szűrőnek megfelelő sütik kerülnek törlésre." -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "At the end of the session" msgstr "A munkamenet végén" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:683 #, c-format msgid "" "Host: %s\n" @@ -2221,15 +2237,15 @@ "Lejár: %s" #. i18n: is this cookie secure (SSL)? yes/ no -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "Yes" msgstr "Igen" -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "No" msgstr "Nem" -#: ../extensions/cookie-manager/cookie-manager-page.c:699 +#: ../extensions/cookie-manager/cookie-manager-page.c:705 #, c-format msgid "" "Domain: %s\n" @@ -2238,19 +2254,20 @@ "Tartomány: %s\n" "Sütik: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1022 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 msgid "Name" msgstr "Név" -#: ../extensions/cookie-manager/cookie-manager-page.c:1074 +#: ../extensions/cookie-manager/cookie-manager-page.c:1080 msgid "_Expand All" msgstr "Összes _kibontása" -#: ../extensions/cookie-manager/cookie-manager-page.c:1082 +#: ../extensions/cookie-manager/cookie-manager-page.c:1088 msgid "_Collapse All" msgstr "Összes össze_csukása" -#: ../extensions/cookie-manager/cookie-manager-page.c:1134 +#: ../extensions/cookie-manager/cookie-manager-page.c:1140 msgid "Search Cookies by Name or Domain" msgstr "Sütik keresése név vagy tartomány szerint" @@ -2315,7 +2332,7 @@ msgid "Download files with \"%s\" or a custom command" msgstr "Fájlok letöltése ezzel: „%s” vagy egyéni paranccsal" -#: ../extensions/external-download-manager.vala:318 +#: ../extensions/external-download-manager.vala:320 msgid "External Download Manager - CommandLine" msgstr "Külső letöltéskezelő - parancssori" @@ -2328,25 +2345,25 @@ msgstr "Nem találhatók a szükséges Atom „feed” bejegyzések az XML adatokban." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:378 +#: ../extensions/feed-panel/feed-panel.c:375 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Utolsó frissítés: %s." -#: ../extensions/feed-panel/feed-panel.c:644 +#: ../extensions/feed-panel/feed-panel.c:629 msgid "Feeds" msgstr "Hírforrások" -#: ../extensions/feed-panel/feed-panel.c:697 +#: ../extensions/feed-panel/feed-panel.c:682 msgid "Add new feed" msgstr "Új hírforrás hozzáadása" -#: ../extensions/feed-panel/feed-panel.c:704 +#: ../extensions/feed-panel/feed-panel.c:689 msgid "Delete feed" msgstr "Hírforrás törlése" -#: ../extensions/feed-panel/feed-panel.c:784 +#: ../extensions/feed-panel/feed-panel.c:769 msgid "_Feeds" msgstr "_Hírforrások" @@ -2381,21 +2398,21 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Nem találhatók a szükséges RSS „channel” elemek az XML adatokban." -#: ../extensions/feed-panel/main.c:130 +#: ../extensions/feed-panel/main.c:122 #, c-format msgid "Feed '%s' already exists" msgstr "A(z) „%s” hírforrás már létezik" -#: ../extensions/feed-panel/main.c:207 +#: ../extensions/feed-panel/main.c:199 #, c-format msgid "Error loading feed '%s'" msgstr "Hiba a(z) „%s” hírforrás betöltésekor" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:509 msgid "Feed Panel" msgstr "Hírforráspanel" -#: ../extensions/feed-panel/main.c:518 +#: ../extensions/feed-panel/main.c:510 msgid "Read Atom/ RSS feeds" msgstr "Atom/ RSS hírforrások olvasása" @@ -2541,19 +2558,19 @@ msgid "Reload page or stop loading" msgstr "Oldal újratöltése, vagy betöltés leállítása" -#: ../extensions/shortcuts.c:176 +#: ../extensions/shortcuts.c:168 msgid "Customize Keyboard shortcuts" msgstr "Gyorsbillentyűk személyre szabása" -#: ../extensions/shortcuts.c:283 +#: ../extensions/shortcuts.c:275 msgid "Customize Sh_ortcuts..." msgstr "_Gyorsbillentyűk személyre szabása…" -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:312 msgid "Shortcuts" msgstr "Gyorsbillentyűk" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:313 msgid "View and edit keyboard shortcuts" msgstr "Gyorsbillentyűk megjelenítése és szerkesztése" @@ -2668,15 +2685,15 @@ msgstr "Privát adatok törlése a Mi_doriból kilépéskor" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:298 +#: ../midori/midori-privatedata.c:302 msgid "Saved logins and _passwords" msgstr "Mentett felhasználónevek és _jelszavak" -#: ../midori/midori-privatedata.c:300 +#: ../midori/midori-privatedata.c:304 msgid "Cookies and Website data" msgstr "Sütik és weboldaladatok" -#: ../midori/midori-privatedata.c:307 +#: ../midori/midori-privatedata.c:311 msgid "Website icons" msgstr "Weboldalikonok" @@ -2684,7 +2701,7 @@ msgid "Open tabs" msgstr "Lapok megnyitása" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Több nyitott lap…" @@ -2730,35 +2747,35 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "A könyvjelzők nem menthetők. %s" -#: ../midori/midori-session.c:187 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Nem érhető el gyökértanúsítvány-fájl. Az SSL-tanúsítványok nem " "ellenőrizhetők." -#: ../midori/midori-session.c:355 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A beállítások nem menthetők. %s" -#: ../midori/midori-session.c:376 ../midori/midori-frontend.c:448 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:454 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A munkamenet nem tölthető be: %s\n" -#: ../midori/midori-session.c:406 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "A munkamenet nem menthető. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:126 +#: ../midori/midori-frontend.c:128 #, c-format msgid "The trash couldn't be saved. %s" msgstr "A Kuka nem menthető. %s" -#: ../midori/midori-frontend.c:309 +#: ../midori/midori-frontend.c:314 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." @@ -2767,49 +2784,298 @@ "előfordul, a probléma megoldása érdekében próbálja ki a következő " "lehetőségeket." -#: ../midori/midori-frontend.c:319 +#: ../midori/midori-frontend.c:324 msgid "Modify _preferences" msgstr "Beállítások _módosítása" -#: ../midori/midori-frontend.c:323 +#: ../midori/midori-frontend.c:328 msgid "Disable all _extensions" msgstr "Minden _kiterjesztés letiltása" -#: ../midori/midori-frontend.c:332 +#: ../midori/midori-frontend.c:337 msgid "Show a dialog after Midori crashed" msgstr "Párbeszédablak megjelenítése a Midori összeomlása után" -#: ../midori/midori-frontend.c:337 +#: ../midori/midori-frontend.c:342 msgid "Discard old tabs" msgstr "Régi lapok eldobása" -#: ../midori/midori-frontend.c:400 +#: ../midori/midori-frontend.c:406 msgid "An instance of Midori is already running but not responding.\n" msgstr "A Midori egy példánya már fut, de nem válaszol.\n" -#: ../midori/midori-frontend.c:433 +#: ../midori/midori-frontend.c:439 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "A könyvjelzők nem tölthetők be: %s\n" -#: ../midori/midori-frontend.c:464 +#: ../midori/midori-frontend.c:470 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "A Kuka nem tölthető be: %s\n" -#: ../midori/midori-frontend.c:472 +#: ../midori/midori-frontend.c:478 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Az előzmények nem tölthetők be: %s\n" -#: ../midori/midori-frontend.c:483 +#: ../midori/midori-frontend.c:489 msgid "The following errors occured:" msgstr "A következő hibák történtek:" -#: ../midori/midori-frontend.c:488 +#: ../midori/midori-frontend.c:494 msgid "_Ignore" msgstr "_Kihagyás" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#, c-format +msgid "SQL fails: %s" +msgstr "SQL hiba: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +msgid "Accept" +msgstr "Elfogadás" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +msgid "Accept for session" +msgstr "Elfogadás erre a munkamenetre" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +msgid "Block" +msgstr "Blokkolás" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#, c-format +msgid "Could not open database of extenstion: %s" +msgstr "A kiterjesztés adatbázisa nem nyitható meg: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#, c-format +msgid "Failed to execute database statement: %s" +msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +msgid "Do you really want to delete all cookie permissions?" +msgstr "Biztos, hogy az összes sütiengedélyt törölni szeretné?" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +msgid "Delete all cookie permissions?" +msgstr "Az összes sütiengedély törlése?" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +msgid "" +"This action will delete all cookie permissions. You will be asked for " +"permissions again for each web site visited." +msgstr "Ez a művelet az összes sütiengedélyt törölni fogja." + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +msgid "Cookie permission manager" +msgstr "Sütiengedély-kezelő" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +msgid "Instance of current cookie permission manager" +msgstr "A jelenlegi sütiengedély-kezelő példánya" + +#. Set up dialog +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +msgid "Configure cookie permission" +msgstr "Sütiengedély konfigurálása" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#, c-format +msgid "" +"Below is a list of all web sites and the policy set for them. You can delete " +"policies by marking the entries and clicking on Delete.You can also " +"add a policy for a domain manually by entering the domain below, choosing " +"the policy and clicking on Add." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +msgid "Domain" +msgstr "Tartomány" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +msgid "Policy" +msgstr "Irányelv" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +msgid "Delete _all" +msgstr "Ö_sszes törlése" + +#. Add "ask-for-unknown-policy" checkbox +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +msgid "A_sk for policy if unknown for a domain" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +msgid "" +"A fatal error occurred which prevents the cookie permission manager " +"extension to continue. You should disable it." +msgstr "Végzetes hiba történt, mely megakadályozza a sütiengedély-kezelőt a folytatásban. Letiltása javasolt." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +msgid "Error in cookie permission manager extension" +msgstr "Hiba a sütiengedély-kezelő kiterjesztésben" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +msgid "Reason" +msgstr "Ok" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +msgid "Could not get path to configuration of extension: path is NULL" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +msgid "Could not get path to configuration of extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#, c-format +msgid "Could not create configuration folder for extension: %s" +msgstr "Nem hozható létre konfigurációs mappa a kiterjesztés számára: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +msgid "Could not create configuration folder for extension." +msgstr "Nem hozható létre konfigurációs mappa a kiterjesztés számára." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +msgid "Could not open database of extension." +msgstr "A kiterjesztés adatbázisa nem nyitható meg." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +msgid "Could not set up database structure of extension." +msgstr "A kiterjesztés adatbázis-struktúrája nem hozható létre." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#, c-format +msgid "Could not determine global cookie policy to set for domain: %s" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 +msgid "Confirm storing cookie" +msgstr "Süti tárolás jóváhagyása" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#, c-format +msgid "The website %s wants to store %d cookies." +msgstr "A(z) %s weboldal %d sütit szeretne tárolni." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#, c-format +msgid "The website %s wants to store a cookie." +msgstr "A(z) %s weboldal egy sütit szeretne tárolni." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#, c-format +msgid "Multiple websites want to store %d cookies in total." +msgstr "Több weboldal összesen %d sütit szeretne tárolni." + +#. Create expander for details +#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 +msgid "_Details" +msgstr "_Részletek" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +msgid "Path" +msgstr "Útvonal" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +msgid "Value" +msgstr "Érték" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +msgid "Expire date" +msgstr "Lejárat dátuma" + +#. Create buttons for dialog +#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 +msgid "_Accept" +msgstr "_Elfogadás" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 +msgid "Accept for this _session" +msgstr "Elfogadás erre a _munkamenetre" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 +msgid "De_ny" +msgstr "Meg_tagadás" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +msgid "Extension instance" +msgstr "Kiterjesztés példány" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +msgid "The Midori extension instance for this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +msgid "Application instance" +msgstr "Alkalmazás példány" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +msgid "The Midori application instance this extension belongs to" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +msgid "Database instance" +msgstr "Adatbázis példány" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +msgid "Pointer to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +msgid "Ask for unknown policy" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +msgid "" +"If true this extension ask for policy for every unknown domain.If false this " +"extension uses the global cookie policy set in Midori settings." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +msgid "Undetermined" +msgstr "Meghatározatlan" + +#: ../extensions/cookie-permissions/main.c:62 +msgid "Cookie Security Manager" +msgstr "Sütibiztonság-kezelő" + +#: ../extensions/cookie-permissions/main.c:63 +msgid "Manage cookie permission per site" +msgstr "Sütijogosultság kezelése oldalanként" + +#~ msgid "Writing failed." +#~ msgstr "Az írás meghiúsult." + +#~ msgid "_Window" +#~ msgstr "_Ablak" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Miként mutatkozzon be a weboldalaknak" + +#~ msgid "Kinetic scrolling" +#~ msgstr "Kinetikus görgetés" + +#~ msgid "Whether scrolling should kinetically move according to speed" +#~ msgstr "A görgetés kinetikusan mozogjon-e a sebességnek megfelelően" + #~ msgid "Add Shortcut to the _desktop" #~ msgstr "Parancsikon hozzáadása az _asztalhoz" @@ -3078,9 +3344,6 @@ #~ msgid "Offline Application Cache" #~ msgstr "Alkalmazások kapcsolat nélküli gyorsítótára" -#~ msgid "Reset the last _session" -#~ msgstr "_Utolsó munkamenet visszaállítása" - #~ msgid "No filename specified" #~ msgstr "Nincs megadva fájlnév" @@ -3225,9 +3488,6 @@ #~ msgid "Failed to execute database statement\n" #~ msgstr "Az adatbázis-utasítás végrehajtása meghiúsult\n" -#~ msgid "Show Blank page" -#~ msgstr "Üres oldal megjelenítése" - #~ msgid "All cookies" #~ msgstr "Minden süti" @@ -3282,9 +3542,6 @@ #~ msgid "Where to open externally opened pages" #~ msgstr "Hol nyíljanak meg a külső programokból megnyitott oldalak" -#~ msgid "Accept cookies" -#~ msgstr "Sütik elfogadása" - #~ msgid "What type of cookies to accept" #~ msgstr "Milyen típusú sütiket fogadjon el" @@ -3360,9 +3617,6 @@ #~ msgid "Navigationbar" #~ msgstr "Navigációs sáv" -#~ msgid "Applications" -#~ msgstr "Alkalmazások" - #~ msgid "External applications" #~ msgstr "Külső alkalmazások" @@ -3378,9 +3632,6 @@ #~ msgid "Delete old cookies after 1 week" #~ msgstr "Régi sütik törlése 1 hét után" -#~ msgid "Delete old cookies after 1 month" -#~ msgstr "Régi sütik törlése 1 hónap után" - #~ msgid "Delete old cookies after 1 year" #~ msgstr "Régi sütik törlése 1 év után" diff -Nru midori-0.4.9/po/it.po midori-0.5.0/po/it.po --- midori-0.4.9/po/it.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/it.po 2013-04-04 20:31:20.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-23 04:48+0000\n" +"POT-Creation-Date: 2013-03-26 09:48+0000\n" "PO-Revision-Date: 2011-12-24 09:51+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" @@ -27,9 +27,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:157 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3768 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 +#: ../midori/midori-app.c:1448 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" @@ -41,11 +41,11 @@ msgid "New Private Browsing Window" msgstr "Nuova finestra di navigazione privata" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1336 msgid "New Tab" msgstr "Nuova scheda" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1333 msgid "New Window" msgstr "Nuova finestra" @@ -61,7 +61,7 @@ msgid "Open a new private browsing window" msgstr "Apre una nuova finestra di navigazione privata" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4060 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Navigazione privata" @@ -106,7 +106,7 @@ #: ../midori/main.c:104 msgid "Run within gdb and save a backtrace on crash" -msgstr "" +msgstr "Lancia con gdb e salva una traccia del crash" #: ../midori/main.c:106 msgid "Run the specified filename as javascript" @@ -149,205 +149,211 @@ msgid "SECONDS" msgstr "SECONDI" +#: ../midori/main.c:154 +msgid "Error: \"gdb\" can't be found\n" +msgstr "Errore: \"gdb\" non può essere trovato\n" + # fp suggerisce "a:", mantengo "su:" per uniformita´ con le trad xfce -#: ../midori/main.c:176 +#: ../midori/main.c:182 msgid "Please report comments, suggestions and bugs to:" msgstr "Segnalare commenti, suggerimenti e bug su:" -#: ../midori/main.c:178 +#: ../midori/main.c:184 msgid "Check for new versions at:" msgstr "Controlla nuove versioni su:" -#: ../midori/main.c:327 +#: ../midori/main.c:378 msgid "An unknown error occured" msgstr "Si è verificato un errore sconosciuto" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 +#: ../midori/midori-app.c:1127 ../midori/midori-browser.c:589 #, c-format msgid "Unexpected action '%s'." msgstr "Azione \"%s\" inaspettata." -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1349 ../midori/midori-browser.c:6090 msgid "_Bookmarks" msgstr "Segnali_bri" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1350 msgid "Add Boo_kmark" msgstr "Aggiungi se_gnalibro" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1351 msgid "_Extensions" msgstr "_Estensioni" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1352 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "C_ronologia" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1353 msgid "_Userscripts" msgstr "Script dell'_utente" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1354 msgid "User_styles" msgstr "_Stili dell'utente" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1355 msgid "New _Tab" msgstr "Nuova _scheda" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1356 msgid "_Transfers" msgstr "_Trasferimenti" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1357 msgid "Netscape p_lugins" msgstr "Plugin N_etscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1358 msgid "_Closed Tabs" msgstr "Schede _chiuse" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1359 ../midori/midori-browser.c:5229 msgid "New _Window" msgstr "N_uova finestra" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1360 msgid "New _Folder" msgstr "Nuova _cartella" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1415 ../midori/midori-app.c:1418 +#: ../midori/midori-app.c:1421 msgid "[Addresses]" msgstr "[Indirizzi]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "File non trovato." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Documento corrotto." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Formato del segnalibro non riconosciuto." -#: ../midori/midori-array.c:915 -msgid "Writing failed." -msgstr "Errore di scrittura." - -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5365 msgid "Go forward to the next page" msgstr "Va alla pagina successiva" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5376 msgid "Go to the next sub-page" msgstr "Va alla sottopagina successiva" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5314 +#: ../midori/midori-browser.c:5323 msgid "Reload the current page" msgstr "Ricarica la pagina corrente" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5320 msgid "Stop loading the current page" msgstr "Interrompe il caricamento della pagina corrente" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Errore nell'aggiornamento del titolo: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:582 ../midori/midori-browser.c:585 +#: ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Il valore «%s» non è valido per %s" + +#: ../midori/midori-browser.c:665 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Navigazione privata)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:775 ../midori/midori-browser.c:817 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Segnalibri" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:871 msgid "New folder" msgstr "Nuova cartella" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:871 msgid "Edit folder" msgstr "Modifica cartella" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:873 msgid "New bookmark" msgstr "Nuovo segnalibro" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:873 msgid "Edit bookmark" msgstr "Modifica segnalibro" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:907 msgid "Type a name for this bookmark and choose where to keep it." msgstr "" "Inserire un nome per ils egnalibri e selezionare la posizione in cui " "conservarlo" -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:963 msgid "Add to _Speed Dial" msgstr "Aggiungi a _selezione veloce" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:969 msgid "Show in the tool_bar" msgstr "Mostra nella _barra degli strumenti" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:977 msgid "Run as _web application" msgstr "Esegui come applicazione _web" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1093 ../midori/midori-browser.c:4472 msgid "Save file as" msgstr "Salva come" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1103 msgid "Save associated _resources" msgstr "Salva _risorse associate" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1333 msgid "A new window has been opened" msgstr "È stata aperta una nuova finestra" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1336 msgid "A new tab has been opened" msgstr "È stata aperta una nuova scheda" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1354 msgid "Error opening the image!" msgstr "Errore di apertura dell'immagine" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1355 msgid "Can not open selected image in a default viewer." msgstr "" "Impossibile aprire l'immagine selezionata in un visualizzatore predefinito." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1361 msgid "Error downloading the image!" msgstr "Errore di scaricamento dell'immagine" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1362 msgid "Can not download selected image." msgstr "Impossibile scaricare l'immagine selezionata." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1421 msgid "Save file" msgstr "Salva file" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2393 msgid "Open file" msgstr "Apre file" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2521 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -361,24 +367,24 @@ "un aggregatore di notizie; al prossimo clic sull'icona del feed delle " "notizie, questo verrà aggiunto automaticamente" -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2527 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Nuovo feed" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2559 ../midori/midori-browser.c:5389 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Aggiunge un nuovo segnalibro" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3085 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Vuoto" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3467 ../midori/midori-browser.c:3468 msgid "Toggle text cursor navigation" msgstr "Abilita o disabilita la navigazione a cursore" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3470 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -386,110 +392,110 @@ "Premendo F7 verrà abilitata la navigazione Caret. Quando è attiva, apparirà " "un cursore di testo in tutti i siti web." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3473 msgid "_Enable Caret Browsing" msgstr "Abilita navigazione ca_ret" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3889 ../midori/midori-browser.c:5837 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Errore nell'inserimento dell'elemento della cronologia: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4204 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Apri _tutti in nuove schede" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4211 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Apri in una nuova sc_heda" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2680 -#: ../midori/midori-view.c:4530 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4214 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Apri in una nuova _finestra" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4303 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4304 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4305 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4306 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4307 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4308 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4309 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4327 msgid "Import bookmarks…" msgstr "Importa segnalibri…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4330 ../midori/midori-browser.c:5394 msgid "_Import bookmarks" msgstr "_Importa segnalibri" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4341 msgid "_Application:" msgstr "_Applicazione:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4406 msgid "Import from XBEL or HTML file" msgstr "Importa da un file XBEL o HTML" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4434 msgid "Import from a file" msgstr "Importa da un file" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4446 msgid "Failed to import bookmarks" msgstr "Impossibile importare i segnalibri" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4477 msgid "XBEL Bookmarks" msgstr "Segnalibri XBEL" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4482 msgid "Netscape Bookmarks" msgstr "Segnalibri Netscape" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4496 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "" "Midori può esportare solamente in formato XBEL (*.xbel) e Netscape (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4511 msgid "Failed to export bookmarks" msgstr "Impossibile esportare i segnalibri" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4727 msgid "A lightweight web browser." msgstr "Un browser web leggero" -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4728 msgid "See about:version for version info." -msgstr "Consultare about:info per le informazioni di versione." +msgstr "Consultare about:version per le informazioni di versione." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4730 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -501,7 +507,7 @@ "pubblicata dalla Free Software Foundation; sia nella versione 2.1 della " "licenza che (a scelta) in una versione successiva." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4765 msgid "translator-credits" msgstr "" "Sergio Durzu \n" @@ -510,376 +516,377 @@ "Gianluca Foddis \n" "Cristian Marchi , 2010" -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5227 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5230 msgid "Open a new window" msgstr "Apre una nuova finestra" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5233 msgid "Open a new tab" msgstr "Apre una nuova scheda" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5235 msgid "New P_rivate Browsing Window" msgstr "Nuova _finestra di navigazione privata" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5239 msgid "Open a file" msgstr "Apre un file" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5241 msgid "_Save Page As…" msgstr "Sa_lva pagina come…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5242 msgid "Save to a file" msgstr "Salva in un file" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5244 msgid "Add to Speed _dial" msgstr "Aggiungi a selezione _veloce" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5248 msgid "Create _Launcher" msgstr "Crea avvia_tore" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5251 msgid "Subscribe to News _feed" msgstr "Abbonati al _feed di notizie" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5257 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5258 msgid "Close the current tab" msgstr "Chiude la scheda corrente" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5260 msgid "C_lose Window" msgstr "C_hiudi finestra" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5264 msgid "_Share" msgstr "C_ondividi" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5265 msgid "Share this page" msgstr "Condividi questa pagina" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5269 msgid "Print the current page" msgstr "Stampa la pagina corrente" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5272 msgid "Close a_ll Windows" msgstr "Chiudi _tutte le finestre" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5275 msgid "_Edit" msgstr "Mo_difica" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5298 msgid "_Find…" msgstr "_Cerca…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5299 msgid "Find a word or phrase in the page" msgstr "Cerca una parola o una frase nella pagina" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5301 msgid "Find _Next" msgstr "Trova s_uccessivo" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5304 msgid "Find _Previous" msgstr "Trova _precedente" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5308 msgid "Configure the application preferences" msgstr "Imposta le preferenze dell'applicazione" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5310 msgid "_View" msgstr "_Visualizza" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5311 msgid "_Toolbars" msgstr "Barre degli _strumenti" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5316 msgid "Reload page without caching" msgstr "Ricarica la pagina senza effettuare il caching" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5326 msgid "Increase the zoom level" msgstr "Aumenta il livello di ingrandimento" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5329 msgid "Decrease the zoom level" msgstr "Diminuisce il livello di ingrandimento" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5333 msgid "_Encoding" msgstr "_Codifica" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5335 msgid "View So_urce" msgstr "Visualizza s_orgente" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5338 msgid "Ca_ret Browsing" msgstr "Navigazione ca_ret" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5342 msgid "Toggle fullscreen view" msgstr "Schermo intero" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5344 msgid "Scroll _Left" msgstr "Scorri a _sinistra" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5347 msgid "Scroll _Down" msgstr "Scorri in _basso" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5350 msgid "Scroll _Up" msgstr "Scorri in _alto" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5353 msgid "Scroll _Right" msgstr "Scorri a _destra" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5356 msgid "_Readable" msgstr "_Leggibile" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5359 msgid "_Go" msgstr "V_ai" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5362 msgid "Go back to the previous page" msgstr "Va alla pagina precedente" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5369 msgid "Go to the previous sub-page" msgstr "Va alla sottopagina precedente" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5378 msgid "_Homepage" msgstr "_Pagina iniziale" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5379 msgid "Go to your homepage" msgstr "Va alla pagina iniziale" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5381 msgid "Empty Trash" msgstr "Svuota cestino" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5384 msgid "Undo _Close Tab" msgstr "Annulla chi_usura scheda" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5391 msgid "Add a new _folder" msgstr "Aggiungi una nuova _cartella" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5397 msgid "_Export bookmarks" msgstr "Esp_orta segnalibri" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5400 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "Gestione _motori di ricerca" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5403 msgid "_Clear Private Data" msgstr "_Rimuovi dati privati" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5406 msgid "_Inspect Page" msgstr "Ispeziona pa_gina" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5410 msgid "_Previous Tab" msgstr "Scheda _precedente" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5413 msgid "_Next Tab" msgstr "Scheda _successiva" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5415 msgid "Move Tab to _first position" msgstr "Sposta la scheda al _primo posto" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5417 msgid "Move Tab _Backward" msgstr "Sposta scheda in_dietro" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5419 msgid "_Move Tab Forward" msgstr "Sposta scheda da_vanti" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5421 msgid "Move Tab to _last position" msgstr "Sposta la scheda all'_ultimo posto" # comando per selezionare la scheda corrente -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5424 msgid "Focus _Current Tab" msgstr "Scheda _corrente" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5427 msgid "Focus _Next view" msgstr "Metti a fuoco la vista _successiva" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5430 msgid "Only show the Icon of the _Current Tab" msgstr "Mostra solo l'icona della scheda corren_te" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5433 msgid "_Duplicate Current Tab" msgstr "_Duplica la scheda corrente" # acceleratore sulla h per evitare conflitti -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5436 msgid "Close Ot_her Tabs" msgstr "Chiudi le altre sc_hede" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5439 msgid "Open last _session" msgstr "Apri ultima s_essione" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5442 msgid "_Help" msgstr "A_iuto" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5444 msgid "_Frequent Questions" msgstr "Domande fre_quenti" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5447 msgid "_Report a Problem…" msgstr "Segnala un _problema…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5452 ../midori/midori-browser.c:6109 msgid "_Tools" msgstr "_Strumenti" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5459 msgid "_Menubar" msgstr "Barra dei _menu" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5463 msgid "_Navigationbar" msgstr "Barra di _navigazione" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5467 msgid "Side_panel" msgstr "Pannello _laterale" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5468 msgid "Sidepanel" msgstr "Pannello laterale" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5471 msgid "_Bookmarkbar" msgstr "Barra dei s_egnalibri" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5475 msgid "_Statusbar" msgstr "Barra di stat_o" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5484 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatico" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5487 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Cinese tradizionale (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5490 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Cinese semplificato (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5494 msgid "Japanese (SHIFT__JIS)" msgstr "Giapponese (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5497 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5500 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5503 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5506 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Occidentale (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5509 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:603 msgid "Custom…" msgstr "Personalizzato…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6015 msgid "_Separator" msgstr "_Separatore" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6022 msgid "_Location…" msgstr "I_ndirizzo…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6024 msgid "Open a particular location" msgstr "Apre un indirizzo specifico" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6046 msgid "_Web Search…" msgstr "Ricerca sul _web…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6048 msgid "Run a web search" msgstr "Esegue una ricerca sul web" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6075 msgid "Reopen a previously closed tab or window" msgstr "Riapre una scheda o una finestra chiusa precedentemente" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6092 msgid "Show the saved bookmarks" msgstr "Mostra i segnalibri salvati" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6125 msgid "_Tabs" msgstr "_Schede" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6127 msgid "Show a list of all open tabs" msgstr "Mostra un elenco delle schede aperte" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6141 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6143 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6908 #, c-format msgid "Unexpected setting '%s'" msgstr "Impostazione \"%s\" non prevista" @@ -941,24 +948,24 @@ msgid "Self-signed" msgstr "Auto firmato" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Dettagli di sicurezza" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Incolla e p_rocedi" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Non verificata" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Connessione verificata e cifrata" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Connessione aperta, non cifrata" @@ -975,422 +982,421 @@ msgid "Align sidepanel to the left" msgstr "Allinea il pannello laterale a sinistra" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Mostra selezione veloce" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Mostra la pagina iniziale" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:353 msgid "Show last open tabs" msgstr "Mostra le ultime schede aperte" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:352 msgid "Show last tabs without loading" msgstr "Mostra le ultime schede senza caricarle" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +#, fuzzy +msgid "Show Blank Page" +msgstr "Mostra una pagina vuota" + +#: ../midori/midori-websettings.c:134 +#, fuzzy +msgid "Show default Search Engine" +msgstr "Gestione motori di ricerca" + +#: ../midori/midori-websettings.c:136 +#, fuzzy +msgid "Show custom page" +msgstr "Mostra la pagina iniziale" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Giapponese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Personalizzato…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Nuova scheda" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Nuova finestra" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Scheda corrente" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Predefinito" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Icone" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Icone piccole" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Testo" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Icone e testo" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Testo accanto alle icone" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Automatico (GNOME o ambiente)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "Server proxy HTTP" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Nessun proxy" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Stile della barra degli strumenti:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Scegliere lo stile della barra degli strumenti" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "All'avvio di Midori:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Apri le nuove pagine in:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Identifica come" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Come essere identificati sul web" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Usa sempre il tipo di carattere di mia scelta" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "" "Preferisci le impostazioni utente degli stili di carattere a quelle dei siti" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Le impostazioni non possono essere caricate: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Il valore «%s» non è valido per %s" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valore di configurazione «%s» non valido" -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Impossibile applicare il foglio di stile: %s" -#: ../midori/midori-view.c:730 ../midori/midori-view.c:874 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Credi a questo sito" -#: ../midori/midori-view.c:872 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Sicurezza sconosciuta" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s vuole salvare un database HTML5." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Nega" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Permetti" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s vuole conoscere la propria posizione." -#: ../midori/midori-view.c:1328 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Errore - %s" -#: ../midori/midori-view.c:1329 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La pagina \"%s\" non può essere caricata." -#: ../midori/midori-view.c:1331 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Riprova" -#: ../midori/midori-view.c:1535 ../midori/midori-view.c:2621 +#: ../midori/midori-view.c:1505 +#, fuzzy, c-format +msgid "Oops - %s" +msgstr "Errore - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Qualcosa è andato storto con '%s'" + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Invia un messaggio a %s" -#: ../midori/midori-view.c:2409 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Aggiungi _motore di ricerca..." -#: ../midori/midori-view.c:2452 ../midori/midori-view.c:2756 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "Ispeziona _elemento" -#: ../midori/midori-view.c:2504 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Apri collegamento in una nuova sc_heda" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Apri collegamento in una scheda in primo _piano" -#: ../midori/midori-view.c:2509 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Apri collegamento in una scheda in secondo p_iano" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Apri collegamento in una nuova _finestra" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Apri il collegamento come applicazione _web" -#: ../midori/midori-view.c:2520 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "Copia l'indirizzo di de_stinazione" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "Sa_lva come…" -#: ../midori/midori-view.c:2535 +#: ../midori/midori-view.c:2653 +#, fuzzy +msgid "Open _Image in New Window" +msgstr "Apri immagine in nuova fi_nestra" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Apri _immagine in nuova scheda" -#: ../midori/midori-view.c:2538 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Copi_a immagine" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Salva i_mmagine" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Apri immagine nel _visualizzatore" -#: ../midori/midori-view.c:2551 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Copi_a indirizzo video" -#: ../midori/midori-view.c:2554 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Salva _video" -#: ../midori/midori-view.c:2554 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Scarica _video" -#: ../midori/midori-view.c:2580 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Cerca _con" -#: ../midori/midori-view.c:2609 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Cerca nel web" -#: ../midori/midori-view.c:2629 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Apri indirizzi in una nuova _scheda" -#: ../midori/midori-view.c:2676 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Apri _cornice in nuova scheda" -#: ../midori/midori-view.c:2892 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Apri o scarica file da %s" -#: ../midori/midori-view.c:2905 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Nome file: %s" -#: ../midori/midori-view.c:2910 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Tipo di file: \"%s\"" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo di file: %s (\"%s\")" -#: ../midori/midori-view.c:2949 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Dimensione: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2960 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Apri %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Controllo pagina - %s" -#: ../midori/midori-view.c:3985 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "La documentazione non è installata" -#: ../midori/midori-view.c:4061 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "Midori non salva alcun dato personale:" -#: ../midori/midori-view.c:4062 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Non sono salvati cronologia o cookie." -#: ../midori/midori-view.c:4063 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Le estensioni sono disabilitate." -#: ../midori/midori-view.c:4064 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "L'immagazzinamento HTML5, i database locali e le cache dell'applicazione " "sono disabilitati." -#: ../midori/midori-view.c:4065 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Midori impedisce ai siti web di tracciare l'utente:" -#: ../midori/midori-view.c:4066 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "Gli URL referenti sono limitati al nome host." -#: ../midori/midori-view.c:4067 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "Il prefetching DNS è disabilitato." -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "" "La lingua e il fuso orario di appartenenza non sono rivelati ai siti web." -#: ../midori/midori-view.c:4069 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "" "Flash e gli altri plugin di Netscape non possono essere elencati dai siti " "web." -#: ../midori/midori-view.c:4109 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "I numeri di versione tra parentesi indicano la versione usata durante " "l'esecuzione." -#: ../midori/midori-view.c:4153 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Caricamento pagina ritardato" -#: ../midori/midori-view.c:4154 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Caricamento ritardato a causa di un errore recente o delle preferenze di " "avvio" -#: ../midori/midori-view.c:4155 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Carica pagina" -#: ../midori/midori-view.c:4320 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Pagina vuota" -#: ../midori/midori-view.c:4534 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "_Duplica scheda" -#: ../midori/midori-view.c:4539 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" -msgstr "Mostra l'_etichetta nelle schede" +msgstr "Mostra l'_etichetta nella scheda" -#: ../midori/midori-view.c:4539 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" -msgstr "Mostra solo l'_icona nelle schede" +msgstr "Mostra solo l'_icona nella scheda" # acceleratore sulla h per evitare conflitti -#: ../midori/midori-view.c:4546 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Chiudi l'altra sc_heda" msgstr[1] "Chiudi le altre sc_hede" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5235 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "precedente" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5254 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "successiva" -#: ../midori/midori-view.c:5267 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Stampa immagini di sfondo" -#: ../midori/midori-view.c:5268 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Abilitare questa opzione per stampare le immagini di sfondo" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Opzioni" @@ -1493,132 +1499,127 @@ msgid "Startup" msgstr "Avvio" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "All'avvio di Midori:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Pagina iniziale:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Usa la pagina co_rrente" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Usa la pagina corrente come homepage" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Carattere" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Famiglia di caratteri proporzionale" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "" "Scegliere la famiglia predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "" "Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Caratteri a larghezza fissa" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "" "Dimensione dei caratteri del testo per visualizzare testi di larghezza " "predefinita" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "" "Dimensione dei caratteri utilizzati per visualizzare il testo di altezza " "fissa" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Dimensione minima caratteri" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Codifica preferita" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Carica immagini automaticamente" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Abilita controllo ortografico" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Abilita script" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Abilita il supporto a WebGL" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Abilita plugin di Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Ingrandimento testo e immagini" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Permetti agli script di aprire popup" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Abilitare questa opzione per consentire l'apertura automatica delle finestre " "di popup" -#: ../midori/midori-preferences.c:403 -msgid "Kinetic scrolling" -msgstr "Scorrimento per movimento" - -#: ../midori/midori-preferences.c:404 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Se durante lo scorrimento si deve tener conto della velocità del movimento" - -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Tasto centrale apre la selezione" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "" "Abilitare questa opzione per poter caricare un indirizzo da una selezione " "tramite il clic col tasto centrale" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Lampeggia la finestra se ci sono schede in secondo piano" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Lingue preferite" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1627,97 +1628,118 @@ "di pagine web multilingua, per esempio \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-" "fr;q=0.667\"" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Salva i file scaricati in:" #. Page "Interface" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Navigazione" +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Stile della barra degli strumenti:" + #: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Apri le nuove pagine in:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Comportamento della nuova scheda" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Pulsante di chiusura schede" -#: ../midori/midori-preferences.c:451 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Mostra sempre le schede" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Apri schede dopo quella corrente" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Abilitare questa opzione per aprire le nuove schede dopo la scheda attuale " "oppure disabilitarla per aprirle dopo l'ultima" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Apri schede sullo sfondo" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Editor di testo" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Aggregatore notizie" #. Page "Network" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Rete" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Server proxy" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Nome host" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Porta" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Tipi di proxy supportati" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:502 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Cache web" -#: ../midori/midori-preferences.c:503 ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "La dimensione massima della cache delle pagine su disco" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:528 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Identifica come" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Elimina i cookie obsoleti dopo:" -#: ../midori/midori-preferences.c:532 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Numero massimo di giorni per cui possono essere validi i cookie" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Accettare i cookie solo dai siti visitati" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Blocca i cookie inviati da siti di terze parti" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1725,74 +1747,74 @@ "I cookie immagazzinano i dati di accesso, i giochi salvati o i profili " "dell'utente per scopi pubblicitari." -#: ../midori/midori-preferences.c:552 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Abilita la cache delle applicazioni web offline" -#: ../midori/midori-preferences.c:555 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Abilita il supporto allo storage locale HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Scarta i dettagli del referer inviati ai siti web" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Se il \"referer\" deve essere accorciato al nome host" -#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Elimina le pagine dalla cronologia dopo:" -#: ../midori/midori-preferences.c:566 ../midori/midori-preferences.c:569 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia" -#: ../midori/midori-preferences.c:606 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Estensioni" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Aggiungi motore di ricerca" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Modifica motore di ricerca" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Descrizione:" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Indirizzo:" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "Parame_tro:" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Gestione motori di ricerca" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Usa come _predefinito" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "I motori di ricerca non possono essere caricati. %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "I motori di ricerca non possono essere salvati. %s" @@ -1840,6 +1862,10 @@ msgid "Could not run external program." msgstr "Non è possibile eseguire l'applicazione esterna." +#: ../midori/sokoke.c:560 +msgid "Invalid URI" +msgstr "URI non valido" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1861,28 +1887,28 @@ msgid "Close Findbar" msgstr "Chiudi barra ricerca" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "Il file «%s» è stato trasferito." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Trasferimento completato" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Cancella tutto" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Alcuni file sono stati scaricati" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Chiudi Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "I trasferimenti verranno cancellati se Midori viene chiuso" @@ -2012,7 +2038,7 @@ msgid "Animation frames are broken" msgstr "I fotogrammi dell'animazione sono danneggiati" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:422 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La proprietà \"%s\" non è valida per %s" @@ -2030,29 +2056,29 @@ msgid "None" msgstr "Nessuno" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:688 msgid "1 hour" msgstr "1 ora" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:689 msgid "1 day" msgstr "1 giorno" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:690 msgid "1 week" msgstr "1 settimana" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:691 msgid "1 month" msgstr "1 mese" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "1 year" msgstr "1 anno" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Preferenze per %s" @@ -2069,7 +2095,7 @@ msgid "Configure Advertisement filters" msgstr "Configurazione dei filtri per gli avvisi pubblicitari" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2079,27 +2105,27 @@ "testo e fare clic su \"Aggiungi\" per aggiungerlo alla lista. È possibile " "trovare altre liste su %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Modifica regola" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Regola:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Bl_occa immagine" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Bl_occa collegamento" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Blocca avvisi pubblicitari" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Blocca gli avvisi pubblicitari in accordo alla lista dei filtri" @@ -2162,11 +2188,11 @@ #: ../extensions/addons.c:566 ../extensions/addons.c:650 msgid "Open Target Folder" -msgstr "Apri cartella di destinazione" +msgstr "Apre la cartella di destinazione" #: ../extensions/addons.c:632 msgid "Add new addon" -msgstr "Aggiunge nuovo addon" +msgstr "Aggiunge un nuovo addon" #: ../extensions/addons.c:658 msgid "Remove selected addon" @@ -2185,11 +2211,11 @@ msgid "Support for userscripts and userstyles" msgstr "Supporto per script utente e stili utente" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Schede colorate" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Colora ogni etichetta in modo differente" @@ -2212,11 +2238,11 @@ #: ../extensions/cookie-manager/cookie-manager-page.c:120 msgid "Expand All" -msgstr "Espandi tutto" +msgstr "Espande tutto" #: ../extensions/cookie-manager/cookie-manager-page.c:127 msgid "Collapse All" -msgstr "Riduci tutto" +msgstr "Riduce tutto" #: ../extensions/cookie-manager/cookie-manager-page.c:575 msgid "Do you really want to delete all cookies?" @@ -2270,7 +2296,7 @@ "Cookie: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Nome" @@ -2506,69 +2532,69 @@ msgid "Failed to select suggestions\n" msgstr "Impossibile selezionare i suggerimenti\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Sono presenti schede non viste" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Lista-cronologia" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Comportamento alla chiusura della scheda " -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Non fare niente" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Vai all'ultima scheda visitata" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Vai alla scheda più recente" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:431 msgid "Next new Tab (History List)" msgstr "Nuova scheda successiva (lista cronologia)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:432 msgid "Next new tab from history" msgstr "Nuova scheda successiva dalla cronologia" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:441 msgid "Previous new Tab (History List)" msgstr "Nuova scheda precedente (lista cronologia)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:442 msgid "Previous new tab from history" msgstr "Nuova scheda precedente dalla cronologia" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:451 msgid "Display tab in background (History List)" msgstr "Visualizza scheda in secondo piano (lista cronologia)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:452 msgid "Display the current selected tab in background" msgstr "Visualizza la scheda selezionata in secondo piano" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:579 msgid "History List" msgstr "Lista cronologia" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:580 msgid "Move to the last used tab when switching or closing tabs" msgstr "" "Va all'ultima scheda utilizzata quando si cambia o si chiude una scheda" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Gesti del mouse" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Permette di controllare Midori con i movimenti del mouse" @@ -2581,7 +2607,8 @@ msgstr "Personalizzazione delle scorciatoie da tastiera" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." +#, fuzzy +msgid "Customize Sh_ortcuts…" msgstr "Personalizza sc_orciatoie..." #: ../extensions/shortcuts.c:312 @@ -2622,15 +2649,15 @@ "Permette di attivare o disattivare facilmente determinate funzionalità sulle " "pagine internet" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" -msgstr "Pannello a scheda" +msgstr "Pannello delle schede" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Pannello _a scheda" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Mostra le schede in un pannello verticale" @@ -2642,11 +2669,11 @@ msgid "New tabs have no label by default" msgstr "Le nuove schede non hanno alcuna etichetta di default" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizza la barra degli strumenti" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2654,23 +2681,23 @@ "Selezionare gli oggetti da visualizzare nella barra degli strumenti. Gli " "oggetti possono essere riordinati tramite trascinamento." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Oggetti disponibili" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Oggetti visualizzati" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "Personalizza barra degli s_trumenti..." -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Editor della barra degli strumenti" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "" "Permette di modificare facilmente la disposizione della barra degli strumenti" @@ -2723,9 +2750,9 @@ msgid "Open tabs" msgstr "Apre schede" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" -msgstr "" +msgstr "Più tab aperte..." #: ../midori/midori-history.c:25 #, c-format @@ -2769,35 +2796,35 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "I segnalibri non possono essere salvati. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Non è disponibile nessun certificato di root. I certificati SSL non possono " "essere verificati." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Le impostazioni non possono essere salvate. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:476 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La sessione non può essere caricata: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "La sessione non può essere salvata. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:128 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Il cestino non può essere salvato. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:323 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." @@ -2806,270 +2833,294 @@ "usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per " "risolvere il problema." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:333 msgid "Modify _preferences" msgstr "Modifica _preferenze" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:337 msgid "Disable all _extensions" msgstr "Disabilita tutte le _estensioni" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:346 msgid "Show a dialog after Midori crashed" msgstr "" "Abilitare questa opzione per mostrare una finestra nel caso Midori si sia " "chiuso inaspettatamente" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:351 msgid "Discard old tabs" msgstr "Scarta le schede vecchie" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:359 +#, fuzzy +msgid "Show last crash _log" +msgstr "Mostra finestra di errore" + +#: ../midori/midori-frontend.c:428 msgid "An instance of Midori is already running but not responding.\n" msgstr "Un'istanza di Midori è già in esecuzione, ma non risponde.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:461 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "I segnalibri non possono essere caricati: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:492 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Il cestino non può essere caricato: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:500 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "La cronologia non può essere caricata: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:511 msgid "The following errors occured:" msgstr "Si sono presentati i seguenti errori:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:516 msgid "_Ignore" msgstr "_Ignora" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "Errore SQL: %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "Accetta" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "Accetta per la sessione" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "Blocca" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, fuzzy, c-format msgid "Could not open database of extenstion: %s" msgstr "Errore nella connessione al database: %s\n" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, fuzzy, c-format msgid "Failed to execute database statement: %s" msgstr "Errore nell'esecuzione della richiesta al database: %s\n" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Eliminare veramente tutti i permessi dei cookie?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Eliminare tutti i permessi dei cookie?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." -msgstr "Questa operazione eliminerà tutti i permessi dei cookie. Verrà richiesto di nuovo il permesso per ogni sito visitato." +msgstr "" +"Questa operazione eliminerà tutti i permessi dei cookie. Verrà richiesto di " +"nuovo il permesso per ogni sito visitato." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Gestore dei permessi dei cookie" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "Configura i permessi dei cookie" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " "policies by marking the entries and clicking on Delete.You can also " "add a policy for a domain manually by entering the domain below, choosing " "the policy and clicking on Add." -msgstr "" +msgstr "Di seguito è riportata una lista di siti web e delle regole ad essi associate. È possibile cancellare una regola selezionando una entry e cliccando su Cancella. È anche possibile aggiungere manualmente una regola associata ad un dominio inserendo il nome di tale dominio qui sotto, scegliendo la regola e cliccando su Aggiungi." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "Dominio" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "Politica" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "Rimuovi _tutto" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." -msgstr "Si è verificato un errore che impedisce al gestore dei permessi dei cookie di continuare; si consiglia di disabilitarlo." +msgstr "" +"Si è verificato un errore che impedisce al gestore dei permessi dei cookie " +"di continuare; si consiglia di disabilitarlo." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "Errore nell'estensione di gestione dei permessi dei cookie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "Ragione" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "Impossibile ottenere il percorso alla configurazione dell'estensione" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "Impossibile creare la cartella di configurazione per l'estensione: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "Impossibile creare la cartella di configurazione per l'estensione" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 #, fuzzy msgid "Could not open database of extension." msgstr "Errore nella connessione al database: %s\n" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "Impossibile impostare la struttura del database dell'estensione." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "Conferma salvataggio del cookie" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "Fino al termine della sessione." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "Il sito %s vuole salvare %s cookie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "Il sito %s vuole salvare un cookie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." -msgstr "" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 -msgid "Path" -msgstr "Percorso" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 -msgid "Value" -msgstr "Valore" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 -msgid "Expire date" -msgstr "Data di scadenza" +msgstr "Più siti vogliono salvare complessivamente %d cookie." -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 msgid "_Accept" msgstr "_Accetta" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 msgid "Accept for this _session" msgstr "Accetta per questa _sessione" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 msgid "De_ny" msgstr "Ne_ga" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "Nega ques_ta volta" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 +msgid "Path" +msgstr "Percorso" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 +msgid "Value" +msgstr "Valore" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 +msgid "Expire date" +msgstr "Data di scadenza" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "Istanza estensione" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "Istanza applicazione" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "Istanza database" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "Percorso del Database" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 +#, fuzzy msgid "" "If true this extension ask for policy for every unknown domain.If false this " -"extension uses the global cookie policy set in midori settings." -msgstr "Se vero, l'estensione chiede il comportamento da adottare per ogni dominio sconosciuto. Se falso questa estensione utilizza il comportamento globale per i cookie definito nelle impostazioni di Midori." +"extension uses the global cookie policy set in Midori settings." +msgstr "" +"Se vero, l'estensione chiede il comportamento da adottare per ogni dominio " +"sconosciuto. Se falso questa estensione utilizza il comportamento globale " +"per i cookie definito nelle impostazioni di Midori." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "Sconosciuto" @@ -3081,6 +3132,25 @@ msgid "Manage cookie permission per site" msgstr "Gestisce i permessi dei cookie per sito" +#~ msgid "Custom..." +#~ msgstr "Personalizzato…" + +#~ msgid "Confirm storing cookie" +#~ msgstr "Conferma salvataggio del cookie" + +#~ msgid "Writing failed." +#~ msgstr "Errore di scrittura." + +#~ msgid "What to identify as to web pages" +#~ msgstr "Come essere identificati sul web" + +#~ msgid "Kinetic scrolling" +#~ msgstr "Scorrimento per movimento" + +#~ msgid "Whether scrolling should kinetically move according to speed" +#~ msgstr "" +#~ "Se durante lo scorrimento si deve tener conto della velocità del movimento" + #~ msgid "_Window" #~ msgstr "Fi_nestra" @@ -3211,9 +3281,6 @@ #~ msgid "The homepage" #~ msgstr "La pagina iniziale" -#~ msgid "Show crash dialog" -#~ msgstr "Mostra finestra di errore" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" @@ -3689,9 +3756,6 @@ #~ msgid "Keep one or multiple pages open in parallel to your tabs" #~ msgstr "Mantiene una o più pagine aperte in parallelo alla schede" -#~ msgid "Show Blank page" -#~ msgstr "Mostra una pagina vuota" - #~ msgid "%d%% loaded" #~ msgstr "%d%% caricato" @@ -3826,9 +3890,6 @@ #~ msgid "Open _Link" #~ msgstr "Apri co_llegamento" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Apri immagine in nuova fi_nestra" - #~ msgid "Enable developer tools" #~ msgstr "Abilita strumenti di sviluppo" diff -Nru midori-0.4.9/po/ja.po midori-0.5.0/po/ja.po --- midori-0.4.9/po/ja.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/ja.po 2013-04-04 20:31:20.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 18:56+0900\n" -"PO-Revision-Date: 2013-02-27 19:27+0900\n" +"POT-Creation-Date: 2013-03-22 21:48+0900\n" +"PO-Revision-Date: 2013-03-22 21:56+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -18,8 +18,8 @@ "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/midori.desktop.in.h:1 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3856 ../midori/sokoke.c:561 msgid "Midori" msgstr "Midori" @@ -39,11 +39,11 @@ msgid "Internet;WWW;Explorer" msgstr "インターネット;WWW;エクスプローラー" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1287 msgid "New Tab" msgstr "新しいタブ" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1284 msgid "New Window" msgstr "新しいウィンドウ" @@ -55,7 +55,7 @@ msgid "Midori Private Browsing" msgstr "Midori プライベートブラウジング" -#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4176 msgid "Private Browsing" msgstr "プライベートブラウジング" @@ -163,199 +163,199 @@ msgid "Error: \"gdb\" can't be found\n" msgstr "エラー: \"gdb\" が見つかりません\n" -#: ../midori/main.c:181 +#: ../midori/main.c:182 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:183 +#: ../midori/main.c:184 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:338 +#: ../midori/main.c:339 msgid "An unknown error occured" msgstr "未知のエラーが発生しました" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 +#: ../midori/midori-app.c:1128 ../midori/midori-browser.c:540 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1350 ../midori/midori-browser.c:6041 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1351 msgid "Add Boo_kmark" msgstr "ブックマークに追加(_K)" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1352 msgid "_Extensions" msgstr "エクステンション(_E)" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1353 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "履歴(_H)" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1354 msgid "_Userscripts" msgstr "ユーザースクリプト(_U)" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1355 msgid "User_styles" msgstr "ユーザースタイル(_S)" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1356 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1357 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1358 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1359 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:5180 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1361 msgid "New _Folder" msgstr "新しいフォルダー(_F)" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1416 ../midori/midori-app.c:1419 +#: ../midori/midori-app.c:1422 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:524 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:549 ../midori/midori-array.c:588 +#: ../midori/midori-array.c:612 ../midori/midori-array.c:622 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:631 msgid "Unrecognized bookmark format." msgstr "認識できないブックマーク形式です。" # tooltip -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5316 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5327 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5274 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5271 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:616 #, c-format msgid "%s (Private Browsing)" msgstr "%s (プライベートブラウジング)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:726 ../midori/midori-browser.c:768 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "ブックマーク" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:822 msgid "New folder" msgstr "新しいフォルダー" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:822 msgid "Edit folder" msgstr "フォルダーの編集" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:824 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:824 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:858 msgid "Type a name for this bookmark and choose where to keep it." msgstr "このブックマークの名前のと追加先を指定してください。" -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:914 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:920 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:928 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1044 ../midori/midori-browser.c:4423 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1054 msgid "Save associated _resources" msgstr "関連リソースも保存する(_R)" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1284 msgid "A new window has been opened" msgstr "新しいウィンドウが開かれました" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1287 msgid "A new tab has been opened" msgstr "新しいタブが開かれました" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1305 msgid "Error opening the image!" msgstr "画像を開く際にエラーが発生しました" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1306 msgid "Can not open selected image in a default viewer." msgstr "デフォルトの画像ビューアーでは選択された画像を開けません。" -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1312 msgid "Error downloading the image!" msgstr "画像をダウンロードする際にエラーが発生しました" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1313 msgid "Can not download selected image." msgstr "選択された画像をダウンロードできません。" -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1372 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2344 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2472 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -363,525 +363,525 @@ "上記 URI を使用するにはフィードリーダーを開いてください。通常「新規に購読」、「新規ニュースフィード」などのメニューやボタンがあります。\n" "もしくは Midori の設定のアプリケーションタブでフィードリーダーを指定してください。次にニュースフィードアイコンをクリックした時に自動的に追加されます。" -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2478 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2510 ../midori/midori-browser.c:5340 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3036 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "空です" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3418 ../midori/midori-browser.c:3419 msgid "Toggle text cursor navigation" msgstr "テキストカーソルナビゲーションへの切り替え" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3421 msgid "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in all websites." msgstr "F7 キーでキャレットブラウジングに切り替えます。有効にすると、テキストカーソルがすべてのウェブサイト上に表示されます。" -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3424 msgid "_Enable Caret Browsing" msgstr "キャレットブラウジングを有効にする(_E)" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3840 ../midori/midori-browser.c:5788 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4155 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4162 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4165 ../midori/midori-view.c:2771 +#: ../midori/midori-view.c:4654 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4254 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4255 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4256 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4257 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4258 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4259 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4260 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4278 msgid "Import bookmarks…" msgstr "ブックマークのインポート…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4281 ../midori/midori-browser.c:5345 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4292 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4357 msgid "Import from XBEL or HTML file" msgstr "XBEL または HTML ファイルからインポート" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4385 msgid "Import from a file" msgstr "ファイルからインポート" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4397 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4428 msgid "XBEL Bookmarks" msgstr "XBEL ブックマーク" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4433 msgid "Netscape Bookmarks" msgstr "Netscape ブックマーク" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4447 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Midori は XBEL (*.xbel) および Netscape (*.html) へのみエクスポートできます" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4462 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4678 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザー" -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4679 msgid "See about:version for version info." msgstr "バージョン情報は about:version をご覧ください。" -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4681 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "このライブラリはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降のいずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4716 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5178 msgid "_File" msgstr "ファイル(_F)" # tooltip -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5181 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5184 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5186 msgid "New P_rivate Browsing Window" msgstr "新しいプライベートブラウジングウィンドウ(_R)" # tooltip -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5190 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5192 msgid "_Save Page As…" msgstr "名前を付けてページを保存(_S)…" # tooltip -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5193 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5195 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5199 msgid "Create _Launcher" msgstr "ランチャーの作成(_L)" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5202 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5208 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5209 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5211 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5215 msgid "_Share" msgstr "共有(_S)" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5216 msgid "Share this page" msgstr "このページを共有します" # tooltip -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5220 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5223 msgid "Close a_ll Windows" msgstr "すべてのウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5226 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5249 msgid "_Find…" msgstr "検索(_F)…" # tooltip -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5250 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5252 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5255 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5259 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5261 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5262 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5267 msgid "Reload page without caching" msgstr "ページをキャッシュせずに再読み込み" # tooltip -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5277 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5280 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5284 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5286 msgid "View So_urce" msgstr "ソースを表示(_U)" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5289 msgid "Ca_ret Browsing" msgstr "キャレットブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5293 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5295 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5298 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5301 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5304 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5307 msgid "_Readable" msgstr "読み込み可(_R)" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5310 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5313 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5320 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5329 msgid "_Homepage" msgstr "ホームページ(_H)" # tooltip -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5330 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5332 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5335 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5342 msgid "Add a new _folder" msgstr "新しいフォルダーの追加(_F)" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5348 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5351 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5354 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5357 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5361 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5364 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5366 msgid "Move Tab to _first position" msgstr "タブを先頭に移動(_F)" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5368 msgid "Move Tab _Backward" msgstr "後ろのタブへ移動(_B)" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5370 msgid "_Move Tab Forward" msgstr "前のタブへ移動(_M)" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5372 msgid "Move Tab to _last position" msgstr "タブを最後尾に移動(_L)" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5375 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5378 msgid "Focus _Next view" msgstr "次のビューをフォーカス(_N)" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5381 msgid "Only show the Icon of the _Current Tab" msgstr "現在のタブのアイコンのみ表示(_C)" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5384 msgid "_Duplicate Current Tab" msgstr "現在のタブの複製(_D)" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5387 msgid "Close Ot_her Tabs" msgstr "他のタブを閉じる(_H)" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5390 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5393 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5395 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5398 msgid "_Report a Problem…" msgstr "問題を報告(_R)…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5403 ../midori/midori-browser.c:6060 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5410 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5414 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5418 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5419 msgid "Sidepanel" msgstr "サイドパネル" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5422 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5426 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "中国語繁体字 (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5441 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "中国語簡体字 (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5445 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5454 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5457 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5460 msgid "Custom…" msgstr "カスタム…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:5966 msgid "_Separator" msgstr "セパレーター(_S)" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:5973 msgid "_Location…" msgstr "場所(_L)…" # tooltip -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:5975 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:5997 msgid "_Web Search…" msgstr "ウェブ検索(_W)…" # tooltip -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:5999 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6026 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" # tooltip -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6043 msgid "Show the saved bookmarks" msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6076 msgid "_Tabs" msgstr "タブ(_T)" # tooltip -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6078 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6092 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6094 msgid "Menu" msgstr "メニュー" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6863 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -936,24 +936,24 @@ msgid "Self-signed" msgstr "自己署名" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "セキュリティ詳細" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "貼り付けて開く(_R)" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "未検証" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "検証済および暗号化接続" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "公開、非暗号化接続" @@ -973,145 +973,135 @@ msgid "Align sidepanel to the left" msgstr "サイドパネルを左側に配置します" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "スピードダイアルを表示" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "ホームページを表示" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:344 msgid "Show last open tabs" msgstr "最後に開いたタブを表示" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:343 msgid "Show last tabs without loading" msgstr "最後のタブを読み込まずに表示" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "空白ページを表示" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "デフォルトの検索エンジンを表示" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "カスタムページを表示" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:158 ../midori/midori-websettings.c:234 #: ../katze/katze-utils.c:603 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" -msgstr "新しいタブ" +msgstr "新しいタブに表示" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" -msgstr "新しいウィンドウ" +msgstr "新しいウィンドウに表示" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" -msgstr "現在のタブ" +msgstr "現在のタブに表示" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "小さいアイコン" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME または環境変数)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "HTTP プロキシサーバー" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "プロキシサーバーなし" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "ツールバー方式:" - # tooltip -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Midori を起動した時:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "新しくページを開く時:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "識別名" - -# tooltip -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "ウェブページに報告するユーザーエージェントの識別名を指定します" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "常にこの設定を使用する" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "ウェブサイトで指定されているフォントより本設定を優先します" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/midori-websettings.c:1365 +#: ../midori/midori-websettings.c:1430 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" @@ -1121,265 +1111,269 @@ msgid "Failed to inject stylesheet: %s" msgstr "スタイルシートのインジェクションに失敗しました: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:767 ../midori/midori-view.c:895 msgid "Trust this website" msgstr "このウェブサイトを信用する" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:893 msgid "Security unknown" msgstr "セキュリティ不明" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1194 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s は HTML5 データベースの保存を要求しています。" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Deny" msgstr "許可しない(_D)" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1198 ../midori/midori-view.c:1230 msgid "_Allow" msgstr "許可する(_A)" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1226 #, c-format msgid "%s wants to know your location." msgstr "%s はあなたの場所を知ろうとしています。" -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1357 #, c-format msgid "Error - %s" msgstr "エラー - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1358 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "ページ '%s' を読み込めませんでした" -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1360 msgid "Try again" msgstr "再試行" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1620 ../midori/midori-view.c:2712 #, c-format msgid "Send a message to %s" msgstr "メッセージを送信します 宛先: %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2497 msgid "Add _search engine..." msgstr "検索エンジンの追加(_S)..." -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2540 ../midori/midori-view.c:2847 msgid "Inspect _Element" msgstr "要素の検証(_E)" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2592 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2596 msgid "Open Link in _Foreground Tab" msgstr "リンクをフォアグラウンドのタブで開く(_F)" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2597 msgid "Open Link in _Background Tab" msgstr "リンクをバックグラウンドのタブで開く(_B)" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2600 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2603 msgid "Open Link as Web A_pplication" msgstr "ウェブアプリケーションとして実行する(_P)" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2608 msgid "Copy Link de_stination" msgstr "リンク先をコピー(_S)" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2614 msgid "Save _As…" msgstr "名前を付けてページを保存(_A)…" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2624 +msgid "Open _Image in New Window" +msgstr "新しいウィンドウで画像を開く(_I)" + +#: ../midori/midori-view.c:2625 msgid "Open _Image in New Tab" msgstr "画像を新しいタブで開く(_I)" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2629 msgid "Copy Im_age" msgstr "画像をコピー(_A)" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2632 msgid "Save I_mage" msgstr "画像を保存(_M)" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2635 msgid "Open in Image _Viewer" msgstr "画像ビューアーで開く(_V)" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2642 msgid "Copy Video _Address" msgstr "動画のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2645 msgid "Save _Video" msgstr "動画を保存(_V)" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2645 msgid "Download _Video" msgstr "動画をダウンロード(_V)" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2671 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2700 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2720 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2767 msgid "Open _Frame in New Tab" msgstr "フレームを新しいタブで開く(_F)" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:2984 #, c-format msgid "Open or download file from %s" msgstr "%s を開く、またはダウンロードします" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:2997 #, c-format msgid "File Name: %s" msgstr "ファイル名: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3002 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3004 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3041 #, c-format msgid "Size: %s" msgstr "サイズ: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3052 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3581 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4101 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4177 msgid "Midori doesn't store any personal data:" msgstr "Midori はあらゆる個人データを保存しません:" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4178 msgid "No history or web cookies are being saved." msgstr "履歴あるいはウェブ Cookie は保存されません。" -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4179 msgid "Extensions are disabled." msgstr "エクステンションは無効になります。" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4180 msgid "HTML5 storage, local database and application caches are disabled." msgstr "HTML5 ストレージ、ローカルデータベース、およびアプリケーションキャッシュは無効になります。" -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4181 msgid "Midori prevents websites from tracking the user:" msgstr "Midori はウェブサイトによるユーザーのトラッキングを阻止します:" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4182 msgid "Referrer URLs are stripped down to the hostname." msgstr "リファラー URL はホスト名に短縮されます。" -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4183 msgid "DNS prefetching is disabled." msgstr "DNS プリフェッチは無効になります。" -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4184 msgid "The language and timezone are not revealed to websites." msgstr "言語およびタイムゾーンはウェブサイトには通知されません。" -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4185 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "Flash およびその他の Netscape プラグインはウェブサイトには記録されません。" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4225 msgid "Version numbers in brackets show the version used at runtime." msgstr "カッコ内のバージョン番号は実行中に使用されているバージョンを表しています。" -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4275 msgid "Page loading delayed" msgstr "読み込みが保留されたページ" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4276 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "最近のクラッシュか起動設定により読み込みが保留されています。" -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4277 msgid "Load Page" msgstr "ページを読み込む" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4444 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4658 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Label" msgstr "タブラベルの表示(_L)" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4663 msgid "Show Tab _Icon Only" msgstr "タブアイコンのみ表示(_I)" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4670 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "他のタブを閉じる(_H)" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5359 msgid "previous" msgstr "前" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5378 msgid "next" msgstr "次" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5391 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5392 msgid "Whether background images should be printed" msgstr "印刷する時に背景画像も印刷します" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5417 msgid "Features" msgstr "機能" @@ -1475,246 +1469,271 @@ msgid "Startup" msgstr "起動" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Midori を起動した時:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "ホームページ:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "現在のページを使用(_C)" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "現在のページをホームページにする" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "フォント" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "プロポーショナルフォントファミリ" # tooltip -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "文字表示で使用するデフォルトのフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "文字表示で使用するデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "等幅フォントファミリ" # tooltip -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "等幅文字表示で使用するフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "等幅文字表示で使用するフォントのサイズを指定します" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "最小フォントサイズ" # tooltip -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "文字表示で使用する最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "文字のエンコーディング" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "スペルチェックを有効にする" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "WebGL サポートを有効にする" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:389 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Netscape プラグインを有効にする" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:394 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:397 msgid "Allow scripts to open popups" msgstr "ポップアップを表示するスクリプトを許可する" # tooltip -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:398 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:401 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" # tooltip -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:402 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:406 msgid "Flash window on background tabs" msgstr "バックグラウンドでタブが開いた時にウィンドウを点滅する" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:411 msgid "Preferred languages" msgstr "言語の優先度" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:415 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "複数言語で構成されたウェブページを描画する際の言語の優先度をカンマで区切って指定します。例: \"ja\"、\"en-us\"、\"ja;q=1.0, en-us;q=0.667\" など" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:417 msgid "Save downloaded files to:" msgstr "ダウンロードファイルの保存先:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:424 msgid "Browsing" msgstr "ブラウジング" +#: ../midori/midori-preferences.c:428 +msgid "Toolbar Style:" +msgstr "ツールバー方式:" + +#: ../midori/midori-preferences.c:433 +msgid "Open new pages in:" +msgstr "新しくページを開く時:" + #: ../midori/midori-preferences.c:437 +msgid "New tab behavior:" +msgstr "新しいタブを開いた時:" + +#: ../midori/midori-preferences.c:442 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:446 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:450 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" # tooltip -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:451 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:454 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:458 msgid "Text Editor" msgstr "テキストエディター" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:463 msgid "News Aggregator" msgstr "フィードリーダー" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:470 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:472 msgid "Proxy server" msgstr "プロキシサーバー" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:477 msgid "Hostname" msgstr "ホスト名" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:485 msgid "Port" msgstr "ポート" +#: ../midori/midori-preferences.c:498 +msgid "Supported proxy types:" +msgstr "サポートするプロキシのタイプ:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:518 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "ウェブキャッシュ" # tooltip -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:519 ../midori/midori-preferences.c:522 msgid "The maximum size of cached pages on disk" msgstr "ディスクのキャッシュページの最大サイズを指定します" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:524 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:531 +msgid "Identify as" +msgstr "識別名" + +#: ../midori/midori-preferences.c:546 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:548 msgid "Delete old Cookies after:" msgstr "古い Cookie を削除:" # tooltip -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:550 ../midori/midori-preferences.c:553 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大日数です" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:557 msgid "Only accept Cookies from sites you visit" msgstr "訪問したウェブサイトからの Cookie のみ受け入れる" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:558 msgid "Block cookies sent by third-party websites" msgstr "サードパーティウェブサイトから送られた Cookie はブロックします" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:563 msgid "Cookies store login data, saved games, or user profiles for advertisement purposes." msgstr "Cookie には、ログインデータやゲームデータ、広告用のユーザープロファイルなどが格納されます。" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:570 msgid "Enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にする" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:573 msgid "Enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にする" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:577 msgid "Strip referrer details sent to websites" msgstr "外部サイトへ送るリファラーの詳細情報を除去する" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:579 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "\"Referer\" ヘッダーはホスト名に短縮されます" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:582 msgid "Delete pages from history after:" msgstr "履歴から古いページを削除:" # tooltip -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:584 ../midori/midori-preferences.c:587 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大日数です" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:624 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "エクステンション" @@ -1803,6 +1822,10 @@ msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" +#: ../midori/sokoke.c:561 +msgid "Invalid URI" +msgstr "不正な URI" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1824,28 +1847,28 @@ msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "ファイル '%s' をダウンロードしました。" -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "転送完了" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "すべてクリア" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "ファイルのダウンロード中です" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "Midori を終了(_Q)" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Midori を終了すると転送がキャンセルされます。" @@ -1979,7 +2002,7 @@ msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:422 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" @@ -1997,23 +2020,23 @@ msgid "None" msgstr "なし" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:688 msgid "1 hour" msgstr "1 時間以上過去" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:689 msgid "1 day" msgstr "1 日以上過去" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:690 msgid "1 week" msgstr "1 週間以上過去" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:691 msgid "1 month" msgstr "1 ヶ月以上過去" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "1 year" msgstr "1 年以上過去" @@ -2036,33 +2059,33 @@ msgid "Configure Advertisement filters" msgstr "広告フィルターの設定" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "リストに追加するには、フィルターリストのアドレスを入力し \"追加\" ボタンをクリックしてください。フィルターリストは %s で見つけることができます。" -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "ルールの編集" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "ルール(_R):" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "画像をブロック(_O)" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "リンクをブロック(_O)" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "広告ブロッカー" # description -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "フィルターリストに登録された広告をブロックします" @@ -2734,76 +2757,76 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。" -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:454 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:128 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:314 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/midori-frontend.c:322 +#: ../midori/midori-frontend.c:324 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:328 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" # tooltip -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:337 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:342 msgid "Discard old tabs" msgstr "以前のタブを破棄" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:406 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:439 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:470 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:478 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:489 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:494 msgid "_Ignore" msgstr "無視(_I)" @@ -3031,6 +3054,10 @@ msgid "Manage cookie permission per site" msgstr "サイトごとに Cookie のパーミッションを管理します。" +# tooltip +#~ msgid "What to identify as to web pages" +#~ msgstr "ウェブページに報告するユーザーエージェントの識別名を指定します" + #~ msgid "Writing failed." #~ msgstr "書き込みに失敗しました。" diff -Nru midori-0.4.9/po/ko.po midori-0.5.0/po/ko.po --- midori-0.4.9/po/ko.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/ko.po 2013-04-04 20:31:20.000000000 +0000 @@ -3,78 +3,78 @@ # This file is distributed under the same license as the midori package. # Seo Sanghyeon 2009 # Kim Boram 2009-2012 -# +# # Note: Report-Mstid-Bugs-To에는 xfce-i18n 를 넣습니다. # Lauguage에는 소문자로 ko를 넣습니다. -# +# # Please write your name and e-mail into header description and # "translator-credits" if you update this translation script. -# +# # ex ) msgstr "" # "Gil-dong Hong \n" # "YourName Kim " -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 18:44+0900\n" -"PO-Revision-Date: 2013-02-28 09:39+0900\n" +"POT-Creation-Date: 2013-03-27 07:12+0000\n" +"PO-Revision-Date: 2013-03-18 01:02+0900\n" "Last-Translator: Kim Boram \n" "Language-Team: Kim Boram \n" -"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.5.4\n" -#: ../data/midori.desktop.in.h:1 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 -msgid "Midori" -msgstr "미도리" +#: ../data/midori.desktop.in.h:1 +msgid "Browse the Web" +msgstr "웹 찾아보기" #: ../data/midori.desktop.in.h:2 -msgid "Web Browser" -msgstr "웹 브라우저" +msgid "Internet;WWW;Explorer" +msgstr "인터넷;WWW;익스플로러" -#: ../data/midori.desktop.in.h:3 -msgid "Midori Web Browser" -msgstr "미도리 웹 브라우저" +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 +msgid "Midori" +msgstr "미도리" #: ../data/midori.desktop.in.h:4 -msgid "Browse the Web" -msgstr "웹 찾아보기" +msgid "Midori Web Browser" +msgstr "미도리 웹 브라우저" #: ../data/midori.desktop.in.h:5 -msgid "Internet;WWW;Explorer" -msgstr "인터넷;WWW;익스플로러" +msgid "New Private Browsing Window" +msgstr "새 사생활 보호 모드 창" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "새 탭" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "새 창" #: ../data/midori.desktop.in.h:8 -msgid "New Private Browsing Window" -msgstr "새 사생활 보호 모드 창" +msgid "Web Browser" +msgstr "웹 브라우저" #: ../data/midori-private.desktop.in.h:1 msgid "Midori Private Browsing" msgstr "미도리 개인 정보 보호 모드" -#: ../data/midori-private.desktop.in.h:2 ../midori/midori-view.c:4081 -msgid "Private Browsing" -msgstr "사생활 보호 모드" - -#: ../data/midori-private.desktop.in.h:3 +#: ../data/midori-private.desktop.in.h:2 msgid "Open a new private browsing window" msgstr "새 사생활 보호 모드 창 열기" +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 +msgid "Private Browsing" +msgstr "사생활 보호 모드" + #: ../midori/main.c:63 #, c-format msgid "Snapshot saved to: %s\n" @@ -157,202 +157,207 @@ msgid "SECONDS" msgstr "[초]" -#: ../midori/main.c:155 -#, c-format +#: ../midori/main.c:147 msgid "Error: \"gdb\" can't be found\n" msgstr "오류: \"gdb\"를 찾을 수 없습니다.\n" -#: ../midori/main.c:181 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "코멘트, 제안, 버그 등을 이곳에 보고해 주십시오:" -#: ../midori/main.c:183 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "다음에서 새 버전 검색:" -#: ../midori/main.c:338 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "알 수 없는 오류가 발생했습니다." -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "기대하지 않은 동작 '%s'." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6116 msgid "_Bookmarks" msgstr "책갈피(_B)" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "책갈피 더하기(_K)" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "확장 기능(_E)" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "기록(_H)" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "사용자 스크립트(_U)" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "사용자 스타일(_S)" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "새 탭(_T)" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "전송(_T)" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "넷스케이프 플러그인(_L)" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "닫은 탭(_C)" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5255 msgid "New _Window" msgstr "새 창(_W)" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "새 폴더(_F)" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[주소]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "파일이 없습니다." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "잘못된 문서." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "책갈피 형식을 알 수 없습니다." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5391 msgid "Go forward to the next page" msgstr "다음 들렀던 페이지로 갑니다" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5402 msgid "Go to the next sub-page" msgstr "다음 들렀던 하위 페이지로 갑니다" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5349 msgid "Reload the current page" msgstr "현재 페이지 다시 불러오기" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5346 msgid "Stop loading the current page" msgstr "현재 페이지 불러오기 중지" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "제목 업데이트 실패: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "값 '%s'은(는) %s의 잘못된 값입니다" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "기대하지 않은 동작 '%s'." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (사생활 보호 모드)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "책갈피" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "새 폴더" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "폴더 편집" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "새 책갈피" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "책갈피 편집" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "이 책갈피의 이름을 입력한 후 보관할 장소를 선택하십시오." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "단축 번호에 더하기(_S)" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "도구 모음에 보이기(_B)" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "웹 응용 프로그램으로 실행(_W)" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4498 msgid "Save file as" msgstr "다른 이름으로 저장" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "관련된 자원 저장(_R)" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "새 창이 열렸습니다." -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "새 탭이 열렸습니다." -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "그림을 여는 중 오류가 발생했습니다!" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "기본 그림 보기 프로그램으로 선택할 그림을 열 수 없습니다." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "그림을 다운로드하는 중 오류가 발생했습니다!" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "선택한 그림을 다운로드할 수 없습니다." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "파일 저장" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "파일 열기" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -365,25 +370,25 @@ "이 외에 미도리 기본 설정 안 프로그램 탭으로 이동하여 뉴스 수집기를 선택하면 " "다음 뉴스 피드 아이콘을 누를 때 자동으로 추가합니다." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "새 피드" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5415 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "새 책갈피 더하기" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3111 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "비어있음" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3493 ../midori/midori-browser.c:3494 msgid "Toggle text cursor navigation" msgstr "" "키보드로 커서를 조작하여 페이지의 텍스트 사이를 이동하는 기능을 켜고 끄기" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3496 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -391,109 +396,109 @@ "캐럿 브라우징을 켜고 끄려면 F7 키를 눌러주십시오. 사용하게 되면 모든 웹사이트" "에 텍스트 커서가 표시됩니다." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3499 msgid "_Enable Caret Browsing" msgstr "캐럿 브라우징 사용(_E)" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3915 ../midori/midori-browser.c:5863 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "새 기록 항목 삽입 실패: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "전부 탭으로 열기(_T)" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "새 탭에서 열기(_T)" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "새 창에서 열기(_W)" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4329 msgid "Arora" msgstr "아로라" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4330 msgid "Kazehakase" msgstr "카제하카세" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4331 msgid "Opera" msgstr "오페라" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4332 msgid "Konqueror" msgstr "컨쿼러" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4333 msgid "Epiphany" msgstr "에피파니" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4334 #, c-format msgid "Firefox (%s)" msgstr "파이어폭스 (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4335 msgid "Midori 0.2.6" msgstr "미도리 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4353 msgid "Import bookmarks…" msgstr "책갈피 가져오기…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4356 ../midori/midori-browser.c:5420 msgid "_Import bookmarks" msgstr "책갈피 가져오기(_I)" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4367 msgid "_Application:" msgstr "응용 프로그램(_A):" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4432 msgid "Import from XBEL or HTML file" msgstr "XBEL 또는 HTML 파일에서 가져오기" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4460 msgid "Import from a file" msgstr "파일에서 가져오기" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4472 msgid "Failed to import bookmarks" msgstr "책갈피 가져오기 실패" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4503 msgid "XBEL Bookmarks" msgstr "XBEL 책갈피" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4508 msgid "Netscape Bookmarks" msgstr "넷스케이프 책갈피" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4522 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "미도리는 XBEL(*.xbel) 그리고 넷스케이프(*.html)로만 내보낼 수 있습니다" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4537 msgid "Failed to export bookmarks" msgstr "책갈피 내보내기 실패" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4753 msgid "A lightweight web browser." msgstr "가벼운 웹 브라우저." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4754 msgid "See about:version for version info." msgstr "버전 정보를 보려면 about:version 페이지를 확인하십시오." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4756 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -504,380 +509,381 @@ "서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전(선택적)에 따" "라 재배포하거나 수정할 수 있습니다." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4791 msgid "translator-credits" msgstr "" "Seo Sanghyeon \n" "김보람 " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5253 msgid "_File" msgstr "파일(_F)" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5256 msgid "Open a new window" msgstr "새 창을 엽니다" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5259 msgid "Open a new tab" msgstr "새 탭을 엽니다" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5261 msgid "New P_rivate Browsing Window" msgstr "새 사생활 보호 모드 창(_R)" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5265 msgid "Open a file" msgstr "파일을 엽니다" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5267 msgid "_Save Page As…" msgstr "다른 이름으로 페이지 저장(_S)…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5268 msgid "Save to a file" msgstr "파일로 저장" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5270 msgid "Add to Speed _dial" msgstr "단축 번호 더하기(_D)" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5274 msgid "Create _Launcher" msgstr "실행 아이콘 만들기(_L)" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5277 msgid "Subscribe to News _feed" msgstr "뉴스 피드 구독(_F)" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5283 msgid "_Close Tab" msgstr "탭 닫기(_C)" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5284 msgid "Close the current tab" msgstr "현재 탭을 닫습니다." -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5286 msgid "C_lose Window" msgstr "창 닫기(_L)" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5290 msgid "_Share" msgstr "공유(_S)" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5291 msgid "Share this page" msgstr "이 페이지 공유" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5295 msgid "Print the current page" msgstr "현재 페이지를 인쇄합니다" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5298 msgid "Close a_ll Windows" msgstr "모든 창 닫기(_L)" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5301 msgid "_Edit" msgstr "편집(_E)" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5324 msgid "_Find…" msgstr "찾기(_F)…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5325 msgid "Find a word or phrase in the page" msgstr "이 페이지에서 단어나 단락을 찾습니다" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5327 msgid "Find _Next" msgstr "다음 찾기(_N)" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5330 msgid "Find _Previous" msgstr "이전 찾기(_P)" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5334 msgid "Configure the application preferences" msgstr "프로그램 기본 설정을 편집합니다" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5336 msgid "_View" msgstr "보기(_V)" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5337 msgid "_Toolbars" msgstr "도구 모음(_T)" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5342 msgid "Reload page without caching" msgstr "저장하지 않고 페이지 다시 불러오기" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5352 msgid "Increase the zoom level" msgstr "확대/축소 단계 키우기" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5355 msgid "Decrease the zoom level" msgstr "확대/축소 단계 줄이기" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5359 msgid "_Encoding" msgstr "인코딩(_E)" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5361 msgid "View So_urce" msgstr "소스 보기(_U)" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5364 msgid "Ca_ret Browsing" msgstr "캐럿 브라우징(_R)" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5368 msgid "Toggle fullscreen view" msgstr "전체 화면 보기 전환" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5370 msgid "Scroll _Left" msgstr "왼쪽으로 스크롤(_L)" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5373 msgid "Scroll _Down" msgstr "아래쪽으로 스크롤(_D)" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5376 msgid "Scroll _Up" msgstr "위쪽으로 스크롤(_U)" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5379 msgid "Scroll _Right" msgstr "오른쪽으로 스크롤(_R)" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5382 msgid "_Readable" msgstr "읽기 쉽게(_R)" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5385 msgid "_Go" msgstr "이동(_G)" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5388 msgid "Go back to the previous page" msgstr "전에 들렀던 페이지로 갑니다" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5395 msgid "Go to the previous sub-page" msgstr "전에 들렀던 하위 페이지로 갑니다" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5404 msgid "_Homepage" msgstr "홈페이지(_H)" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5405 msgid "Go to your homepage" msgstr "홈 페이지로 갑니다." -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5407 msgid "Empty Trash" msgstr "휴지통 비우기" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5410 msgid "Undo _Close Tab" msgstr "닫은 탭 되돌리기(_C)" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5417 msgid "Add a new _folder" msgstr "새 폴더 더하기(_F)" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5423 msgid "_Export bookmarks" msgstr "책갈피 내보내기(_E)" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5426 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "검색 엔진 관리(_M)" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5429 msgid "_Clear Private Data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5432 msgid "_Inspect Page" msgstr "페이지 검사(_I)" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5436 msgid "_Previous Tab" msgstr "이전 탭(_P)" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5439 msgid "_Next Tab" msgstr "다음 탭(_N)" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5441 msgid "Move Tab to _first position" msgstr "탭을 처음으로 옮기기(_F)" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5443 msgid "Move Tab _Backward" msgstr "탭을 뒤로 옮기기(_B)" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5445 msgid "_Move Tab Forward" msgstr "탭을 앞으로 옮기기(_M)" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5447 msgid "Move Tab to _last position" msgstr "탭을 끝으로 옮기기(_L)" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5450 msgid "Focus _Current Tab" msgstr "현재 탭에 포커스 맞추기(_C)" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5453 msgid "Focus _Next view" msgstr "다음 보기에 포커스(_N)" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5456 msgid "Only show the Icon of the _Current Tab" msgstr "현재 탭의 아이콘만 보이기(_C)" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5459 msgid "_Duplicate Current Tab" msgstr "현재 탭 복제(_D)" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5462 msgid "Close Ot_her Tabs" msgstr "다른 탭 닫기(_H)" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5465 msgid "Open last _session" msgstr "마지막 세션 열기(_S)" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5468 msgid "_Help" msgstr "도움말(_H)" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5470 msgid "_Frequent Questions" msgstr "일반적인 질문(_F)" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5473 msgid "_Report a Problem…" msgstr "버그 보고(_R)…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5478 ../midori/midori-browser.c:6135 msgid "_Tools" msgstr "도구(_T)" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5485 msgid "_Menubar" msgstr "메뉴 모음(_M)" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5489 msgid "_Navigationbar" msgstr "내비게이션 줄(_N)" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5493 msgid "Side_panel" msgstr "가장자리 패널(_P)" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5494 msgid "Sidepanel" msgstr "가장자리 패널" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5497 msgid "_Bookmarkbar" msgstr "책갈피 모음(_B)" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5501 msgid "_Statusbar" msgstr "상태 표시줄(_S)" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "자동(_A)" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "중국어 번체(BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "중국어 간체(GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5520 msgid "Japanese (SHIFT__JIS)" msgstr "일본어(Shift_JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5523 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "한국어(EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5526 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "키릴어(KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5529 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "유니코드(UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5532 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "서양어(ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5535 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "사용자 지정…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6041 msgid "_Separator" msgstr "구분선(_S)" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6048 msgid "_Location…" msgstr "위치(_L)…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6050 msgid "Open a particular location" msgstr "특정 위치 열기" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6072 msgid "_Web Search…" msgstr "웹 검색(_W)…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6074 msgid "Run a web search" msgstr "웹 검색 실행" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6101 msgid "Reopen a previously closed tab or window" msgstr "이전에 닫은 탭이나 창을 다시 엽니다" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6118 msgid "Show the saved bookmarks" msgstr "저장한 책갈피 보기" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6151 msgid "_Tabs" msgstr "탭(_T)" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6153 msgid "Show a list of all open tabs" msgstr "모든 열려있는 탭의 목록을 표시합니다" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6167 msgid "_Menu" msgstr "메뉴(_M)" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6169 msgid "Menu" msgstr "메뉴" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6934 #, c-format msgid "Unexpected setting '%s'" msgstr "기대하지 않은 설정 '%s'" @@ -936,24 +942,24 @@ msgid "Self-signed" msgstr "스스로 서명함" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "자세한 보안 내용" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "붙여넣기 후 진행(_R)" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "확인하지 않음" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "확인하였고 암호화 한 연결" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "열린, 암호화하지 않은 연결" @@ -970,413 +976,408 @@ msgid "Align sidepanel to the left" msgstr "창을 왼쪽으로 이동" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "단축 번호 보이기" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "홈 페이지 표시" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "마지막에 연 탭 표시" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "마지막 탭을 불러오지는 않고 표시" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "빈 페이지 보이기" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "기본 검색 엔진 보이기" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "현재 홈 페이지 보이기" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "일본어(Shift_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "사용자 지정..." - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "새 탭" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "새 창" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "현재 탭" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "기본 값" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "아이콘" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "작은 아이콘" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "텍스트" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "아이콘 및 텍스트" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "아이콘 옆에 글자" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "자동(그놈 또는 환경 변수)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "프록시 서버 없음" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "크롬" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "사파리" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "아이폰" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "파이어폭스" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "인터넷 익스플로러" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "도구 모음 유형:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "미도리를 시작할 때:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "새 페이지 다음에 열기:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "식별 명" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "웹 페이지에 보낼 식별 명을 지정합니다." - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "항상 사용자가 선택한 글꼴을 사용" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "웹 사이트에 설정된 글꼴을 사용자 기본 설정으로 대체" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "설정을 읽을 수 없습니다: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "값 '%s'은(는) %s의 잘못된 값입니다" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr " '%s'은(는) 잘못된 설정 값입니다." -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "스타일 시트를 삽입할 수 없습니다: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "이 웹사이트를 신뢰" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "보안 상태 알 수 없음" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s이(가) HTML5 데이터 베이스를 저장하려 합니다." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "거부(_D)" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "허용(_A)" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s이(가) 위치를 알고 싶어합니다." -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "오류 - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "페이지 '%s'을(를) 불러올 수 없습니다." -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "다시 시도하십시오" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "오류 - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "'%s'에 문제가 있습니다." + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "%s에 메시지 보내기" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "검색 엔진 추가(_S)..." -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "요소 검사(_E)" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "새 탭에 링크 열기(_T)" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "새 탭에 링크 열고 전환(_F)" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "새 탭에 링크 열고 전환 안 함(_B)" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "새 창에 링크 열기(_W)" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "웹 응용 프로그램으로 링크 열기(_P)" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "링크 위치 복사(_S)" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "다른 이름으로 저장(_A)…" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "이미지를 새 창에서 열기(_I)" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "그림 새 탭에서 열기(_I)" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "그림 복사(_A)" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "그림 저장(_M)" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "그림 보기 프로그램으로 열기(_V)" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "비디오 주소 복사(_A)" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "비디오 저장(_V)" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "비디오 다운로드(_V)" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "다음으로 검색(_W)" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "웹 검색(_S)" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "주소 새 탭에서 열기(_T)" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "프레임 새 탭에서 열기(_F)" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "%s에서 파일을 열거나 다운로드" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "파일 이름: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "파일 종류: '%s'" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "파일 종류: %s ('%s')" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "크기: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "%s 열기" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "페이지 살피기 - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "설치한 문서 도구가 없습니다" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "미도리는 어떤 개인 정보도 보존하지 않습니다:" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "기록 또는 웹 쿠키를 저장하지 않습니다." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "확장 기능을 사용하지 않습니다." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "HTML5 저장소, 로컬 데이터베이스 그리고 프로그램 캐시를 사용하지 않습니다." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "미도리가 사용자를 추적할 수 없게 합니다.:" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "리퍼러 웹 주소는 호스트 이름에서 기본적인 것만 남깁니다." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "DNS 사전 판독을 사용하지 않습니다." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "언어와 시간대를 웹 사이트가 알 수 없도록 합니다." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "플래시와 넷스캐이프 플러그인을 웹 사이트가 알 수 없게 합니다." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "괄호 안의 버전 번호는 실행 중인 미도리가 사용하고 있는 버전입니다." -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "페이지 불러오기 연기" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기" "를 연기합니다." -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "페이지 불러오기" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "빈 페이지" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "탭 복제(_D)" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "탭 이름 보이기(_L)" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "탭 아이콘만 보이기(_I)" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "다른 탭 닫기(_H)" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "이전" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "다음" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "배경 그림 인쇄" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "배경 그림을 인쇄할 지 결정합니다" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "기능" @@ -1476,113 +1477,117 @@ msgid "Startup" msgstr "시작" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "미도리를 시작할 때:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "홈페이지:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "현재 페이지를 사용(_C)" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "현재 페이지를 홈 페이지로 사용" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "글꼴" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "가변 폭 글꼴 계열" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "텍스트를 표시할 기본 글꼴 계열" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "텍스트를 표시할 기본 글꼴 크기" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "고정 폭 글꼴 계열" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "고정 폭 텍스트를 표시할 글꼴 계열" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "고정 폭 텍스트를 표시할 글꼴 크기" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "최소 글꼴 크기" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "문자를 표시할 최소 글꼴 크기" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "우선할 인코딩" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "행동" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "자동으로 그림 읽기" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "맞춤법 검사 사용" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "스크립트 사용" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "웹GL 지원 사용" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "넷스케이프 플러그인 사용" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "문자와 그림 확대" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "팝업 열기 스크립트 허용" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다." -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "가운데 버튼 클릭으로 선택한 주소 열기" -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다." -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "배경 탭에 있는 창 반짝거리게 하기" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "우선할 인코딩" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1590,95 +1595,116 @@ "복수의 언어로 작성한 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분" "해 지정합니다. 예) \"de\", \"ru,nl\" 또는 \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "다운로드한 파일을 저장할 경로:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "탐색" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "도구 모음 유형:" + +#: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "새 페이지 다음에 열기:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "새 탭을 열면:" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "탭에 닫기 단추 표시" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "탭 모음 항상 보기" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "탭을 현재 탭 옆에 열기" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다." -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "탭을 연 후 바로 전환하지 않음" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "텍스트 편집기" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "뉴스 수집기" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "네트워크" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "프록시 서버" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "호스트 이름" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "포트" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "지원하는 프록시 형식:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "웹 캐시" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "디스크에 페이지를 저장할 최대 공간" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "식별 명" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "개인 정보" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "쿠키를 보존할 기간:" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "쿠키를 저장할 최장 기간을 설정합니다" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "방문한 사이트의 쿠키 만을 허용" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "서드 파티 웹 사이트가 보낸 쿠키 막기" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1686,74 +1712,74 @@ "쿠키는 로그인 데이터, 게임 기록 또는 광고 목적의 사용자 프로필을 보관하고 있" "습니다." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "오프라인 웹 응용 프로그램 캐시 사용" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "HTML5 로컬 기억 장치 지원 사용" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "외부 사이트에 보낼 리퍼러의 자세한 내용을 제거" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "\"리퍼러\" 헤더를 호스트 이름으로 줄이기" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "기록에 페이지를 보존할 기간:" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "방문 기록을 저장할 최대 기간을 설정합니다" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "확장 기능" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "검색 엔진 더하기" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "검색 엔진 편집" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "이름(_N):" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "설명(_D):" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "주소(_A):" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "토큰(_T):" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "검색 엔진 관리" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "기본 값으로 사용(_D)" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "검색 엔진을 불러올 수 없습니다. %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "검색 엔진을 저장할 수 없습니다. %s" @@ -1798,9 +1824,14 @@ msgstr "\"%s\"을(를) 열기 위한 응용 프로그램 또는 명령어를 선택해 주십시오:" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "외부 프로그램을 실행할 수 없습니다." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "올바르지 않은 주소" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1822,28 +1853,28 @@ msgid "Close Findbar" msgstr "찾기 줄 닫기" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "파일 '%s'을(를) 다운로드 했습니다." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "전송이 끝났습니다" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "모두 지우기" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "파일을 다운로드 하고 있습니다" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "미도리 종료(_Q)" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "미도리를 종료하시면 파일 다운로드를 취소합니다." @@ -1972,47 +2003,47 @@ msgid "Animation frames are broken" msgstr "애니메이션 프레임이 망가졌습니다" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "속성 '%s'은(는) %s에 적당하지 않음" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "파일 선택" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "폴더 선택" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "없음" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "한 시간" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "하루" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "일 주" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "한 달" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "일 년" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "%s을(를) 위한 기본 설정" @@ -2025,11 +2056,11 @@ msgid "SHA1-Checksum:" msgstr "SHA1 체크섬:" -#: ../extensions/adblock.c:473 +#: ../extensions/adblock.c:483 msgid "Configure Advertisement filters" msgstr "광고 필터 설정" -#: ../extensions/adblock.c:504 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2038,27 +2069,27 @@ "텍스트 항목에 미리 설정한 필터 목록의 주소를 입력하시고, \"추가\"를 눌러 목록" "에 추가해주십시오. 더 많은 목록은 %s에서 찾을 수 있습니다." -#: ../extensions/adblock.c:882 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "규칙 편집" -#: ../extensions/adblock.c:896 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "규칙(_R):" -#: ../extensions/adblock.c:950 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "그림 막기(_O)" -#: ../extensions/adblock.c:955 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "링크 막기(_O)" -#: ../extensions/adblock.c:1670 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "광고 막기" -#: ../extensions/adblock.c:1671 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "필터 목록에 따라 광고를 막습니다" @@ -2144,11 +2175,11 @@ msgid "Support for userscripts and userstyles" msgstr "사용자 스크립트와 사용자 스타일을 지원합니다." -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "색이 칠해진 탭" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "각 탭을 구분하기 쉽게 색을 칠합니다" @@ -2229,7 +2260,7 @@ "쿠키: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "이름" @@ -2461,68 +2492,68 @@ msgid "Failed to select suggestions\n" msgstr "제안을 선택할 수 없습니다\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "방문하지 않은 탭이 없습니다" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "기록 목록" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "탭을 닫을 때의 행동" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "아무것도 안 함" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "마지막에 본 탭으로 전환" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "최근 연 탭으로 전환" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "다음 새 탭(기록 목록)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "기록 목록에서 다음 새 탭으로 전환합니다" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "이전 새 탭(기록 목록)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "기록 목록에서 이전 새 탭으로 전환합니다" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "배경에 탭 표시(기록 목록)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "지금 선택한 탭을 배경에 표시" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "기록 목록" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "탭을 닫거나 전환할 때 마지막에 사용한 탭으로 이동합니다" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "마우스 제스처" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "마우스의 움직임으로 미도리를 조정합니다" @@ -2535,8 +2566,8 @@ msgstr "키보드 바로 가기 설정" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." -msgstr "사용자 설정 바로 가기(_O)..." +msgid "Customize Sh_ortcuts…" +msgstr "바로 가기 사용자 설정(_O)..." #: ../extensions/shortcuts.c:312 msgid "Shortcuts" @@ -2574,15 +2605,15 @@ msgid "Easily toggle features on web pages on and off" msgstr "웹 페이지의 기능을 쉽게 켜고 끕니다" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "탭 패널" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "탭 패널(_A)" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "탭을 수직 패널에서 보여줍니다" @@ -2594,11 +2625,11 @@ msgid "New tabs have no label by default" msgstr "기본으로 새 탭에 이름을 보이지 않습니다." -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "도구 모음 사용자 설정" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2606,23 +2637,23 @@ "도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 다시 배치할 수 있" "습니다." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "가능한 항목" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "표시한 항목" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "사용자 설정 도구 모음(_C)…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "도구 모음 편집기" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "도구 모음 배치를 쉽게 편집합니다" @@ -2719,34 +2750,34 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "책갈피를 저장할 수 없습니다.%s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "설정을 저장할 수 없습니다. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "세션을 열 수 없습니다: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "세션을 저장할 수 없습니다.%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "휴지통을 저장할 수 없습니다.%s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2754,99 +2785,107 @@ "미도리를 마지막으로 실행했을 때 비 정상적으로 끝난 것 같습니다. 이런 일이 계" "속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "기본 설정 수정(_P)" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "모든 확장 기능 사용하지 않기(_E)" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "미도리가 충돌한 후 대화 상자를 표시합니다" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "오래된 탭 버리기" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "최근 충돌 기록 보이기" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "디버깅 도구 실행(_D)" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "미도리를 이미 실행했지만 응답이 없습니다.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "책갈피를 읽어올 수 없습니다: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "휴지통을 열 수 없습니다: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "기록을 열 수 없습니다: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "다음의 오류가 발생했습니다:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "무시(_I)" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "SQL 실패: %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "허용" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "이번 세션에서만 허용" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "차단" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format msgid "Could not open database of extenstion: %s" msgstr "확장 기능의 데이터베이스를 열 수 없습니다: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, c-format msgid "Failed to execute database statement: %s" msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "정말 모든 쿠키 권한 설정을 삭제하시겠습니까?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "모든 쿠키 권한 설정을 삭제하시겠습니까?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." @@ -2854,20 +2893,20 @@ "이 동작을 수행하면 모든 쿠키 권한을 삭제합니다. 각 웹 페이지를 방문하면 권한" "을 다시 요구합니다." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "쿠키 권한 관리자" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "현재 쿠키 권한 관리자의 인스턴스" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "쿠키 권한 설정" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2880,25 +2919,25 @@ "책을 선택한 후 추가를 눌러 아래에 정책을 추가하고 싶은 도메인을 직접 " "입력할 수도 있습니다." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "도메인" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "정책" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "모두 삭제(_A)" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "알 수 없는 도메인인 경우 권한 물어보기(_S)" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." @@ -2906,123 +2945,129 @@ "쿠키 권한 관리자 확장 기능을 계속 사용하지 않도록 하는 과정에서 치명적인 오류" "가 발생했습니다. 사용하지 않도록 설정하십시오." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "쿠키 권한 관리자 확장 기능에 오류가 발생했습니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "이유" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "" "확장 기능의 설정 파일 경로를 찾을 수 없습니다: 경로를 설정하지 않았습니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "확장 기능의 설정 파일 경로를 찾을 수 없습니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "확장 기능이 사용할 설정 폴더를 만들 수 없습니다: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "확장 기능이 사용할 설정 폴더를 만들 수 없습니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 msgid "Could not open database of extension." msgstr "확장 기능의 데이터베이스를 열 수 없습니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "확장 기능의 데이터베이스를 설정할 수 없습니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "도메인에 대한 전체 쿠키 정책을 확인할 수 없습니다: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "쿠키 보존 확인" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "틸 세션 끝남" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "웹사이트 %s이(가) %d개의 쿠키를 보관하려 합니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "웹사이트 %s이(가) 쿠키를 보관하려 합니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "여러 웹 사이트가 모두 %d개의 쿠키를 보관하려 합니다." -#. Create expander for details -#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 -msgid "_Details" -msgstr "자세한 내용(_D)" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "허용(_A)" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "이번 세션에서만 허용(_S)" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "차단(_N)" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "이번에는 거부(_T(" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 msgid "Path" msgstr "경로" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 msgid "Value" msgstr "값" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 msgid "Expire date" msgstr "만료 날짜" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" -msgstr "허용(_A)" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "이번 세션에서만 허용(_S)" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" -msgstr "차단(_N)" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "확장 기능 인스턴스" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "이 확장 기능의 미도리 확장 기능 인스턴스" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "프로그램 인스턴스" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "이 확장 기능에 해당하는 미도리 프로그램 인스턴스" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "데이터베이스 인스턴스" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "이 확장 기능이 사용하는 SQLite 데이터베이스 인스턴스 포인터" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "데이터베이스 경로" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "이 확장 기능이 사용하는 SQLite 데이터베이스 인스턴스 경로" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "알 수 없는 정책 물어보기" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 msgid "" "If true this extension ask for policy for every unknown domain.If false this " "extension uses the global cookie policy set in Midori settings." @@ -3030,7 +3075,7 @@ "참으로 설정하면 이 확장 기능은 모든 알 수 없는 도메인의 권한을 물어봅니다.거" "짓으로 설정하는 경우 미도리 설정에 있는 전체 쿠키 설정을 사용합니다." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "분명하지 않음" @@ -3042,6 +3087,18 @@ msgid "Manage cookie permission per site" msgstr "사이트 별로 쿠키 권한을 관리합니다." +#~ msgid "Custom..." +#~ msgstr "사용자 지정..." + +#~ msgid "Confirm storing cookie" +#~ msgstr "쿠키 보존 확인" + +#~ msgid "_Details" +#~ msgstr "자세한 내용(_D)" + +#~ msgid "What to identify as to web pages" +#~ msgstr "웹 페이지에 보낼 식별 명을 지정합니다." + #~ msgid "Writing failed." #~ msgstr "쓸 수 없습니다." @@ -3162,9 +3219,6 @@ #~ msgid "The homepage" #~ msgstr "홈페이지" -#~ msgid "Show crash dialog" -#~ msgstr "충돌 대화 상자 보기" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "다운로드한 파일을 저장하는 폴더" diff -Nru midori-0.4.9/po/nl.po midori-0.5.0/po/nl.po --- midori-0.4.9/po/nl.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/nl.po 2013-04-04 20:31:20.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-28 13:12+0000\n" +"POT-Creation-Date: 2013-03-28 09:57+0000\n" "PO-Revision-Date: 2012-07-25 12:02+0200\n" "Last-Translator: Emmo (assisted by Pjotr)\n" "Language-Team: Dutch (Flemish)\n" @@ -26,9 +26,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Verkenner" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" @@ -40,11 +40,11 @@ msgid "New Private Browsing Window" msgstr "Nieuw privé-surfvenster" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "Nieuw tabblad" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "Nieuw venster" @@ -60,7 +60,7 @@ msgid "Open a new private browsing window" msgstr "Open een nieuw privé-surfvenster" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Privé-surfen" @@ -149,203 +149,208 @@ msgid "SECONDS" msgstr "SECONDEN" -#: ../midori/main.c:155 -#, c-format +#: ../midori/main.c:147 msgid "Error: \"gdb\" can't be found\n" msgstr "Fout: 'gdb' kan niet worden gevonden\n" -#: ../midori/main.c:181 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Gelieve commentaar, suggesties en fouten te melden bij:" -#: ../midori/main.c:183 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Controleer op nieuwe versies op:" -#: ../midori/main.c:338 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Er is een onbekende fout opgetreden" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Onverwachte actie '%s'." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6115 msgid "_Bookmarks" msgstr "_Bladwijzers" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "Bladwijzer _toevoegen" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "_Extensies" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:177 msgid "_History" msgstr "_Geschiedenis" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "Gebruikers_scripts" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "Gebruikers_stijlen" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "Nieuw _tabblad" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "Bestand_overdrachten" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "Netscape-invoegtoepassingen" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "Ge_sloten tabbladen" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5254 msgid "New _Window" msgstr "Nieuw _venster" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "Nieuwe _map" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Bestand niet gevonden." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Misvormd document." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Onbekende bladwijzeropmaak." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5390 msgid "Go forward to the next page" msgstr "Ga naar de volgende pagina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:5401 msgid "Go to the next sub-page" msgstr "Ga naar de volgende subpagina" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5348 msgid "Reload the current page" msgstr "De huidige pagina opnieuw laden" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5345 msgid "Stop loading the current page" msgstr "Stop met het laden van de huidige pagina" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Kon titel niet aanpassen: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Waarde '%s' is ongeldig voor %s" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Onverwachte actie '%s'." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Privé-surfen)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Nieuwe map" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Map bewerken" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Nieuwe bladwijzer" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Bladwijzer bewerken" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "" "Tik een naam voor deze bladwijzer en kies waar die bewaard moet worden." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "Toevoegen aan _snelkiezen" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "Laat in de werk_balk zien" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "Uitvoeren als _webtoepassing" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4497 msgid "Save file as" msgstr "Bestand opslaan als" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "Geassocieerde hulpbronnen opslaan" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "Er is een nieuw venster geopend" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "Er is een nieuw tabblad geopend" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "Fout bij het openen van de afbeelding." -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "Kan de gekozen afbeelding niet openen in een standaardkijker." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "Fout bij het binnenhalen van de afbeelding." -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "Kan de gekozen afbeelding niet binnenhalen." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Bestand opslaan" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -360,24 +365,31 @@ "Nieuwsaggregator kiezen. De volgende keer dat u het pictogram van " "nieuwsvoeding aanklikt, zal dit automatisch worden toegevoegd." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Nieuwe voeding" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5414 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#. FIXME: Blacklist/ custom contract doesn't work +#. gchar* blacklisted_contracts[] = { "print", NULL }; +#. FIXME: granite: should return GtkWidget* like GTK+ +#: ../midori/midori-browser.c:2634 ../midori/midori-browser.c:5290 +msgid "Share this page" +msgstr "Deel deze pagina" + +#: ../midori/midori-browser.c:3110 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Leeg" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3492 ../midori/midori-browser.c:3493 msgid "Toggle text cursor navigation" msgstr "Schakel tekstaanwijzer-navigatie" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3495 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -385,109 +397,109 @@ "Het indrukken van F7 schakelt de cursormodus om. Wanneer deze actief is, " "verschijnt er op alle websites een tekstcursor." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3498 msgid "_Enable Caret Browsing" msgstr "Cursormodus inschakelen" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3914 ../midori/midori-browser.c:5862 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kon nieuw element in geschiedenis niet toevoegen: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4229 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Alles openen in _tabbladen" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4236 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4239 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "In nieuw _venster openen" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4328 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4329 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4330 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4331 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4332 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4333 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4334 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4352 msgid "Import bookmarks…" msgstr "Bladwijzers invoeren…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5419 msgid "_Import bookmarks" msgstr "Bladwijzers _invoeren" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4366 msgid "_Application:" msgstr "_Toepassing:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4431 msgid "Import from XBEL or HTML file" msgstr "Invoeren vanuit een XBEL- of HTML-bestand" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4459 msgid "Import from a file" msgstr "Invoeren vanuit een bestand" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4471 msgid "Failed to import bookmarks" msgstr "Bladwijzers invoeren mislukt" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4502 msgid "XBEL Bookmarks" msgstr "XBEL-bladwijzers" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4507 msgid "Netscape Bookmarks" msgstr "Netscape-bladwijzers" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4521 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Midori kan alleen uitvoeren naar XBEL (*.xbel) en Netscape (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4536 msgid "Failed to export bookmarks" msgstr "Bladwijzers uitvoeren mislukt" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4752 msgid "A lightweight web browser." msgstr "Een lichtgewicht webbrowser." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4753 msgid "See about:version for version info." msgstr "Ga naar about:version voor informatie over de versie." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4755 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -499,381 +511,378 @@ "zoals gepubliceerd door de Free Software Foundation; hetzij versie 2.1 van " "de licentie hetzij een latere versie (naar keuze)." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4790 msgid "translator-credits" msgstr "" "Timo Verbeek \n" "Pascal De Vuyst \n" "Emmo" -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5252 msgid "_File" msgstr "_Bestand" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5255 msgid "Open a new window" msgstr "Nieuw venster openen" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5258 msgid "Open a new tab" msgstr "Nieuw tabblad openen" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5260 msgid "New P_rivate Browsing Window" msgstr "Nieuw p_rivé-surfvenster" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5264 msgid "Open a file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5266 msgid "_Save Page As…" msgstr "_Sla pagina op als…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5267 msgid "Save to a file" msgstr "Opslaan naar bestand" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5269 msgid "Add to Speed _dial" msgstr "Toevoegen aan _snelkiezen" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5273 msgid "Create _Launcher" msgstr "Maak _starter" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5276 msgid "Subscribe to News _feed" msgstr "Abonneren op nieuws_voeding" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5282 msgid "_Close Tab" msgstr "Tabblad _sluiten" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5283 msgid "Close the current tab" msgstr "Huidig tabblad sluiten" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5285 msgid "C_lose Window" msgstr "Venster _sluiten" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5289 msgid "_Share" msgstr "Delen" -#: ../midori/midori-browser.c:5270 -msgid "Share this page" -msgstr "Deel deze pagina" - -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5294 msgid "Print the current page" msgstr "Huidige pagina afdrukken" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5297 msgid "Close a_ll Windows" msgstr "A_lle Vensters Sluiten" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5300 msgid "_Edit" msgstr "_Bewerken" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5323 msgid "_Find…" msgstr "_Zoek…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5324 msgid "Find a word or phrase in the page" msgstr "Zoek naar een woord of zin in deze pagina" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5326 msgid "Find _Next" msgstr "Vo_lgende zoeken" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5329 msgid "Find _Previous" msgstr "Vo_rige zoeken" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5333 msgid "Configure the application preferences" msgstr "Toepassingsvoorkeuren instellen" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5335 msgid "_View" msgstr "_Beeld" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5336 msgid "_Toolbars" msgstr "_Werkbalken" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5341 msgid "Reload page without caching" msgstr "Vernieuw de pagina zonder gegevensopslag" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5351 msgid "Increase the zoom level" msgstr "Zoomniveau verhogen" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5354 msgid "Decrease the zoom level" msgstr "Zoomniveau verlagen" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5358 msgid "_Encoding" msgstr "_Codering" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5360 msgid "View So_urce" msgstr "_Bron bekijken" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5363 msgid "Ca_ret Browsing" msgstr "Cursor-surfen" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5367 msgid "Toggle fullscreen view" msgstr "Schakel volledig-scherm-weergave" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5369 msgid "Scroll _Left" msgstr "Naar _links bladeren" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5372 msgid "Scroll _Down" msgstr "Naar _beneden bladeren" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5375 msgid "Scroll _Up" msgstr "Naar _omhoog bladeren" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5378 msgid "Scroll _Right" msgstr "Naar _rechts bladeren" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5381 msgid "_Readable" msgstr "Leesbaar" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5384 msgid "_Go" msgstr "_Ga" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5387 msgid "Go back to the previous page" msgstr "Ga terug naar de vorige pagina" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5394 msgid "Go to the previous sub-page" msgstr "Ga naar de vorige subpagina" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5403 msgid "_Homepage" msgstr "_Thuispagina" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5404 msgid "Go to your homepage" msgstr "Ga naar de thuispagina" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5406 msgid "Empty Trash" msgstr "Prullenbak leegmaken" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5409 msgid "Undo _Close Tab" msgstr "Tabblad _sluiten ongedaan maken" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5416 msgid "Add a new _folder" msgstr "Nieuwe _map toevoegen" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5422 msgid "_Export bookmarks" msgstr "Bladwijzers _exporteren" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5425 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Zoekmachines beheren" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5428 msgid "_Clear Private Data" msgstr "Privé-gegevens _Wissen" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5431 msgid "_Inspect Page" msgstr "Pagina _inspecteren" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5435 msgid "_Previous Tab" msgstr "Vo_rig tabblad" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5438 msgid "_Next Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5440 msgid "Move Tab to _first position" msgstr "Verplaats tabblad naar eerste positie" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5442 msgid "Move Tab _Backward" msgstr "Verplaats tabblad naar _achteren" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5444 msgid "_Move Tab Forward" msgstr "_Verplaats tabblad naar voren" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5446 msgid "Move Tab to _last position" msgstr "Verplaats tabblad naar laatste positie" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5449 msgid "Focus _Current Tab" msgstr "Focus _huidig tabblad" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5452 msgid "Focus _Next view" msgstr "Focus _volgende weergave" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5455 msgid "Only show the Icon of the _Current Tab" msgstr "Toon alleen het Pictogram van het _Huidige Tabblad" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5458 msgid "_Duplicate Current Tab" msgstr "Huidig tabblad _dupliceren" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5461 msgid "Close Ot_her Tabs" msgstr "An_dere tabbladen sluiten" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5464 msgid "Open last _session" msgstr "Open laatste _sessie" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5467 msgid "_Help" msgstr "_Hulp" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5469 msgid "_Frequent Questions" msgstr "_Veelgestelde vragen" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5472 msgid "_Report a Problem…" msgstr "_Meld een probleem…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5477 ../midori/midori-browser.c:6134 msgid "_Tools" msgstr "_Hulpmiddelen" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5484 msgid "_Menubar" msgstr "_Menubalk" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5488 msgid "_Navigationbar" msgstr "_Navigatiebalk" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5492 msgid "Side_panel" msgstr "_Zijbalk" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5493 msgid "Sidepanel" msgstr "Zijbalk" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5496 msgid "_Bookmarkbar" msgstr "_Bladwijzerbalk" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5500 msgid "_Statusbar" msgstr "_Statusbalk" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5509 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5512 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Chinees traditioneel (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5515 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Chinees vereenvoudigd (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5519 msgid "Japanese (SHIFT__JIS)" msgstr "Japans (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5522 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Koreaans (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5525 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5528 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5531 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5534 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Aangepast…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6040 msgid "_Separator" msgstr "_Scheidingsteken" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6047 msgid "_Location…" msgstr "_Locatie…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6049 msgid "Open a particular location" msgstr "Open een specifieke locatie" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6071 msgid "_Web Search…" msgstr "Zoeken op het _web…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6073 msgid "Run a web search" msgstr "Doorzoek het web" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6100 msgid "Reopen a previously closed tab or window" msgstr "Heropen een eerder gesloten tabblad of venster" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6117 msgid "Show the saved bookmarks" msgstr "Opgeslagen bladwijzers weergeven" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6150 msgid "_Tabs" msgstr "Tabbladen" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6152 msgid "Show a list of all open tabs" msgstr "Geef een lijst van alle open tabbladen weer" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6166 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6168 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Onverwachte configuratie-optie '%s'" @@ -936,24 +945,24 @@ msgid "Self-signed" msgstr "Zelf-ondertekend" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Veiligheidsdetails" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Plakken en _doorgaan" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Niet geverifieerd" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Geverifieerde en versleutelde verbinding" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Open, niet-versleutelde verbinding" @@ -970,419 +979,414 @@ msgid "Align sidepanel to the left" msgstr "Zijbalk links plaatsen" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Toon snelkeuzemenu" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Toon startpagina" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Toon laatst geopende tabbladen" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "Toon laatste tabbladen zonder te laden" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Toon lege pagina" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Toon standaardzoekmachine" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Toon aangepaste pagina" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japans (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Aangepast…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Nieuw tabblad" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Nieuw venster" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Huidig tabblad" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Standaard" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Pictogrammen" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Kleine pictogrammen" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Pictogrammen en tekst" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Tekst naast pictogrammen" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME of omgeving)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "HTTP proxy-server" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Geen proxy-server" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Stijl van de werkbalk:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "De stijl van de werkbalk" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Bij starten van Midori:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Nieuwe pagina's openen in:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Identificeren als" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Hoe zich te identificeren op webpagina's" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Altijd mijn lettertypekeuzes gebruiken" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "Lettertypes van websites vervangen door gebruikersvoorkeuren" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Configuratie kon niet geladen worden: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Waarde '%s' is ongeldig voor %s" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ongeldige configuratiewaarde '%s'" -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Kon stijlvel niet toevoegen: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Vertrouw deze website" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Veiligheid onbekend" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s wil een HTML5-gegevensbank opslaan." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Weigeren" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Toestaan" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s wil uw locatie weten." -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Fout - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "De pagina '%s' kan niet worden geladen" -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Probeer opnieuw" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Oei - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Er is iets fout gegaan met '%s'." + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Stuur een bericht naar %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Zoekmachine toevoegen" -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "_Element inspecteren" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Koppeling in nieuw _tabblad openen" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Koppeling in nieuw tabblad op _voorgrond openen" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Koppeling in nieuw tabblad op _achtergrond openen" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Koppeling in nieuw _venster Openen" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Koppeling als webt_oepassing openen" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "Koppelingbe_stemming kopiëren" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "Opslaan als..." -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Open afbeelding in nieuw venster" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Open _afbeelding in nieuw tabblad" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Afbeelding kopiëren" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "A_fbeelding opslaan" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Openen in afbeeldingkijker." -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "_Adres van video kopiëren" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "_Video opslaan" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "_Video binnenhalen" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Zoeken _met" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Zoek op internet" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Adres in nieuw _tabblad openen" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Open omlijsting in nieuw tabblad" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Bestand openen of binnenhalen vanaf %s" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Bestandnaam: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Bestandtype: '%s'" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Bestandtype: %s ('%s')" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Grootte: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Openen %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Pagina analyseren - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Geen documentatie geïnstalleerd" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "Midori slaat geen persoonlijke gegevens op:" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Webgeschiedenis en webkoekjes worden niet opgeslagen." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Extensies zijn uitgeschakeld." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "HTML5-opslag, plaatselijke gegevensbank en toepassingopslag zijn " "uitgeschakeld." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Midori verhindert websites om de gebruiker te volgen:" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "Verwijzingskoppelingen worden teruggebracht tot de hostnaam." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "Vooraf DNS binnenhalen is uitgeschakeld." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "De taal en de tijdzone worden niet bekendgemaakt aan websites." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "" "Flash en andere Netscape (Firefox)-plugins, kunnen niet worden geregistreerd " "door websites." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "Versienummers tussen haakjes tonen de versie die tijdens de runtime wordt " "gebruikt" -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Het laden van de pagina is vertraagd" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Het laden is vertraagd ofwel door een recente crash ofwel door " "opstartvoorkeuren." -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Pagina laden" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Blanco pagina" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "Tabblad _dupliceren" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "Toon tabblad_etiket" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "Toon alleen tabblad_pictogram" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Andere tabblad sluiten" msgstr[1] "Andere tabbladen sluiten" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "vorige" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "volgende" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Achtergrondafbeeldingen meenemen in afdrukken" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Of achtergrondafbeeldingen dienen te worden afgedrukt" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Opties" @@ -1486,114 +1490,118 @@ msgid "Startup" msgstr "Opstarten" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Bij starten van Midori:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Startpagina:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Gebruik _huidige pagina" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Gebruik de huidige pagina als startpagina" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Lettertypes" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Proportionele lettertypen-familie" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "De standaardlettertype-familie om tekst weer te geven" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "De standaard lettergrootte om tekst weer te geven" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Lettertype-familie met vaste breedte" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "De lettertype-familie om tekst met vaste breedte weer te geven" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "De lettertypegrootte om tekst met vaste breedte weer te geven" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Minimale lettertypegrootte" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "De minimale lettertypegrootte om tekst weer te geven" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Voorkeurcodering" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Gedrag" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Afbeeldingen automatisch laden" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Spellingscontrole aanzetten" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Scripts aanzetten" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "WebGL-ondersteuning inschakelen" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Netscape-plugins uitvoeren" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Tekst en afbeeldingen zoomen" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Scripts toelaten om opduikvensters te openen" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Of het toegelaten is voor scripts om opduikvensters automatisch te openen" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Klikken met middelste muisknop opent selectie" -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Een adres vanuit de selectie laden met middelste muisknop" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Laat venster op achtergrond-tabbladen opflitsen" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Voorkeurstalen" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1602,97 +1610,118 @@ "webpagina's in weer te geven, bijvoorbeeld 'de', 'ru,nl' of 'en-us;q=1.0, fr-" "fr;q=0.667'" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Bewaar binnengehaalde bestanden in:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Surfen" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Stijl van de werkbalk:" + +#: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Nieuwe pagina's openen in:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Nieuw tabbladgedrag:" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Balk met tabbladen altijd weergeven" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Of nieuwe tabbladen naast het huidige tabblad geopend dienen te worden of na " "het laatste tabblad" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Tekstverwerker" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Nieuwsaggregator" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Netwerk" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Proxyserver" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Hostnaam" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Poort" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Ondersteunde proxysoorten:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 -#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:328 msgid "Web Cache" msgstr "Webopslag" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "De maximale grootte van opgeslagen pagina's op de harde schijf" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Identificeren als" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Verwijder oude koekjes na:" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Hoeveel dagen een koekje maximaal bewaard mag worden" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Alleen koekjes aanvaarden van websites die u bezoekt" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Blokkeer koekjes verzonden door derden" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1700,74 +1729,74 @@ "Koekjes slaan aanmeldgegevens, opgeslagen spelletjes of gebruikerprofielen " "op voor adverteerdoeleinden." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Offline webtoepassingsopslag gebruiken" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "HTML5 lokale opslagondersteuning activeren" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Verwijder naar websites gestuurde verwijzingdetails" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Of de 'Referer'-koptekst moet worden verkort tot de hostnaam" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Verwijder pagina's uit de geschiedenis na:" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Hoeveel dagen de geschiedenis bewaard moeten blijven" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Extensies" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Zoekmachine toevoegen" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Zoekmachine bewerken" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Naam:" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Beschrijving:" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Adres:" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "_Trefwoord:" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Zoekmachines beheren" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Als _standaard gebruiken" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "De zoekmachines konden niet worden geladen. %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "De zoekmachines konden niet opgeslagen worden. %s" @@ -1812,9 +1841,14 @@ msgstr "Kies een toepassing of opdracht om \"%s\" te openen:" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Kon extern programma niet uitvoeren." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "Ongeldige URI" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1836,28 +1870,28 @@ msgid "Close Findbar" msgstr "Zoekbalk sluiten" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "Het bestand '%s' is binnengehaald." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Overdracht compleet" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Alles wissen" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Sommige bestanden worden binnengehaald" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "Midori _afsluiten" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "" "De bestandoverdrachten zullen worden geannuleerd als Midori wordt afgesloten." @@ -1988,47 +2022,47 @@ msgid "Animation frames are broken" msgstr "Animatiebeelden zijn gebroken" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschap '%s' is ongeldig voor %s" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Bestand kiezen" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Map kiezen" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "Geen" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 uur" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dag" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 week" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 maand" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 jaar" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Voorkeuren voor %s" @@ -2045,7 +2079,7 @@ msgid "Configure Advertisement filters" msgstr "Configureer advertentiefilters" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2055,27 +2089,27 @@ "klik op 'Toevoegen' om het aan de lijst toe te voegen. Meer lijsten zijn " "beschikbaar op %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Regel bewerken" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Afbeelding bl_okkeren" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Koppeling bl_okkeren" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Advertentieblokkeerder" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Blokkeer advertenties volgens filterlijst" @@ -2163,11 +2197,11 @@ msgid "Support for userscripts and userstyles" msgstr "Ondersteuning voor gebruikersscripts en -stijlen" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Gekleurde tabbladen" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Ieder tabblad verschillend tinten" @@ -2248,7 +2282,7 @@ "Koekjes: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Naam" @@ -2484,69 +2518,69 @@ msgid "Failed to select suggestions\n" msgstr "Kon geen suggesties kiezen\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Er zijn geen onbezochte tabbladen" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Geschiedenislijst" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Gedrag bij sluiten tabblad" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Doe niets" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Overschakelen naar laatst bekeken tabblad" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Overschakelen naar nieuwste tabblad" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "Volgende nieuwe tabblad (Geschiedenislijst)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "Volgende nieuwe tabblad vanuit geschiedenis" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "Vorige nieuwe tabblad (Geschiedenislijst)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "Vorige nieuwe tabblad vanuit geschiedenis" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "Toon tabblad in achtergrond (Geschiedenislijst)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "Toon het thans gekozen tabblad in achtergrond" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "Geschiedenislijst" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "" "Ga naar het laatst gebruikte tabblad bij tabbladwissel of tabbladsluiting" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Muisgebaren" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Midori besturen door de muis te bewegen" @@ -2559,7 +2593,7 @@ msgstr "Sneltoetsen aanpassen" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." +msgid "Customize Sh_ortcuts…" msgstr "Sneltoetsen aanpassen…" #: ../extensions/shortcuts.c:312 @@ -2598,15 +2632,15 @@ msgid "Easily toggle features on web pages on and off" msgstr "Eenvoudig schakelen van gedrag van webpagina's" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Tabbladwerkbalk" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "T_abbladwerkbalk" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Tabbladen in een verticale werkbalk tonen" @@ -2618,11 +2652,11 @@ msgid "New tabs have no label by default" msgstr "Nieuwe tabbladen hebben geen standaardetiket" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Werkbalk aanpassen" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2630,23 +2664,23 @@ "Selecteer elementen die op de werkbalk dienen te worden weergegeven. " "Elementen kunnen via slepen en neerzetten van plaats worden veranderd." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Beschikbare elementen" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Weergegeven elementen" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "Werkbalk aanpassen…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Werkbalkbewerker" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "De werkbalkvormgeving eenvoudig aanpassen" @@ -2659,37 +2693,38 @@ msgid "Failed to load cookies\n" msgstr "Kon geen koekjes laden\n" +#. FIXME: granite: should return GtkWidget* like GTK+ #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-privatedata.c:120 +#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140 msgid "Clear Private Data" msgstr "Wis privégegevens" -#: ../midori/midori-privatedata.c:124 +#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144 msgid "_Clear private data" msgstr "Privégegevens _wissen" -#: ../midori/midori-privatedata.c:137 +#: ../midori/midori-privatedata.c:161 msgid "Clear the following data:" msgstr "Wis de volgende gegevens:" -#: ../midori/midori-privatedata.c:147 +#: ../midori/midori-privatedata.c:171 msgid "Last open _tabs" msgstr "Laatst openstaande _tabbladen" -#: ../midori/midori-privatedata.c:173 +#: ../midori/midori-privatedata.c:197 msgid "Clear private data when _quitting Midori" msgstr "Privégegevens wissen bij het _afsluiten van Midori" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:302 +#: ../midori/midori-privatedata.c:322 msgid "Saved logins and _passwords" msgstr "Opgeslagen aanmeldingen en _wachtwoorden" -#: ../midori/midori-privatedata.c:304 +#: ../midori/midori-privatedata.c:324 msgid "Cookies and Website data" msgstr "Koekjes en websitegegevens" -#: ../midori/midori-privatedata.c:311 +#: ../midori/midori-privatedata.c:331 msgid "Website icons" msgstr "Website-pictogrammen" @@ -2697,7 +2732,7 @@ msgid "Open tabs" msgstr "Tabbladen openen" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Meer openstaande tabbladen..." @@ -2743,35 +2778,35 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "De bladwijzers konden niet opgeslagen worden. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Geen root-certificaatbestand aanwezig. SSL-certificaten kunnen niet worden " "geverifieerd." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "De instellingen konden niet worden opgeslagen. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:383 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "De sessie kon niet geladen worden: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "De sessie kon niet worden opgeslagen. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "De prullenbak kon niet worden opgeslagen. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2780,99 +2815,107 @@ "Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het " "probleem op te lossen." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "_Voorkeuren wijzigen" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Schakel alle _extensies uit" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Toon een dialoogvenster nadat Midori is vastgelopen" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Verwijder oude tabbladen" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Toon nieuwste vastloperslogboek" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "Draai in foutopsporingsmodus" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "Een exemplaar van Midori is al actief maar reageert niet.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "De bladwijzers konden niet worden geladen: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "De prullenbak kon niet geladen worden: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "De geschiedenis kon niet geladen worden: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "De volgende fouten hebben plaatsgevonden:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Negeren" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "SQL mislukt: %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "Aanvaarden" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "Aanvaarden voor sessie" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "Blokkeren" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format msgid "Could not open database of extenstion: %s" msgstr "Kon gegevensbank van extensie niet openen: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, c-format msgid "Failed to execute database statement: %s" msgstr "Kon bewering van gegevensbank niet uitvoeren: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Weet u zeker dat u alle koekjespermissies wil verwijderen?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Alle koekjespermissies verwijderen?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." @@ -2880,20 +2923,20 @@ "Deze actie zal alle koekjespermissies verwijderen. U zult opnieuw gevraagd " "worden naar permissies bij elke webstek die u bezoekt." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Koekjespermissiebeheerder" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "Exemplaar van huidige koekjespermissiebeheerder" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "Koekjespermissie instellen" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2907,25 +2950,25 @@ "voor een domein, door hieronder het domein in te voeren, het beleid te " "kiezen en te klikken op Toevoegen." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "Domein" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "Beleid" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "_Alles wissen" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "Vraag naar beleid indien onbekend voor een domein" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." @@ -2933,125 +2976,132 @@ "Er is een fatale fout opgetreden die de koekjespermissiebeheerder verhindert " "om door te gaan. U zou hem moeten uitschakelen." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "Fout in extensie van koekjespermissiebeheerder" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "Reden" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "Kon geen pad verkrijgen naar instellingen van extensie: pad is NULL" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "Kon geen pad verkrijgen naar instellingen van extensie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "Kon geen instellingenmap aanmaken voor extensie: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "Kon geen instellingenmap aanmaken voor extensie." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 msgid "Could not open database of extension." msgstr "Kon gegevensbank van extensie niet openen." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "Kon geen gegevensbankstructuur opzetten van extensie." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "" "Kon de algemene koekjespolitiek niet bepalen die ingesteld moet worden voor " "het domein: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "Bevestig opslaan van koekje" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "Tot einde van sessie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "De webstek %s wil %d koekjes opslaan." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "De webstek %s wil een koekje opslaan." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "Meerdere webstekken willen in totaal %d koekjes opslaan." -#. Create expander for details -#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 -msgid "_Details" -msgstr "_Details" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "_Aanvaarden" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Aanvaard voor deze sessie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "_Weigeren" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "Weiger dit keer" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 msgid "Path" msgstr "Pad" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 msgid "Value" msgstr "Waarde" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 msgid "Expire date" msgstr "Verloopdatum" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" -msgstr "_Aanvaarden" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "Aanvaard voor deze sessie" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" -msgstr "_Weigeren" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "Exemplaar van extensie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "Het Midori extensie-exemplaar voor deze extensie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "Toepassingexemplaar" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "Het Midori toepassingexemplaar waar deze extensie toe behoort" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "Gegevensbankexemplaar" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "" "Verwijzing naar SQLite gegevensbankexemplaar in gebruik bij deze extensie" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "Pad van gegevensbank" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "" +"Verwijzing naar SQLite gegevensbankexemplaar in gebruik bij deze extensie" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "Vraag naar onbekend beleid" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 msgid "" "If true this extension ask for policy for every unknown domain.If false this " "extension uses the global cookie policy set in Midori settings." @@ -3060,7 +3110,7 @@ "Indien onwaar, zal deze extensie het algemene koekjesbeleid hanteren dat is " "vastgelegd in de instellingen van Midori." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "Onbepaald" @@ -3072,6 +3122,18 @@ msgid "Manage cookie permission per site" msgstr "Beheer koekjespermissie per webstek" +#~ msgid "Custom..." +#~ msgstr "Aangepast…" + +#~ msgid "Confirm storing cookie" +#~ msgstr "Bevestig opslaan van koekje" + +#~ msgid "_Details" +#~ msgstr "_Details" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Hoe zich te identificeren op webpagina's" + #~ msgid "Writing failed." #~ msgstr "Schrijven is mislukt." @@ -3192,9 +3254,6 @@ #~ msgid "The homepage" #~ msgstr "De startpagina" -#~ msgid "Show crash dialog" -#~ msgstr "Toon vastloopdialoogvenster" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "De map waarin binnengehaalde bestanden worden opgeslagen" @@ -3574,9 +3633,6 @@ #~ msgid "Hide operating controls" #~ msgstr "Bedieningselementen verbergen" -#~ msgid "Show Blank page" -#~ msgstr "Toon lege pagina" - #~ msgid "All cookies" #~ msgstr "Alle koekjes" @@ -3758,9 +3814,6 @@ #~ msgid "Open _Link" #~ msgstr "_Koppeling openen" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Afbeelding in nieuw _venster openen" - #~ msgid "_Quick Find" #~ msgstr "_Snelzoeken" diff -Nru midori-0.4.9/po/pt.po midori-0.5.0/po/pt.po --- midori-0.4.9/po/pt.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/pt.po 2013-04-04 20:31:20.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-03 16:06+0000\n" +"POT-Creation-Date: 2013-03-27 23:15+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" +"Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: PORTUGAL\n" +"X-Generator: Poedit 1.5.4\n" #: ../data/midori.desktop.in.h:1 msgid "Browse the Web" @@ -27,9 +26,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorador" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" @@ -41,11 +40,11 @@ msgid "New Private Browsing Window" msgstr "Nova janela de navegação privada" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "Novo separador" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "Nova janela" @@ -61,7 +60,7 @@ msgid "Open a new private browsing window" msgstr "Abrir nova janela de navegação privada" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Navegação privada" @@ -147,202 +146,207 @@ msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:155 -#, c-format +#: ../midori/main.c:147 msgid "Error: \"gdb\" can't be found\n" msgstr "Erro: \"gdb\" não encontrado\n" -#: ../midori/main.c:181 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros em:" -#: ../midori/main.c:183 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:338 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Ocorreu um erro desconhecido" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Ação inesperada \"%s\"." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6115 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "Adicionar mar_cador" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "_Extensões" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:177 msgid "_History" msgstr "_Histórico" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "\"Scripts\" de _utilizador" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "Estilo_s de utilizador" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "No_vo separador" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "\"P_lug-ins\" Netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "Separadores _fechados" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5254 msgid "New _Window" msgstr "_Nova janela" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "Nova _pasta" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Ficheiro não encontrado." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Documento inválido." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Formato de marcadores não reconhecido." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5390 msgid "Go forward to the next page" msgstr "Ir para a página seguinte" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:5401 msgid "Go to the next sub-page" msgstr "Ir para a sub-página seguinte" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5348 msgid "Reload the current page" msgstr "Recarregar página atual" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5345 msgid "Stop loading the current page" msgstr "Parar de carregar da página atual" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao atualizar título: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "O valor \"%s\" é inválido para %s" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ação inesperada \"%s\"." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Navegação privada)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Marcadores" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Escolha o nome e o local para este marcador." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "Adicionar à _ligação rápida" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4497 msgid "Save file as" msgstr "Gravar como" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "Gravar _recursos associados" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "Foi aberta uma nova janela" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "Foi aberto um novo separador" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "Ocorreu um erro ao abrir a imagem!" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "Não é possível abrir a imagem no visualizador de imagens." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "Ocorreu um erro ao transferir a imagem!" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "não é possível transferir a imagem." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Gravar ficheiro" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -356,24 +360,31 @@ "notícias. Da próxima vez que clicar no ícone de fontes, esta será " "automaticamente adicionada." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5414 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#. FIXME: Blacklist/ custom contract doesn't work +#. gchar* blacklisted_contracts[] = { "print", NULL }; +#. FIXME: granite: should return GtkWidget* like GTK+ +#: ../midori/midori-browser.c:2634 ../midori/midori-browser.c:5290 +msgid "Share this page" +msgstr "Partilhar esta página" + +#: ../midori/midori-browser.c:3110 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3492 ../midori/midori-browser.c:3493 msgid "Toggle text cursor navigation" msgstr "Alternar navegação de cursor de texto" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3495 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -381,109 +392,109 @@ "Se premir F7 alterna a navegação com cursor. Se ativa, surgirá um cursor de " "texto em todas as páginas web." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3498 msgid "_Enable Caret Browsing" msgstr "Ativar nav_egação por cursor" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3914 ../midori/midori-browser.c:5862 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4229 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Abrir todos em _separadores" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4236 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Abrir em novo _separador" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4239 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Abrir em nova _janela" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4328 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4329 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4330 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4331 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4332 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4333 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4334 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4352 msgid "Import bookmarks…" msgstr "Importar marcadores…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5419 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4366 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4431 msgid "Import from XBEL or HTML file" msgstr "Importar de XBEL ou HTML" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4459 msgid "Import from a file" msgstr "Importar de um ficheiro" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4471 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4502 msgid "XBEL Bookmarks" msgstr "Marcadores XBEL" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4507 msgid "Netscape Bookmarks" msgstr "Marcadores Netscape" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4521 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "O Midori só consegue exportar para XBEL (*.xbel) e Netscape (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4536 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4752 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4753 msgid "See about:version for version info." msgstr "Veja about:version para informações da versão." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4755 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -495,378 +506,375 @@ "Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente " "(por opção)." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4790 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5252 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5255 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5258 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5260 msgid "New P_rivate Browsing Window" msgstr "Nova janela de navegação p_rivada" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5264 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5266 msgid "_Save Page As…" msgstr "_Gravar página como" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5267 msgid "Save to a file" msgstr "Gravar para ficheiro" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5269 msgid "Add to Speed _dial" msgstr "Adicionar à ligação rápi_da" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5273 msgid "Create _Launcher" msgstr "Criar lança_dor" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5276 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de notícias" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5282 msgid "_Close Tab" msgstr "_Fechar separador" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5283 msgid "Close the current tab" msgstr "Fechar o separador atual" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5285 msgid "C_lose Window" msgstr "Fec_har janela" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5289 msgid "_Share" msgstr "_Partilhar" -#: ../midori/midori-browser.c:5270 -msgid "Share this page" -msgstr "Partilhar esta página" - -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5294 msgid "Print the current page" msgstr "Imprimir a página atual" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5297 msgid "Close a_ll Windows" msgstr "Fechar todas as jane_las" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5300 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5323 msgid "_Find…" msgstr "_Localizar…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5324 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5326 msgid "Find _Next" msgstr "Localizar seg_uinte" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5329 msgid "Find _Previous" msgstr "Localizar _anterior" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5333 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5335 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5336 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5341 msgid "Reload page without caching" msgstr "Recarregar página sem colocar em cache" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5351 msgid "Increase the zoom level" msgstr "Aumentar a ampliação" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5354 msgid "Decrease the zoom level" msgstr "Diminuir a ampliação" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5358 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5360 msgid "View So_urce" msgstr "Ver código f_onte" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5363 msgid "Ca_ret Browsing" msgstr "Navegação ca_ret" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5367 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5369 msgid "Scroll _Left" msgstr "Deslocar à _esquerda" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5372 msgid "Scroll _Down" msgstr "Deslocar para _baixo" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5375 msgid "Scroll _Up" msgstr "Deslocar para _cima" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5378 msgid "Scroll _Right" msgstr "Deslocar à _direita" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5381 msgid "_Readable" msgstr "Pode se_r lido" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5384 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5387 msgid "Go back to the previous page" msgstr "Ir para a página anterior" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5394 msgid "Go to the previous sub-page" msgstr "Ir para a sub-página anterior" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5403 msgid "_Homepage" msgstr "_Página inicial" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5404 msgid "Go to your homepage" msgstr "Ir para a página inicial" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5406 msgid "Empty Trash" msgstr "Esvaziar lixo" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5409 msgid "Undo _Close Tab" msgstr "Anular _fecho de separadores" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5416 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5422 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5425 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Gerir motores de pesquisa" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5428 msgid "_Clear Private Data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5431 msgid "_Inspect Page" msgstr "_Inspecionar página" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5435 msgid "_Previous Tab" msgstr "Separador _anterior" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5438 msgid "_Next Tab" msgstr "Separador _seguinte" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5440 msgid "Move Tab to _first position" msgstr "Mover separador para a pri_meira posição" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5442 msgid "Move Tab _Backward" msgstr "M_over separador para trás" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5444 msgid "_Move Tab Forward" msgstr "_Mover separador para a frente" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5446 msgid "Move Tab to _last position" msgstr "Mover separador para a ú_ltima posição" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5449 msgid "Focus _Current Tab" msgstr "_Focar o separador atual" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5452 msgid "Focus _Next view" msgstr "Focar visualização segui_nte" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5455 msgid "Only show the Icon of the _Current Tab" msgstr "Apenas mostrar o ícone do separador _atual" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5458 msgid "_Duplicate Current Tab" msgstr "_Duplicar o separador atual" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5461 msgid "Close Ot_her Tabs" msgstr "Fec_har os outros separadores" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5464 msgid "Open last _session" msgstr "Abrir últi_ma sessão" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5467 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5469 msgid "_Frequent Questions" msgstr "_Questões frequentes" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5472 msgid "_Report a Problem…" msgstr "_Reportar um problema…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5477 ../midori/midori-browser.c:6134 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5484 msgid "_Menubar" msgstr "Barra de _menu" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5488 msgid "_Navigationbar" msgstr "Barra de _navegação" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5492 msgid "Side_panel" msgstr "Painel _lateral" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5493 msgid "Sidepanel" msgstr "Painel lateral" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5496 msgid "_Bookmarkbar" msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5500 msgid "_Statusbar" msgstr "Barra de _estado" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5509 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5512 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Mandarim tradicional (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5515 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "mandarim simplificado (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5519 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5522 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5525 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5528 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5531 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5534 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Personalizado…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6040 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6047 msgid "_Location…" msgstr "_Localização…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6049 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6071 msgid "_Web Search…" msgstr "Pesquisa _web…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6073 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6100 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6117 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores gravados" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6150 msgid "_Tabs" msgstr "_Separadores" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6152 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6166 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6168 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada \"%s\"" @@ -928,24 +936,24 @@ msgid "Self-signed" msgstr "Autoassinado" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Detalhes de segurança" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Cola_r e prosseguir" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Não verificada" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Ligação verificada e encriptada" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Ligação aberta e não codificada" @@ -962,417 +970,412 @@ msgid "Align sidepanel to the left" msgstr "Alinhar painel lateral à esquerda" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Mostrar ligação rápida" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Mostrar página inicial" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Mostrar últimos separadores abertos" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "Mostrar últimos separadores sem os carregar" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Mostrar página em branco" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Mostrar motor de pesquisa padrão" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Mostrar página personalizada" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Personalizar…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Separador atual" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Estilo da barra de ferramentas:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Ao iniciar o Midori:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Abrir novas páginas em:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Identificar como" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Identificar nas páginas web como" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Utilizar sempre as minhas escolhas de tipo de letras" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "" "Substituir tipo de letra dos sítios web pelas que forem definidas pelo " "utilizador" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A configuração não foi carregada: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "O valor \"%s\" é inválido para %s" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "O valor de configuração \"%s\" é inválido " -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Falha ao injetar a folha de estilo: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Confiar neste sítio web" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Segurança desconhecida" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s pretende gravar uma base de dados HTML5." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Rejeitar" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Permitir" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s pretende saber a sua localização." -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página \"%s\" não foi carregada." -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Tente novamente" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Erro - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Ocorreu um erro com %s." + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Enviar mensagem a %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Adicionar motor de pe_squisa" -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "Inspecionar _elementos" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "_Abrir ligação em novo separador" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Abrir ligação no _separador principal" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Abrir _ligação no separador secundário" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Abrir ligação em _nova janela" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Abrir ligação como a_plicação web" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "_Copiar destino da ligação" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "Gr_avar como" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Abrir _imagem em nova janela" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Abrir _imagem em novo separador" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Copiar im_agem" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Gravar image_m" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Abrir no _visualizador de imagens" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Copiar _endereço do vídeo" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Gravar _vídeo" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Transferir _vídeo" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Pesquisar na web" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Abrir endereço em novo _separador" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Abrir mol_dura em novo separador" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Abrir ou transferir ficheiro de %s" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Nome do ficheiro: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Tipo de ficheiro: \"%s\"" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de ficheiro: %s (\"%s\")" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Tamanho: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Inspecionar página - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "O Midori não guarda quaisquer dados privados." -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "O histórico e os cookies não são guardados." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "As extensões estão inativas." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "O armazenamento local de HTML5, base de dados e \"cache\" da aplicação estão " "inativas." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "O Midori impede que os sítios web obtenham dados do utilizador." -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "Os URL são removidos do nome do servidor." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "A obtenção prévia de DNS está inativa." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "O idioma e o fuso horário não são transmitidos aos sítios web." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "Os \"plug-ins\" Flash e Netscape não são listados nos sítios web." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "Os números em parênteses mostram a versão utilizada." -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Atualização de página atrasada" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "O atraso na atualização foi devido a um encerramento brusco ou às " "preferências de arranque." -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Carregar página" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "_Duplicar separador" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "Mostrar _texto do separador" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "Mostrar apenas o í_cone" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Fec_har o outro separador" msgstr[1] "Fec_har os outros separadores" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "anterior" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "seguinte" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Imprimir imagens de fundo" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens de fundo" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Funcionalidades" @@ -1476,115 +1479,119 @@ msgid "Startup" msgstr "Arranque" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Ao iniciar o Midori:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Página inicial:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Utili_zar página atual" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Usar página atual como página inicial" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Tipo de letra" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Família de letras proporcionais" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "A família das letras a utilizar para exibir o texto" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "O tamanho das letras utilizadas para exibir o texto" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Letras com largura fixa" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "A família de letras utilizada para exibir o texto com largura fixa" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "O tamanho das letras utilizadas para exibir o texto com largura fixa" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Tamanho mínimo da letra" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Tamanho mínimo da letra para exibir o texto" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Codificação preferida" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Ativar verificação ortográfica" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Ativar \"scripts\"" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Ativar suporte a WebGL" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Ativar \"plug-ins\" Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Ampliar texto e imagens" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Permitir que os \"scripts\" abram \"pop-ups\"" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Marque para permitir que os \"scripts\" abram janelas \"pop-up\" " "automaticamente" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre seleção" -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Janela intermitente nos separadores secundários" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1593,96 +1600,117 @@ "web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;" "q=0.667\"" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Gravar ficheiros transferidos em:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Navegar" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Estilo da barra de ferramentas:" + +#: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Abrir novas páginas em:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Comportamento dos novos separadores:" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Botão Fechar nos separadores" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Abrir separadores perto do atual" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Marque se quiser abrir os novos separadores perto do atual ou após o último " -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Agregador de notícias" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Nome de anfitrião" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Porta" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Tipos de proxy suportados:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 -#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:328 msgid "Web Cache" msgstr "\"Web cache\"" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "O tamanho máximo, no disco, das páginas em cache" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Identificar como" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Apagar cookies após:" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "O número máximo de dias para guardar os cookies" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Aceitar cookies dos sítios que eu visitar" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Bloquear cookies de sítios de terceiros" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1690,74 +1718,74 @@ "Os \"cookies\" guardam dados ou perfis de utilizador para publicitar " "produtos." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Ativar \"cache\" de aplicações web \"offline\"" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Ativar suporte a armazenagem local HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Detalhes enviados para sítios externos" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Se o cabeçalho \"Referer\" deve ser abreviado no nome do servidor" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Apagar páginas no histórico após:" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar o histórico" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Extensões" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "\"_Token\":" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Gerir motores de pesquisa" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Usar por _omissão" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não foram gravados. %s" @@ -1802,9 +1830,14 @@ msgstr "Escolha a aplicação ou comando para abrir \"%s\":" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "URI inválido" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1826,28 +1859,28 @@ msgid "Close Findbar" msgstr "Fechar" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "O ficheiro \"%s\" foi transferido." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Limpar tudo" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Existem ficheiros a ser transferidos" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." @@ -1977,47 +2010,47 @@ msgid "Animation frames are broken" msgstr "As \"frames\" de animação estão danificadas" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A propriedade \"%s\" é inválida para %s" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Escolha o ficheiro" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Escolha a pasta" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "Nenhum" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 hora" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 dia" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 semana" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 mês" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 ano" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Preferências para %s" @@ -2034,7 +2067,7 @@ msgid "Configure Advertisement filters" msgstr "Configurar filtros de publicidade" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2044,27 +2077,27 @@ "\"Adicionar\" para a adicionar à lista.\n" "Pode encontrar mais listas em %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Bl_oquear imagem" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Bl_oquear ligação" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com o filtro" @@ -2151,11 +2184,11 @@ msgid "Support for userscripts and userstyles" msgstr "Suporte a \"scripts\" e estilos de utilizador" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Separadores coloridos" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Cor distinta para cada separador" @@ -2236,7 +2269,7 @@ "\"Cookies\": %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Nome" @@ -2468,69 +2501,69 @@ msgid "Failed to select suggestions\n" msgstr "Falha ao selecionar as sugestões\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Não existem separadores não visitados" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Histórico-Lista" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Ação ao fechar o separador" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Nenhuma" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Mudar para o último separador visualizado" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Mudar para o separador mais recente" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "O próximo Novo separador (lista de histórico)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "O próximo Novo separador no histórico" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "O anterior Novo separador (lista de histórico)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "O anterior Novo separador no histórico" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "Exibir separador em segundo plano (histórico)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "Exibir separador selecionado em segundo plano" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "Lista de histórico" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "" "Mover para o último separador utilizado ao trocar ou fechar separadores" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Gestos de rato" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori movendo o rato" @@ -2543,7 +2576,7 @@ msgstr "Personalizar atalhos de teclado" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." +msgid "Customize Sh_ortcuts…" msgstr "Personalizar atalh_os…" #: ../extensions/shortcuts.c:312 @@ -2582,15 +2615,15 @@ msgid "Easily toggle features on web pages on and off" msgstr "Ligar/desligar facilmente as funções em páginas web" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Painel de separadores" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "P_ainel de separadores" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Mostrar separadores num painel vertical" @@ -2602,11 +2635,11 @@ msgid "New tabs have no label by default" msgstr "Os novos separadores não mostram texto" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Personalizar barra de ferramentas" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2614,23 +2647,23 @@ "Selecione os itens a exibir na barra de ferramentas. Os itens podem ser " "ordenados por arrastamento." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Itens disponíveis" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Itens exibidos" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "Personalizar barra de ferramen_tas…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "Editar facilmente a barra de ferramentas" @@ -2643,37 +2676,38 @@ msgid "Failed to load cookies\n" msgstr "Falha ao carregar cookies\n" +#. FIXME: granite: should return GtkWidget* like GTK+ #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-privatedata.c:120 +#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140 msgid "Clear Private Data" msgstr "Limpar dados privados" -#: ../midori/midori-privatedata.c:124 +#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-privatedata.c:137 +#: ../midori/midori-privatedata.c:161 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-privatedata.c:147 +#: ../midori/midori-privatedata.c:171 msgid "Last open _tabs" msgstr "Úl_timos separadores abertos" -#: ../midori/midori-privatedata.c:173 +#: ../midori/midori-privatedata.c:197 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:302 +#: ../midori/midori-privatedata.c:322 msgid "Saved logins and _passwords" msgstr "Autenticações e sen_has gravadas" -#: ../midori/midori-privatedata.c:304 +#: ../midori/midori-privatedata.c:324 msgid "Cookies and Website data" msgstr "Cookies e dados da página web" -#: ../midori/midori-privatedata.c:311 +#: ../midori/midori-privatedata.c:331 msgid "Website icons" msgstr "Ícones de sítios web" @@ -2727,34 +2761,34 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Os marcadores não foram gravados. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Nenhum certificado disponível. Os certificados SSL não podem ser verificados." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não foi gravada. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:383 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi gravada. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi gravado. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2762,99 +2796,107 @@ "O Midori encerrou inesperadamente na última vez que foi aberto. Se isto " "ocorrer novamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Desativar todas as _extensões" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Mostrar a janela após o encerramento do Midori" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Rejeitar separadores antigos" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Mostrar jane_la de encerramento" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "Executar no _depurador" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já está ativa uma instância de Midori mas que não está a responder.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Ignorar " #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "Falha SQL: %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "Aceitar" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "Aceitar nesta sessão" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "Bloquear" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format msgid "Could not open database of extenstion: %s" msgstr "Não foi possível abrir a base de dados de extensões: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, c-format msgid "Failed to execute database statement: %s" msgstr "Falha ao executar instrução da base de dados: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Deseja realmente apagar todas as permissões de cookies?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Apagar todas as permissões de cookies?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." @@ -2862,20 +2904,20 @@ "Esta ação elimina todas as permissões de cookies. Nas próximas visitas a " "sítios web terá que as definir novamente." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Gestor de permissões de cookies" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "Instância atual do gestor de permissões de cookies" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "Configurar permissões de cookies" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2888,25 +2930,25 @@ "adicionar uma política manualmente, introduzindo o domínio e a política e " "clicando em Adicionar." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "Domínio" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "Política" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "_Apagar tudo" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "Perguntar política se e_sta for desconhecida para o domínio" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." @@ -2914,124 +2956,130 @@ "Ocorreu um erro que impede a extensão de permissões de cookies continuar. " "Deve desativar a extensão." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "Erro na extensão de permissões de cookies" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "Motivo" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "" "Não foi possível obter o caminho de configuração da extensão. O caminho é " "NULL" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "Não foi possível obter o caminho de configuração da extensão." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "Não foi possível criar a pasta de configuração da extensão. %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "Não foi possível criar a pasta de configuração da extensão." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 msgid "Could not open database of extension." msgstr "Não foi possível abrir a base de dados da extensão." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "Não foi possível configurar a estrutura da base de dados da extensão." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "Não foi possível determinar a política de cookies do domínio: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "Confirmação de armazenamento de cookies" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "Até ao fim da sessão" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "O sítio web %s quer guardar %d cookies." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "O sítio web %s quer guardar 1 cookie." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "Diversos sítios web querem guardar %d cookies." -#. Create expander for details -#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 -msgid "_Details" -msgstr "_Detalhes" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "_Aceitar" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Aceitar para esta _sessão" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "_Rejeitar" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "Não des_ta vez" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 msgid "Path" msgstr "Caminho" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 msgid "Value" msgstr "Valor" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 msgid "Expire date" msgstr "Data de expiração" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" -msgstr "_Aceitar" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "Aceitar para esta _sessão" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" -msgstr "_Rejeitar" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "Instância da extensão" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "A instância do Midori para esta extensão" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "Instância da aplicação" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "A instância da aplicação a que esta extensão pertence" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "Instância da base de dados" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "Caminho para a base de dados sqlite utilizada pela extensão" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "Caminho da base de dados" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "Caminho para a base de dados sqlite utilizada pela extensão" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "Perguntar política se desconhecida" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 msgid "" "If true this extension ask for policy for every unknown domain.If false this " "extension uses the global cookie policy set in Midori settings." @@ -3040,7 +3088,7 @@ "desconhecidos. Se definido para FALSE, a extensão utiliza as políticas " "gerais definidas nas definições do midori." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "Indeterminado" @@ -3052,6 +3100,18 @@ msgid "Manage cookie permission per site" msgstr "Gerir permissões de cookies por sítio web" +#~ msgid "Custom..." +#~ msgstr "Personalizar…" + +#~ msgid "Confirm storing cookie" +#~ msgstr "Confirmação de armazenamento de cookies" + +#~ msgid "_Details" +#~ msgstr "_Detalhes" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Identificar nas páginas web como" + #~ msgid "Writing failed." #~ msgstr "Falha ao escrever." @@ -3174,9 +3234,6 @@ #~ msgid "The homepage" #~ msgstr "A página inicial" -#~ msgid "Show crash dialog" -#~ msgstr "Mostrar janela de encerramento" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "A pasta para gravar as transferências" diff -Nru midori-0.4.9/po/ru.po midori-0.5.0/po/ru.po --- midori-0.4.9/po/ru.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/ru.po 2013-04-04 20:31:20.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori 0.2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-03 03:39+0000\n" +"POT-Creation-Date: 2013-03-28 09:57+0000\n" "PO-Revision-Date: 2012-08-27 22:45+1000\n" "Last-Translator: Alex 'AdUser' Z \n" "Language-Team: Russian \n" @@ -26,8 +26,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;Explorer;Интернет;браузер;обозреватель;www" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:138 ../midori/main.c:151 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" @@ -39,11 +40,11 @@ msgid "New Private Browsing Window" msgstr "Новое кон_фиденциальное окно" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1268 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "Новая вкладка" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1265 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "Новое окно" @@ -59,285 +60,295 @@ msgid "Open a new private browsing window" msgstr "Открывает новое конфиденциальное окно" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:3922 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Конфиденциальный режим" -#: ../midori/main.c:62 +#: ../midori/main.c:63 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "Private browsing, no changes are saved" msgstr "Конфиденциальный режим, изменения не будут сохранены" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "Portable mode, all runtime files are stored in one place" msgstr "Портативный режим. Все исполняемые файлы хранятся в одном месте" -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" msgstr "Простое GTK+ окно с WebKit, вроде GtkLauncher" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:101 +#: ../midori/main.c:104 +msgid "Run within gdb and save a backtrace on crash" +msgstr "Запустить с помощью gdb и сохранить данные отладки в случае критической ошибки." + +#: ../midori/main.c:106 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:103 +#: ../midori/main.c:108 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:105 +#: ../midori/main.c:110 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:107 +#: ../midori/main.c:112 msgid "List available commands to execute with -e/ --execute" msgstr "Вывести список доступных команд для -e/ --execute" -#: ../midori/main.c:109 +#: ../midori/main.c:114 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:111 +#: ../midori/main.c:116 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:113 +#: ../midori/main.c:118 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:117 +#: ../midori/main.c:122 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:152 +#: ../midori/main.c:147 +msgid "Error: \"gdb\" can't be found\n" +msgstr "Ошибка: не удалось найти отладчик gdb\n" + +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:154 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:299 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Неизвестная ошибка" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:524 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Неожиданное действие «%s»." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5993 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6115 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "_Дополнения" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:177 msgid "_History" msgstr "_Журнал" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "_Пользовательские сценарии" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "С_тили пользователя" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5132 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5254 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "Новая папка" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Файл не найден." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Неизвестный формат закладок." -#: ../midori/midori-array.c:915 -msgid "Writing failed." -msgstr "Ошибка записи." - -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5268 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5390 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5276 -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:5401 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:431 ../midori/midori-browser.c:5217 -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5348 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:439 ../midori/midori-browser.c:5223 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5345 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:604 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Значение «%s» недействительно для %s" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Неожиданное действие «%s»." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (конфиденциальный режим)" -#: ../midori/midori-browser.c:714 ../midori/midori-browser.c:756 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Закладки" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:810 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:846 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Выберите имя для закладки и место для её хранения." -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:908 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:916 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:1026 ../midori/midori-browser.c:4390 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4497 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1036 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "Сохранить связаннные ресурсы" -#: ../midori/midori-browser.c:1265 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "Открыто новое окно" -#: ../midori/midori-browser.c:1268 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "Открыта новая вкладка" -#: ../midori/midori-browser.c:1285 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "Ошибка при открытии изображения!" -#: ../midori/midori-browser.c:1286 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "" "Выделенное изображение не удалось открыть в программе просмотра по умолчанию." -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "Ошибка при загрузке изображения!" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "Не удалось загрузить выделенное изображение." -#: ../midori/midori-browser.c:1350 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2444 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -351,24 +362,31 @@ "таком случае, в следующий раз при нажатии на ссылку на ленту, она будет " "добавлена автоматически." -#: ../midori/midori-browser.c:2450 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2493 ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5414 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3011 ../midori/midori-searchaction.c:481 +#. FIXME: Blacklist/ custom contract doesn't work +#. gchar* blacklisted_contracts[] = { "print", NULL }; +#. FIXME: granite: should return GtkWidget* like GTK+ +#: ../midori/midori-browser.c:2634 ../midori/midori-browser.c:5290 +msgid "Share this page" +msgstr "Не запоминать" + +#: ../midori/midori-browser.c:3110 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-browser.c:3406 ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3492 ../midori/midori-browser.c:3493 msgid "Toggle text cursor navigation" msgstr "Режим перемещения по странице при помощи текстового курсора" -#: ../midori/midori-browser.c:3409 +#: ../midori/midori-browser.c:3495 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -376,112 +394,112 @@ "Нажатие F7 переключает перемещение курсором. Если включен, курсор " "отображается на всех сайтах." -#: ../midori/midori-browser.c:3412 +#: ../midori/midori-browser.c:3498 msgid "_Enable Caret Browsing" msgstr "Перемещение к_урсором" -#: ../midori/midori-browser.c:3796 ../midori/midori-browser.c:5740 +#: ../midori/midori-browser.c:3914 ../midori/midori-browser.c:5862 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:4122 ../panels/midori-bookmarks.c:840 -#: ../panels/midori-history.c:797 +#: ../midori/midori-browser.c:4229 ../panels/midori-bookmarks.c:835 +#: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:4129 ../panels/midori-bookmarks.c:846 -#: ../panels/midori-history.c:803 ../extensions/feed-panel/feed-panel.c:519 +#: ../midori/midori-browser.c:4236 ../panels/midori-bookmarks.c:841 +#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:4132 ../midori/midori-view.c:2637 -#: ../midori/midori-view.c:4428 ../panels/midori-bookmarks.c:848 -#: ../panels/midori-history.c:805 ../extensions/feed-panel/feed-panel.c:521 +#: ../midori/midori-browser.c:4239 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 +#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4221 +#: ../midori/midori-browser.c:4328 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4222 +#: ../midori/midori-browser.c:4329 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:4330 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4224 +#: ../midori/midori-browser.c:4331 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:4332 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4333 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4227 +#: ../midori/midori-browser.c:4334 msgid "Midori 0.2.6" msgstr "Midori 0.2.6" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4352 msgid "Import bookmarks…" msgstr "Импорт закладок…" -#: ../midori/midori-browser.c:4248 ../midori/midori-browser.c:5297 +#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5419 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4259 +#: ../midori/midori-browser.c:4366 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4324 +#: ../midori/midori-browser.c:4431 msgid "Import from XBEL or HTML file" msgstr "Импортировать из файла XBEL или HTML" -#: ../midori/midori-browser.c:4352 +#: ../midori/midori-browser.c:4459 msgid "Import from a file" msgstr "Импортировать из файла" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4471 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4395 +#: ../midori/midori-browser.c:4502 msgid "XBEL Bookmarks" msgstr "Закладки XBEL" -#: ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:4507 msgid "Netscape Bookmarks" msgstr "Закладки Netscape" -#: ../midori/midori-browser.c:4414 +#: ../midori/midori-browser.c:4521 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "" "Midori может сохранять закладки только в форматах XBEL (*.xbel) и Netscape " "(*.html)" -#: ../midori/midori-browser.c:4429 +#: ../midori/midori-browser.c:4536 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4650 +#: ../midori/midori-browser.c:4752 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:4651 +#: ../midori/midori-browser.c:4753 msgid "See about:version for version info." msgstr "" "Посетите страницу about:version для получения информации о текущей версии." -#: ../midori/midori-browser.c:4653 +#: ../midori/midori-browser.c:4755 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -493,380 +511,377 @@ "Public License опубликованной Free Software Foundation; либо версии 2.1 " "лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:4683 +#: ../midori/midori-browser.c:4790 msgid "translator-credits" msgstr "" "Команда переводчиков Xfce\n" "" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:5252 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:5255 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5258 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:5260 msgid "New P_rivate Browsing Window" msgstr "Новое кон_фиденциальное окно" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5264 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5266 msgid "_Save Page As…" msgstr "Сохранить страницу _как…" -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:5267 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:5147 +#: ../midori/midori-browser.c:5269 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5151 +#: ../midori/midori-browser.c:5273 msgid "Create _Launcher" msgstr "Создать кнопку _запуска" -#: ../midori/midori-browser.c:5154 +#: ../midori/midori-browser.c:5276 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5282 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5283 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:5285 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:5167 +#: ../midori/midori-browser.c:5289 msgid "_Share" msgstr "_Поделиться" -#: ../midori/midori-browser.c:5168 -msgid "Share this page" -msgstr "Не запоминать" - -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:5294 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:5297 msgid "Close a_ll Windows" msgstr "З_акрыть все окна" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:5300 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:5323 msgid "_Find…" msgstr "_Найти…" -#: ../midori/midori-browser.c:5202 +#: ../midori/midori-browser.c:5324 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:5204 +#: ../midori/midori-browser.c:5326 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:5207 +#: ../midori/midori-browser.c:5329 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:5211 +#: ../midori/midori-browser.c:5333 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:5213 +#: ../midori/midori-browser.c:5335 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5336 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5341 msgid "Reload page without caching" msgstr "Обновить страницу без кэширования" -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5351 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5354 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:5236 +#: ../midori/midori-browser.c:5358 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5360 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5363 msgid "Ca_ret Browsing" msgstr "Перемещение к_урсором" -#: ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5367 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5369 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:5372 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5375 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5378 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5381 msgid "_Readable" msgstr "_Читаемый" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5384 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5387 msgid "Go back to the previous page" msgstr "На предыдущую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:5394 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" -#: ../midori/midori-browser.c:5281 +#: ../midori/midori-browser.c:5403 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../midori/midori-browser.c:5282 +#: ../midori/midori-browser.c:5404 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5284 +#: ../midori/midori-browser.c:5406 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5287 +#: ../midori/midori-browser.c:5409 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5294 +#: ../midori/midori-browser.c:5416 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5422 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5303 ../midori/midori-searchaction.c:490 +#: ../midori/midori-browser.c:5425 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5428 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5431 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5435 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5438 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5318 +#: ../midori/midori-browser.c:5440 msgid "Move Tab to _first position" msgstr "Переместить вкладку на _первую позицию" -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:5442 msgid "Move Tab _Backward" msgstr "Переместить вкладку _назад" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5444 msgid "_Move Tab Forward" msgstr "Переместить вкладку _вперёд" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5446 msgid "Move Tab to _last position" msgstr "Переместить вкладку на _последнюю позицию" -#: ../midori/midori-browser.c:5327 +#: ../midori/midori-browser.c:5449 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5452 msgid "Focus _Next view" msgstr "_Фокус на следующую вкладку" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:5455 msgid "Only show the Icon of the _Current Tab" msgstr "Показывать иконку только текущей вкладки" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5458 msgid "_Duplicate Current Tab" msgstr "_Сделать копию текущей вкладки" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5461 msgid "Close Ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5464 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5467 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5469 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5472 msgid "_Report a Problem…" msgstr "_Сообщить об ошибке…" -#: ../midori/midori-browser.c:5355 ../midori/midori-browser.c:6012 +#: ../midori/midori-browser.c:5477 ../midori/midori-browser.c:6134 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:5484 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5366 +#: ../midori/midori-browser.c:5488 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5492 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5493 msgid "Sidepanel" msgstr "Боковая панель" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5496 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:5500 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5387 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5509 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5390 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5512 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Китайская традиционная (Big5)" -#: ../midori/midori-browser.c:5393 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5515 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Китайская упрощённая (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5519 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5400 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5522 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5403 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5525 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5528 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5531 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5412 +#: ../midori/midori-browser.c:5534 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Выбрать…" -#: ../midori/midori-browser.c:5918 +#: ../midori/midori-browser.c:6040 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:5925 +#: ../midori/midori-browser.c:6047 msgid "_Location…" msgstr "_Адрес…" -#: ../midori/midori-browser.c:5927 +#: ../midori/midori-browser.c:6049 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:5949 +#: ../midori/midori-browser.c:6071 msgid "_Web Search…" msgstr "_Поиск в сети…" -#: ../midori/midori-browser.c:5951 +#: ../midori/midori-browser.c:6073 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:5978 +#: ../midori/midori-browser.c:6100 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:5995 +#: ../midori/midori-browser.c:6117 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:6028 -msgid "_Window" -msgstr "_Окно" +#: ../midori/midori-browser.c:6150 +msgid "_Tabs" +msgstr "_Вкладки" -#: ../midori/midori-browser.c:6030 +#: ../midori/midori-browser.c:6152 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:6044 +#: ../midori/midori-browser.c:6166 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6046 +#: ../midori/midori-browser.c:6168 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6826 +#: ../midori/midori-browser.c:6933 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -876,7 +891,7 @@ msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки дополнения «%s»: %s\n" -#: ../midori/midori-extension.c:881 ../extensions/addons.c:1676 +#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Не удалось сохранить настройки дополнения «%s»: %s\n" @@ -921,32 +936,32 @@ msgid "Some other error occurred validating the certificate." msgstr "Произошли другие ошибки при проверке сертификата." -#: ../midori/midori-locationaction.c:1419 +#: ../midori/midori-locationaction.c:1420 msgid "_Export certificate" msgstr "Э_кспорт сертификата" -#: ../midori/midori-locationaction.c:1434 +#: ../midori/midori-locationaction.c:1435 msgid "Self-signed" msgstr "Самоподписный" -#: ../midori/midori-locationaction.c:1468 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Сведения о безопасности" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1555 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-locationaction.c:1787 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Непроверенное соединение" -#: ../midori/midori-locationaction.c:1795 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Проверенное защищённое соединение" -#: ../midori/midori-locationaction.c:1802 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Открытое, незашифрованное соединение" @@ -963,385 +978,384 @@ msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Показать быстрый набор" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Открыть домашнюю страницу" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:338 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Открыть последние открытые страницы" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:337 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "Открыть последние страницы без загрузки" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Открыть пустую страницу" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Показать поисковый движок по умолчанию" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Показать определённую страницу" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Другая…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Маленькие значки" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Автоматически (GNOME или переменные окружения)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Не использовать прокси" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Стиль панели инструментов:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "При запуске:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Открывать новые страницы в:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Представляться как" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Всегда использовать" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "Использовать шрифты пользователя вместо предлагаемых сайтом" -#: ../midori/midori-websettings.c:1305 ../midori/midori-websettings.c:1311 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/midori-websettings.c:1360 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Значение «%s» недействительно для %s" - -#: ../midori/midori-websettings.c:1365 ../midori/midori-websettings.c:1476 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/midori-tab.vala:117 -#, fuzzy, c-format +#: ../midori/midori-tab.vala:121 +#, c-format msgid "Failed to inject stylesheet: %s" -msgstr "Не удалось добавить запись в журнал: %s\n" +msgstr "Не удалось добавить стиль: %s" -#: ../midori/midori-view.c:725 ../midori/midori-view.c:866 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Доверять этому сайту" -#: ../midori/midori-view.c:864 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Неизвестный уровень безопасности" -#: ../midori/midori-view.c:1162 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s запрашивает доступ к базе данных HTML5." -#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Запретить" -#: ../midori/midori-view.c:1166 ../midori/midori-view.c:1198 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Разрешить" -#: ../midori/midori-view.c:1194 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s хочет знать ваше местоположение." -#: ../midori/midori-view.c:1305 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1308 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Попытаться снова" -#: ../midori/midori-view.c:1507 ../midori/midori-view.c:2578 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Oops — %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Что-то пошло не так с \"%s\"." + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2362 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Добавить поисковую систему..." -#: ../midori/midori-view.c:2405 ../midori/midori-view.c:2713 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2457 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2461 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2462 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2468 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2489 +#: ../midori/midori-view.c:2643 +msgid "Save _As…" +msgstr "Сохранить страницу _как…" + +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Открыть изображение в новом _окне" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2492 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Копировать _изображение" -#: ../midori/midori-view.c:2495 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2498 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Открыть изображение в программе прос_мотра" -#: ../midori/midori-view.c:2505 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2534 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2566 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2633 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Открыть _фрейм в новой вкладке" -#: ../midori/midori-view.c:2845 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Открыть или загрузить файл с %s" -#: ../midori/midori-view.c:2858 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Имя файла: «%s»" -#: ../midori/midori-view.c:2863 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2865 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" -#: ../midori/midori-view.c:2902 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Размер: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2913 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3435 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3847 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3923 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "Midori не сохраняет личные данные:" -#: ../midori/midori-view.c:3924 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Не было сохранено ни истории, ни cookies." -#: ../midori/midori-view.c:3925 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Дополнения отключены." -#: ../midori/midori-view.c:3926 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "Хранилище HTML5, локальная база данных и кэши приложений отключены." -#: ../midori/midori-view.c:3927 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Midori затрудняет отслеживание сайтами пользователя:" -#: ../midori/midori-view.c:3928 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "Исходные адреса усекаются до имени узла." -#: ../midori/midori-view.c:3929 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "Упреждающие запросы DNS отключены." -#: ../midori/midori-view.c:3930 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "Сайтам не передается язык и часовой пояс." -#: ../midori/midori-view.c:3931 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "Сайтам не сообщается о наличии Flash и прочих модулей Netscape." -#: ../midori/midori-view.c:4010 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "Числа в скобках обозначают используемые в данный момент версии." -#: ../midori/midori-view.c:4056 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:4057 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей " "настройки." -#: ../midori/midori-view.c:4058 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:4222 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4432 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4437 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "_Показать заголовок" -#: ../midori/midori-view.c:4437 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "_Скрыть заголовок" -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "З_акрыть остальные" @@ -1349,34 +1363,34 @@ msgstr[2] "З_акрыть остальные" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5119 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "назад" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5138 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "далее" -#: ../midori/midori-view.c:5151 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:5152 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:5184 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Возможности" #. i18n: Download tooltip (size): 4KB of 43MB -#: ../midori/midori-download.vala:54 +#: ../midori/midori-download.vala:63 #, c-format msgid "%s of %s" msgstr "%s из %s" -#: ../midori/midori-download.vala:70 +#: ../midori/midori-download.vala:79 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -1384,7 +1398,7 @@ msgstr[1] "%d часа" msgstr[2] "%d часов" -#: ../midori/midori-download.vala:71 +#: ../midori/midori-download.vala:80 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -1392,7 +1406,7 @@ msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: ../midori/midori-download.vala:72 +#: ../midori/midori-download.vala:81 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -1401,27 +1415,27 @@ msgstr[2] "%d секунд" #. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning -#: ../midori/midori-download.vala:87 +#: ../midori/midori-download.vala:96 #, c-format msgid " - %s remaining" msgstr " - осталось %s" #. i18n: Unknown number of bytes, used for transfer rate like ?B/s -#: ../midori/midori-download.vala:98 +#: ../midori/midori-download.vala:107 msgid "?B" msgstr "?Б" #. i18n: Download tooltip (transfer rate): (130KB/s) -#: ../midori/midori-download.vala:100 +#: ../midori/midori-download.vala:109 #, c-format msgid " (%s/s)" msgstr " (%s/s)" -#: ../midori/midori-download.vala:197 +#: ../midori/midori-download.vala:224 msgid "The downloaded file is erroneous." msgstr "Загруженный файл повреждён." -#: ../midori/midori-download.vala:198 +#: ../midori/midori-download.vala:225 msgid "" "The checksum provided with the link did not match. This means the file is " "probably incomplete or was modified afterwards." @@ -1429,21 +1443,21 @@ "Контрольная сумма, указанная в ссылке, не совпадает. Возможно, файл был " "изменён или загружен не до конца." -#: ../midori/midori-download.vala:312 +#: ../midori/midori-download.vala:345 #, c-format msgid "The file \"%s\" can't be saved in this folder." msgstr "Файл «%s» не может быть сохранён в данную папку." -#: ../midori/midori-download.vala:314 +#: ../midori/midori-download.vala:347 msgid "You don't have permission to write in this location." msgstr "У вас недостаточно прав для записи указанного файла." -#: ../midori/midori-download.vala:317 +#: ../midori/midori-download.vala:350 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-download.vala:319 +#: ../midori/midori-download.vala:352 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" @@ -1472,123 +1486,119 @@ msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "При запуске:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Т_екущая страница" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Шрифты" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Семейство пропорционального шрифта" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Семейство шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Семейство моноширинного шрифта" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Семейство моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "Размер моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Проверять орфографию" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Включить поддержку WebGL" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Масштабировать изображения" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Разрешить сценариям открывать всплывающие окна" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Разрешено ли сценариям открывать всплывающие окна без вмешательства " "пользователя" -#: ../midori/midori-preferences.c:403 -msgid "Kinetic scrolling" -msgstr "Инерционная прокрутка" - -#: ../midori/midori-preferences.c:404 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" - -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Мигать окном при открытии фоновой вкладки" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Предпочитаемые языки" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1596,95 +1606,116 @@ "Список предпочитаемых языков для отображения многоязычных страниц, например, " "«de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" #. Page "Interface" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Навигация" +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Стиль панели инструментов:" + #: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Открывать новые страницы в:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-preferences.c:451 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-preferences.c:456 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Программа чтения лент новостей" #. Page "Network" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Прокси-сервер" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Адрес" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Порт" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Поддерживаемые типы proxy:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:501 ../extensions/web-cache.c:461 -#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:304 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:328 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-preferences.c:502 ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "Максимальный размер кэша страниц на диске" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "МБ" -#: ../midori/midori-preferences.c:526 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Представляться как" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Удалять старые фрагменты данных через:" -#: ../midori/midori-preferences.c:530 ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Принимать фрагменты данных только с посещаемых сайтов" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Блокировать фрагменты данных от посторонних сайтов" -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1692,76 +1723,76 @@ "Фрагменты данных хранят текущего пользователя сайта, сохранения игр, а также " "могут хранить информацию о пользователе в рекламных целях." -#: ../midori/midori-preferences.c:550 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Включить кэш веб-приложений" -#: ../midori/midori-preferences.c:553 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:557 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Передавать в «referer» только название сайта" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "" "Заголовок «Referer» будет содержать только домен, а не адрес конкретной " "страницы" -#: ../midori/midori-preferences.c:562 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Хранить историю посещений:" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Срок хранения записей в журнале" -#: ../midori/midori-preferences.c:604 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Дополнения" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:1068 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:1096 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:1111 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-searchaction.c:1124 ../extensions/feed-panel/main.c:376 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-searchaction.c:1143 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1441 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/midori-searchaction.c:1541 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/midori-searchaction.c:1652 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/midori-searchaction.c:1707 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" @@ -1786,29 +1817,34 @@ msgid "Search for %s" msgstr "Поиск %s" -#: ../midori/midori-searchcompletion.vala:23 +#: ../midori/midori-searchcompletion.vala:20 #: ../midori/midori-searchcompletion.vala:60 msgid "Search with…" msgstr "Найти с помощью…" -#: ../midori/midori-searchcompletion.vala:50 +#: ../midori/midori-searchcompletion.vala:48 #, c-format msgid "Search with %s" msgstr "Найти с помощью %s" -#: ../midori/sokoke.c:251 +#: ../midori/sokoke.c:243 msgid "Open with" msgstr "Открыть с помощью" -#: ../midori/sokoke.c:259 +#: ../midori/sokoke.c:251 #, c-format msgid "Choose an application or command to open \"%s\":" msgstr "Выберите приложение или команду для «%s»:" -#: ../midori/sokoke.c:374 ../midori/sokoke.c:388 +#: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "Неправильный URI" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1839,19 +1875,19 @@ msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../toolbars/midori-transferbar.c:239 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Убрать завершённые" -#: ../toolbars/midori-transferbar.c:272 ../toolbars/midori-transferbar.c:274 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Некоторые файлы загружаются" -#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "В_ыйти из Midori" -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori." @@ -1882,7 +1918,7 @@ msgstr "Разделитель" #. Create the filter entry -#: ../panels/midori-bookmarks.c:1017 +#: ../panels/midori-bookmarks.c:1009 msgid "Search Bookmarks" msgstr "Поиск в закладках" @@ -1928,7 +1964,7 @@ msgstr "Очистить весь журнал" #. Create the filter entry -#: ../panels/midori-history.c:988 +#: ../panels/midori-history.c:981 msgid "Search History" msgstr "Поиск в истории" @@ -1936,11 +1972,11 @@ msgid "Transfers" msgstr "Загрузки" -#: ../panels/midori-transfers.c:435 +#: ../panels/midori-transfers.c:442 msgid "Open Destination _Folder" msgstr "Открыть _папку загрузок" -#: ../panels/midori-transfers.c:438 +#: ../panels/midori-transfers.c:445 msgid "Copy Link Loc_ation" msgstr "Копировать _адрес ссылки" @@ -1982,47 +2018,47 @@ msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Выберите папку" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "Нет" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 час" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 день" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 неделю" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 месяц" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 год" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Параметры %s" @@ -2035,11 +2071,11 @@ msgid "SHA1-Checksum:" msgstr "Контрольная сумма SHA1:" -#: ../extensions/adblock.c:492 +#: ../extensions/adblock.c:483 msgid "Configure Advertisement filters" msgstr "Настройка рекламных фильтров" -#: ../extensions/adblock.c:523 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2048,27 +2084,27 @@ "Введите адрес списка фильтров в поле ниже и нажмите «Добавить». Подобные " "списки можно найти на %s." -#: ../extensions/adblock.c:937 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Редактирование правила" -#: ../extensions/adblock.c:951 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Правило:" -#: ../extensions/adblock.c:1005 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Бл_окировать изображение" -#: ../extensions/adblock.c:1010 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Бл_окировать ссылку" -#: ../extensions/adblock.c:1936 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Блокировка рекламы" -#: ../extensions/adblock.c:1937 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" @@ -2103,7 +2139,7 @@ msgstr "Пользовательские стили" #: ../extensions/addons.c:371 ../extensions/addons.c:450 -#: ../extensions/feed-panel/main.c:128 +#: ../extensions/feed-panel/main.c:120 msgid "Error" msgstr "Ошибка" @@ -2154,11 +2190,11 @@ msgid "Support for userscripts and userstyles" msgstr "Поддержка пользовательских сценариев и стилей" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Цветные вкладки" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" @@ -2187,23 +2223,23 @@ msgid "Collapse All" msgstr "Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:572 +#: ../extensions/cookie-manager/cookie-manager-page.c:575 msgid "Do you really want to delete all cookies?" msgstr "Удалить все сохранённые фрагменты данных?" -#: ../extensions/cookie-manager/cookie-manager-page.c:574 +#: ../extensions/cookie-manager/cookie-manager-page.c:577 msgid "Question" msgstr "Вопрос" -#: ../extensions/cookie-manager/cookie-manager-page.c:583 +#: ../extensions/cookie-manager/cookie-manager-page.c:588 msgid "Only cookies which match the filter will be deleted." msgstr "Будут удалены только фрагменты, удовлетворяющие условиям фильтра." -#: ../extensions/cookie-manager/cookie-manager-page.c:674 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 msgid "At the end of the session" msgstr "В конце сеанса" -#: ../extensions/cookie-manager/cookie-manager-page.c:677 +#: ../extensions/cookie-manager/cookie-manager-page.c:683 #, c-format msgid "" "Host: %s\n" @@ -2221,15 +2257,15 @@ "Срок истекает: %s" #. i18n: is this cookie secure (SSL)? yes/ no -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager/cookie-manager-page.c:684 +#: ../extensions/cookie-manager/cookie-manager-page.c:690 msgid "No" msgstr "Нет" -#: ../extensions/cookie-manager/cookie-manager-page.c:699 +#: ../extensions/cookie-manager/cookie-manager-page.c:705 #, c-format msgid "" "Domain: %s\n" @@ -2238,19 +2274,20 @@ "Домен: %s\n" "Фрагментов данных: %d" -#: ../extensions/cookie-manager/cookie-manager-page.c:1022 +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Имя" -#: ../extensions/cookie-manager/cookie-manager-page.c:1074 +#: ../extensions/cookie-manager/cookie-manager-page.c:1080 msgid "_Expand All" msgstr "_Развернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:1082 +#: ../extensions/cookie-manager/cookie-manager-page.c:1088 msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:1134 +#: ../extensions/cookie-manager/cookie-manager-page.c:1140 msgid "Search Cookies by Name or Domain" msgstr "Искать фрагменты данных по имени или домену" @@ -2276,7 +2313,6 @@ msgstr "Задержка загрузки" #: ../extensions/delayed-load.vala:49 -#, fuzzy msgid "Delay in seconds until loading the page:" msgstr "Задержка (в секундах) загруки страницы:" @@ -2315,7 +2351,7 @@ msgid "Download files with \"%s\" or a custom command" msgstr "Загружать файлы с помощью \"%s\" или указанной команды" -#: ../extensions/external-download-manager.vala:318 +#: ../extensions/external-download-manager.vala:320 msgid "External Download Manager - CommandLine" msgstr "Внешний менеджер загрузок - CommandLine" @@ -2328,25 +2364,25 @@ msgstr "Не удалось найти обязательные элементы Atom «feed» в данных XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:378 +#: ../extensions/feed-panel/feed-panel.c:375 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Последнее обновление: %s." -#: ../extensions/feed-panel/feed-panel.c:644 +#: ../extensions/feed-panel/feed-panel.c:629 msgid "Feeds" msgstr "Ленты" -#: ../extensions/feed-panel/feed-panel.c:697 +#: ../extensions/feed-panel/feed-panel.c:682 msgid "Add new feed" msgstr "Добавить ленту" -#: ../extensions/feed-panel/feed-panel.c:704 +#: ../extensions/feed-panel/feed-panel.c:689 msgid "Delete feed" msgstr "Удалить ленту" -#: ../extensions/feed-panel/feed-panel.c:784 +#: ../extensions/feed-panel/feed-panel.c:769 msgid "_Feeds" msgstr "Л_енты" @@ -2381,21 +2417,21 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не удалось найти обязательные элементы RSS «channel» в данных XML." -#: ../extensions/feed-panel/main.c:130 +#: ../extensions/feed-panel/main.c:122 #, c-format msgid "Feed '%s' already exists" msgstr "Лента «%s» уже была добавлена" -#: ../extensions/feed-panel/main.c:207 +#: ../extensions/feed-panel/main.c:199 #, c-format msgid "Error loading feed '%s'" msgstr "Не удалось загрузить ленту «%s»" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:509 msgid "Feed Panel" msgstr "Панель лент новостей" -#: ../extensions/feed-panel/main.c:518 +#: ../extensions/feed-panel/main.c:510 msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" @@ -2470,69 +2506,69 @@ msgid "Failed to select suggestions\n" msgstr "Не удалось выбрать предложения\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Нет непосещенных вкладок" # Используется как заголовок окна настроек дополнения: «Параметры » -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "истории вкладок" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "При закрытии вкладки:" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Ничего не делать" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Переключиться на последнюю активную вкладку" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Переключиться на последнюю открытую вкладку" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "Следующая вкладка (из истории вкладок)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "Следующая новая вкладка из истории" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "Предыдущая новая вкладка (из истории вкладок)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "Предыдущая новая вкладка из истории" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "Открыть вкладку на заднем плане" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "Открывает выделенную вкладку на заднем плане" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "История вкладок" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "Переход к последней использовавшейся вкладке" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Жесты мышью" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" @@ -2540,19 +2576,19 @@ msgid "Reload page or stop loading" msgstr "Обновить/остановить обновление страницы" -#: ../extensions/shortcuts.c:176 +#: ../extensions/shortcuts.c:168 msgid "Customize Keyboard shortcuts" msgstr "Настройка комбинаций клавиш" -#: ../extensions/shortcuts.c:283 -msgid "Customize Sh_ortcuts..." -msgstr "Настроить со_четания клавиш…" +#: ../extensions/shortcuts.c:275 +msgid "Customize Sh_ortcuts…" +msgstr "Настроить _сочетания клавиш…" -#: ../extensions/shortcuts.c:320 +#: ../extensions/shortcuts.c:312 msgid "Shortcuts" msgstr "Комбинации клавиш" -#: ../extensions/shortcuts.c:321 +#: ../extensions/shortcuts.c:313 msgid "View and edit keyboard shortcuts" msgstr "Просмотр и изменение «горячих клавиш»" @@ -2576,23 +2612,23 @@ msgid "Netscape plugins" msgstr "Модули Netscape" -#: ../extensions/statusbar-features.c:261 +#: ../extensions/statusbar-features.c:259 msgid "Statusbar Features" msgstr "Настройка возможностей" -#: ../extensions/statusbar-features.c:262 +#: ../extensions/statusbar-features.c:260 msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "П_анель вкладок" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" @@ -2604,33 +2640,33 @@ msgid "New tabs have no label by default" msgstr "У новых вкладок скрыт заголовок и виден только значок" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Настройка панели инструментов" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "Выбрать и изменить порядок элементов можно с помощью мыши." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Доступные элементы" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Отображаемые элементы" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "Настроить _панель инструментов…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Редактор панели инструментов" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "Простой редактор панели инструментов" @@ -2639,41 +2675,42 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #: ../katze/katze-http-cookies-sqlite.c:129 -#, fuzzy, c-format +#, c-format msgid "Failed to load cookies\n" -msgstr "Не удалось добавить закладку: %s\n" +msgstr "Не удалось загрузить cookies\n" +#. FIXME: granite: should return GtkWidget* like GTK+ #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-privatedata.c:120 +#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-privatedata.c:124 +#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-privatedata.c:137 +#: ../midori/midori-privatedata.c:161 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-privatedata.c:147 +#: ../midori/midori-privatedata.c:171 msgid "Last open _tabs" msgstr "Открытые _вкладки" -#: ../midori/midori-privatedata.c:173 +#: ../midori/midori-privatedata.c:197 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:298 +#: ../midori/midori-privatedata.c:322 msgid "Saved logins and _passwords" msgstr "Сохранённые логины и _пароли" -#: ../midori/midori-privatedata.c:300 +#: ../midori/midori-privatedata.c:324 msgid "Cookies and Website data" msgstr "Cookies и данные веб-сайта" -#: ../midori/midori-privatedata.c:307 +#: ../midori/midori-privatedata.c:331 msgid "Website icons" msgstr "Значки веб-сайтов" @@ -2681,7 +2718,7 @@ msgid "Open tabs" msgstr "Открытые вкладки" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Больше открытых владок..." @@ -2698,10 +2735,9 @@ #: ../midori/midori-bookmarks.c:104 msgid "failed to ATTACH old db" -msgstr "" +msgstr "не удалось подключить старую базу данных" #: ../midori/midori-bookmarks.c:111 -#, fuzzy msgid "failed to import from old db" msgstr "Не удалось импортировать закладки" @@ -2719,7 +2755,7 @@ msgstr "Не удалось создать таблицу закладок: %s\n" #: ../midori/midori-bookmarks.c:274 -#, fuzzy, c-format +#, c-format msgid "Couldn't import from old database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" @@ -2728,33 +2764,33 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" -#: ../midori/midori-session.c:187 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/midori-session.c:355 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/midori-session.c:376 ../midori/midori-frontend.c:447 +#: ../midori/midori-session.c:383 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/midori-session.c:406 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:125 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/midori-frontend.c:308 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2762,49 +2798,323 @@ "Возможно, работа Midori была аварийно прекращена. Если это часто " "повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/midori-frontend.c:318 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Отключить _все дополнения" -#: ../midori/midori-frontend.c:331 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-frontend.c:336 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Закрыть все вкладки" -#: ../midori/midori-frontend.c:399 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Показывать последний _лог ошибок" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "Запустить с помощью _отладчика" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/midori-frontend.c:432 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/midori-frontend.c:463 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/midori-frontend.c:471 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/midori-frontend.c:482 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Игнорировать" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 +#, c-format +msgid "SQL fails: %s" +msgstr "Ошибка SQL: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 +msgid "Accept" +msgstr "Принимать" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 +msgid "Accept for session" +msgstr "Принять на время сесии" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 +msgid "Block" +msgstr "Заблокировать" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 +#, c-format +msgid "Could not open database of extenstion: %s" +msgstr "Не удалось открыть базу данных: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 +#, c-format +msgid "Failed to execute database statement: %s" +msgstr "Не удалось выполнить запрос к базе данных: %s" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 +msgid "Do you really want to delete all cookie permissions?" +msgstr "Удалить все сохранённые куки?" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#, fuzzy +msgid "Delete all cookie permissions?" +msgstr "Удалять старые фрагменты данных через месяц" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 +#, fuzzy +msgid "" +"This action will delete all cookie permissions. You will be asked for " +"permissions again for each web site visited." +msgstr "Этим действием вы удалите все cookie. Вам будет задан вопрос для доступа на каждый посещённый сайт." + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 +msgid "Cookie permission manager" +msgstr "Менеджер доступов cookie" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 +msgid "Instance of current cookie permission manager" +msgstr "" + +#. Set up dialog +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 +msgid "Configure cookie permission" +msgstr "Настроить доступы cookie" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 +#, c-format +msgid "" +"Below is a list of all web sites and the policy set for them. You can delete " +"policies by marking the entries and clicking on Delete.You can also " +"add a policy for a domain manually by entering the domain below, choosing " +"the policy and clicking on Add." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 +msgid "Domain" +msgstr "Домен" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 +msgid "Policy" +msgstr "Политика" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 +msgid "Delete _all" +msgstr "У_далить всё" + +#. Add "ask-for-unknown-policy" checkbox +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 +msgid "A_sk for policy if unknown for a domain" +msgstr "Спрашивать о политике безопасности если домен неизвестен" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 +msgid "" +"A fatal error occurred which prevents the cookie permission manager " +"extension to continue. You should disable it." +msgstr "С менеджером доступов cookie произошла критическая ошибка. Вы должны отключить его." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 +msgid "Error in cookie permission manager extension" +msgstr "Ошибка в модуле доступов cookie" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 +msgid "Reason" +msgstr "Причина" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 +msgid "Could not get path to configuration of extension: path is NULL" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 +msgid "Could not get path to configuration of extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#, c-format +msgid "Could not create configuration folder for extension: %s" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 +msgid "Could not create configuration folder for extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 +#, fuzzy +msgid "Could not open database of extension." +msgstr "Не удалось открыть базу данных: %s\n" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 +msgid "Could not set up database structure of extension." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 +#, c-format +msgid "Could not determine global cookie policy to set for domain: %s" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 +#, c-format +msgid "The website %s wants to store %d cookies." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 +#, c-format +msgid "The website %s wants to store a cookie." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 +#, c-format +msgid "Multiple websites want to store %d cookies in total." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +#, fuzzy +msgid "Accept for this _session" +msgstr "Удалить _данные последнего сеанса" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 +msgid "Path" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 +msgid "Value" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 +msgid "Expire date" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 +#, fuzzy +msgid "Extension instance" +msgstr "Дополнения" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 +msgid "The Midori extension instance for this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 +#, fuzzy +msgid "Application instance" +msgstr "Приложения" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 +msgid "The Midori application instance this extension belongs to" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 +msgid "Database instance" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 +msgid "Pointer to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 +msgid "Ask for unknown policy" +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 +msgid "" +"If true this extension ask for policy for every unknown domain.If false this " +"extension uses the global cookie policy set in Midori settings." +msgstr "" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 +msgid "Undetermined" +msgstr "" + +#: ../extensions/cookie-permissions/main.c:62 +#, fuzzy +msgid "Cookie Security Manager" +msgstr "Менеджер фрагментов данных" + +#: ../extensions/cookie-permissions/main.c:63 +msgid "Manage cookie permission per site" +msgstr "" + +#~ msgid "Writing failed." +#~ msgstr "Ошибка записи." + +#~ msgid "_Window" +#~ msgstr "_Окно" + +#~ msgid "Custom..." +#~ msgstr "Другая…" + +#~ msgid "What to identify as to web pages" +#~ msgstr "" +#~ "Строка, которая будет посылаться на запросы идентификации обозревателя" + +#~ msgid "Kinetic scrolling" +#~ msgstr "Инерционная прокрутка" + +#~ msgid "Whether scrolling should kinetically move according to speed" +#~ msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" + #~ msgid "Redirects console warnings to the specified FILENAME" #~ msgstr "Перенаправить предупреждения из консоли в выбранный ФАЙЛ" @@ -2910,9 +3220,6 @@ #~ msgid "The homepage" #~ msgstr "Домашняя страница" -#~ msgid "Show crash dialog" -#~ msgstr "Показывать окно действий после сбоя" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "Папка, в которую будут сохраняться файлы" @@ -3241,9 +3548,6 @@ #~ msgid "Big" #~ msgstr "Большой" -#~ msgid "Reset the last _session" -#~ msgstr "Удалить _данные последнего сеанса" - #~ msgid "Failed to execute database statement\n" #~ msgstr "Не удалось выполнить запрос к базе данных\n" @@ -3286,9 +3590,6 @@ #~ msgid "Where to open externally opened pages" #~ msgstr "Расположение сторонних страниц при открытии" -#~ msgid "Accept cookies" -#~ msgstr "Принимать фрагменты данных" - #~ msgid "What type of cookies to accept" #~ msgstr "Разрешённый тип фрагментов данных" @@ -3334,9 +3635,6 @@ #~ msgid "Navigationbar" #~ msgstr "Панель навигации" -#~ msgid "Applications" -#~ msgstr "Приложения" - #~ msgid "External applications" #~ msgstr "Внешние приложения" @@ -3352,9 +3650,6 @@ #~ msgid "Delete old cookies after 1 week" #~ msgstr "Удалять старые фрагменты данных через неделю" -#~ msgid "Delete old cookies after 1 month" -#~ msgstr "Удалять старые фрагменты данных через месяц" - #~ msgid "Delete old cookies after 1 year" #~ msgstr "Удалять старые фрагменты данных через год" @@ -3402,9 +3697,6 @@ #~ msgid "Show the documentation" #~ msgstr "Документация" -#~ msgid "Show Blank page" -#~ msgstr "Открыть пустую страницу" - #~ msgid "_Save Link destination" #~ msgstr "_Сохранить объект" @@ -3539,9 +3831,6 @@ #~ msgid "Open _Link" #~ msgstr "_Открыть ссылку" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Открыть изображение в новом _окне" - #~ msgid "Not available on this platform" #~ msgstr "Недоступно для данной платформы" @@ -3723,9 +4012,6 @@ #~ msgid "The trash, collecting recently closed tabs and windows" #~ msgstr "Корзина. Сохраняет закрытые вкладки и окна" -#~ msgid "Search Engines" -#~ msgstr "Средства поиска" - #~ msgid "The list of search engines" #~ msgstr "Список средств поиска" diff -Nru midori-0.4.9/po/sr.po midori-0.5.0/po/sr.po --- midori-0.4.9/po/sr.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/sr.po 2013-04-04 20:31:20.000000000 +0000 @@ -4,21 +4,20 @@ # Милош Поповић 2009 # Мирослав Николић , 2012, 2013. # Саша Петровић , 2012, 2013. -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-02 18:42+0000\n" +"POT-Creation-Date: 2013-03-27 17:54+0000\n" "PO-Revision-Date: 2013-03-03 14:22+0100\n" "Last-Translator: Саша Петровић \n" "Language-Team: српски <>\n" -"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) \n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "X-Generator: Gtranslator 2.91.6\n" #: ../data/midori.desktop.in.h:1 @@ -29,9 +28,9 @@ msgid "Internet;WWW;Explorer" msgstr "Интернет;ВВВ;Истраживач" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Мидори" @@ -43,11 +42,11 @@ msgid "New Private Browsing Window" msgstr "Нови прозор приватног прегледања" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 msgid "New Tab" msgstr "Нови лист" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 msgid "New Window" msgstr "Нови прозор" @@ -63,7 +62,7 @@ msgid "Open a new private browsing window" msgstr "Отворите нови прозор приватног прегледања" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Приватно прегледање" @@ -149,202 +148,207 @@ msgid "SECONDS" msgstr "СЕКУНДЕ" -#: ../midori/main.c:155 -#, c-format +#: ../midori/main.c:147 msgid "Error: \"gdb\" can't be found\n" msgstr "Грешка: Нисам успео да пронађем „gdb“\n" -#: ../midori/main.c:181 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Пошаљите примедбе, предлоге и грешке на:" -#: ../midori/main.c:183 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Преузмите новије издање са:" -#: ../midori/main.c:338 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Догодила се непозната грешка" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Неочекивана радња „%s“." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6116 msgid "_Bookmarks" msgstr "_Забелешке" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1342 msgid "Add Boo_kmark" msgstr "_Додај забелешку" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1343 msgid "_Extensions" msgstr "П_роширења" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:153 msgid "_History" msgstr "_Историјат" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1345 msgid "_Userscripts" msgstr "Личне _скрипте" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1346 msgid "User_styles" msgstr "Лични с_тилови" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1347 msgid "New _Tab" msgstr "Нови _лист" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1348 msgid "_Transfers" msgstr "Пр_еноси" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1349 msgid "Netscape p_lugins" msgstr "Нетскејп _додаци" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1350 msgid "_Closed Tabs" msgstr "_Затворени листови" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5255 msgid "New _Window" msgstr "_Нови прозор" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1352 msgid "New _Folder" msgstr "Нова _фасцикла" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 msgid "[Addresses]" msgstr "[Адресе]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Није нађена датотека." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Документ је лоше форматиран." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Непознат формат забелешки." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5391 msgid "Go forward to the next page" msgstr "Идите на следећу страницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5402 msgid "Go to the next sub-page" msgstr "Идите на следећу садржану страницу" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5349 msgid "Reload the current page" msgstr "Поново учитајте тренутну страницу" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5346 msgid "Stop loading the current page" msgstr "Зауставите учитавање тренутне странице" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:525 #, c-format msgid "Failed to update title: %s\n" msgstr "Нисам успео да освежим наслов: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Вредност „%s“ је неисправна за %s" + +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Неочекивана радња „%s“." + +#: ../midori/midori-browser.c:691 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Приватно прегледање)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Забелешке" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Нова фасцикла" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Уреди фасциклу" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Нова забелешка" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Уреди забелешку" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:933 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Укуцајте име за ову забелешку и изаберите место чувања." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:989 msgid "Add to _Speed Dial" msgstr "Додај у _брзе посете" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:995 msgid "Show in the tool_bar" msgstr "Прикажи у траци _алата" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1003 msgid "Run as _web application" msgstr "Покрени као _веб програм" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4498 msgid "Save file as" msgstr "Сачувај датотеку као" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1129 msgid "Save associated _resources" msgstr "Сачувај придружени _садржај" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1359 msgid "A new window has been opened" msgstr "Нови прозор је отворен" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1362 msgid "A new tab has been opened" msgstr "Нови лист је отворен" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1380 msgid "Error opening the image!" msgstr "Грешка приликом отварања слике!" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1381 msgid "Can not open selected image in a default viewer." msgstr "Не могу да отворим изабрану слику у основном прегледачу." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1387 msgid "Error downloading the image!" msgstr "Грешка у преузимању слике!" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1388 msgid "Can not download selected image." msgstr "Не могу да преузмем изабрану слику." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Сачувај датотеку" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Отворите датотеку" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2547 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -358,24 +362,24 @@ "Или идите на „Поставке, Разгледање“ у Мидорију, и изаберите „Читач вести“. " "Следећи пут када кликнете на иконицу довода вести, биће аутоматски додат." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Нови довод" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5415 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Додајте нову забелешку" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#: ../midori/midori-browser.c:3111 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Празно" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3493 ../midori/midori-browser.c:3494 msgid "Toggle text cursor navigation" msgstr "Искључује навигацију текста курсором" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3496 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -383,110 +387,110 @@ "Притисак на Ф7 пребацује прегледање курсором. Када је активан, текстуални " "курсор се појављује на свим веб странама." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3499 msgid "_Enable Caret Browsing" msgstr "_Укључи прегледање курсором" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3915 ../midori/midori-browser.c:5863 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не могу да уметнем нову ставку историјата: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Отвори с_ве у листовима" # bug: no plural-forms -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Отвори у новом _листу" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Отвори у _новом прозору" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4329 msgid "Arora" msgstr "Арора" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4330 msgid "Kazehakase" msgstr "Кејзхакејз" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4331 msgid "Opera" msgstr "Опера" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4332 msgid "Konqueror" msgstr "К-освајач" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4333 msgid "Epiphany" msgstr "Спознаја" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4334 #, c-format msgid "Firefox (%s)" msgstr "Фајерфокс (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4335 msgid "Midori 0.2.6" msgstr "Мидори 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4353 msgid "Import bookmarks…" msgstr "Увези забелешке…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4356 ../midori/midori-browser.c:5420 msgid "_Import bookmarks" msgstr "Увези _забелешке" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4367 msgid "_Application:" msgstr "_Програм:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4432 msgid "Import from XBEL or HTML file" msgstr "Увези из ИксБЕЛ или ХТМЛ датотеке" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4460 msgid "Import from a file" msgstr "Увези из датотеке" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4472 msgid "Failed to import bookmarks" msgstr "Нисам успео да увезем обележиваче" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4503 msgid "XBEL Bookmarks" msgstr "ИксБЕЛ обележивачи" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4508 msgid "Netscape Bookmarks" msgstr "Нетскејп обележивачи" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4522 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Мидори може само да извезе у ИксБЕЛ (*.xbel) и Нетскејп (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4537 msgid "Failed to export bookmarks" msgstr "Нисам успео да извезем обележиваче" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4753 msgid "A lightweight web browser." msgstr "Једноставан Интернет прегледник." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4754 msgid "See about:version for version info." msgstr "Погледајте „about:version“ за податке о издању." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4756 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -498,381 +502,382 @@ "слободног софтвера; било верзије 2.1 те лиценце, или (према вашем мишљењу) " "било које новије верзије." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4791 msgid "translator-credits" msgstr "" "Милош Поповић \n" "\n" "http://prevod.org — превод на српски језик." -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5253 msgid "_File" msgstr "_Датотека" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5256 msgid "Open a new window" msgstr "Отворите нови прозор" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5259 msgid "Open a new tab" msgstr "Отворите нови лист" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5261 msgid "New P_rivate Browsing Window" msgstr "Нови прозор _приватног прегледања" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5265 msgid "Open a file" msgstr "Отворите датотеку" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5267 msgid "_Save Page As…" msgstr "_Сачувај страницу као…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5268 msgid "Save to a file" msgstr "Сачувајте у датотеку" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5270 msgid "Add to Speed _dial" msgstr "Додај у _брзе посете" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5274 msgid "Create _Launcher" msgstr "Направи _покретач" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5277 msgid "Subscribe to News _feed" msgstr "Претплати се на _довод вести" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5283 msgid "_Close Tab" msgstr "З_атвори лист" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5284 msgid "Close the current tab" msgstr "Затворите тренутни лист" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5286 msgid "C_lose Window" msgstr "_Затвори прозор" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5290 msgid "_Share" msgstr "_Дели" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5291 msgid "Share this page" msgstr "Дели ову страницу" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5295 msgid "Print the current page" msgstr "Штампајте тренутну страницу" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5298 msgid "Close a_ll Windows" msgstr "Затвори _све прозоре" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5301 msgid "_Edit" msgstr "_Уређивање" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5324 msgid "_Find…" msgstr "_Пронађи…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5325 msgid "Find a word or phrase in the page" msgstr "Пронађите жељену реч или израз унутар странице" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5327 msgid "Find _Next" msgstr "Нађи _следеће" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5330 msgid "Find _Previous" msgstr "Нађи _претходно" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5334 msgid "Configure the application preferences" msgstr "Подесите поставке програма" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5336 msgid "_View" msgstr "П_реглед" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5337 msgid "_Toolbars" msgstr "Траке _алата" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5342 msgid "Reload page without caching" msgstr "Учитај страницу без причувавања" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5352 msgid "Increase the zoom level" msgstr "Увећајте ниво приказа" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5355 msgid "Decrease the zoom level" msgstr "Умањите ниво приказа" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5359 msgid "_Encoding" msgstr "_Кодирање" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5361 msgid "View So_urce" msgstr "Прикажи _извор" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5364 msgid "Ca_ret Browsing" msgstr "Прегледање _курсором" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5368 msgid "Toggle fullscreen view" msgstr "Пребаците приказ преко целог екрана" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5370 msgid "Scroll _Left" msgstr "Клизај ле_во" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5373 msgid "Scroll _Down" msgstr "Клизај до_ле" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5376 msgid "Scroll _Up" msgstr "Клизај го_ре" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5379 msgid "Scroll _Right" msgstr "Клизај де_сно" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5382 msgid "_Readable" msgstr "_Читљив" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5385 msgid "_Go" msgstr "_Иди" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5388 msgid "Go back to the previous page" msgstr "Идите на претходну страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5395 msgid "Go to the previous sub-page" msgstr "Идите на претходну садржану страницу" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5404 msgid "_Homepage" msgstr "По_четна страница" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5405 msgid "Go to your homepage" msgstr "Идите на почетну страницу" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5407 msgid "Empty Trash" msgstr "Испразни смеће" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5410 msgid "Undo _Close Tab" msgstr "_Опозови затварање листа" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5417 msgid "Add a new _folder" msgstr "Додај нову _фасциклу" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5423 msgid "_Export bookmarks" msgstr "_Извези забелешке" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5426 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "По_деси погоне претраге" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5429 msgid "_Clear Private Data" msgstr "Очисти _личне податке" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5432 msgid "_Inspect Page" msgstr "_Прегледај страницу" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5436 msgid "_Previous Tab" msgstr "_Претходни лист" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5439 msgid "_Next Tab" msgstr "_Следећи лист" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5441 msgid "Move Tab to _first position" msgstr "Помери лист на _прво место" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5443 msgid "Move Tab _Backward" msgstr "Премести лист уна_зад" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5445 msgid "_Move Tab Forward" msgstr "Премести лист уна_пред" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5447 msgid "Move Tab to _last position" msgstr "Помери лист на _задње место" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5450 msgid "Focus _Current Tab" msgstr "Приближи _тренутни лист" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5453 msgid "Focus _Next view" msgstr "Приближи _следећи преглед" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5456 msgid "Only show the Icon of the _Current Tab" msgstr "Прикажи само иконицу _тренутног листа" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5459 msgid "_Duplicate Current Tab" msgstr "_Удвостручи тренутни лист" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5462 msgid "Close Ot_her Tabs" msgstr "Затвори _друге листове" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5465 msgid "Open last _session" msgstr "Отвори последњу _сесију" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5468 msgid "_Help" msgstr "_Помоћ" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5470 msgid "_Frequent Questions" msgstr "_Честа питања" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5473 msgid "_Report a Problem…" msgstr "Пријавите _проблем…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5478 ../midori/midori-browser.c:6135 msgid "_Tools" msgstr "_Алати" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5485 msgid "_Menubar" msgstr "Трака _избора" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5489 msgid "_Navigationbar" msgstr "Трака _кретања" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5493 msgid "Side_panel" msgstr "Бочна _површ" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5494 msgid "Sidepanel" msgstr "Бочна површ" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5497 msgid "_Bookmarkbar" msgstr "Трака _забелешки" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5501 msgid "_Statusbar" msgstr "Трака _стања" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Самостално" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Кинески Традиционални (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Кинески поједностављени (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5520 msgid "Japanese (SHIFT__JIS)" msgstr "Јапански (SHIFT__JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5523 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Корејски (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5526 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Руски (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5529 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Уникод (UTF-_8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5532 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Западни (I_SO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5535 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Прилагођено…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6041 msgid "_Separator" msgstr "_Раздвајач" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6048 msgid "_Location…" msgstr "На _адресу…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6050 msgid "Open a particular location" msgstr "Отворите нарочиту адресу" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6072 msgid "_Web Search…" msgstr "П_ретражи веб…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6074 msgid "Run a web search" msgstr "Покрените претрагу веба" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6101 msgid "Reopen a previously closed tab or window" msgstr "Вратите претходно затворене прозоре или листове" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6118 msgid "Show the saved bookmarks" msgstr "Прикажите сачуване обележиваче" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6151 msgid "_Tabs" msgstr "_Листови" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6153 msgid "Show a list of all open tabs" msgstr "Прикажите списак свих отворених листова" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6167 msgid "_Menu" msgstr "_Изборник" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6169 msgid "Menu" msgstr "Изборник" -#: ../midori/midori-browser.c:6930 +#: ../midori/midori-browser.c:6934 #, c-format msgid "Unexpected setting '%s'" msgstr "Неочекивана поставка „%s“" @@ -933,24 +938,24 @@ msgid "Self-signed" msgstr "Са сопственим потписом" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Безбедносни детаљи" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Налепи и _настави" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Непроверено" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Проверена и шифрована веза" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Отворена, нешифрована веза" @@ -967,397 +972,391 @@ msgid "Align sidepanel to the left" msgstr "Поставите бочну површ на леву страну" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Прикажи брзе посете" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Прикажи почетну страницу" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Прикажи последње отворене језичке" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "Прикажи последње језичке без учитавања" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Прикажи празну страницу" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Прикажи подразумевани погон претраге" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Прикажи прилагођену страницу" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Јапански (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Прилагођено…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "новом листу" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "новом прозору" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "тренутном листу" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Уобичајено" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Иконице" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Мале иконице" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Иконице и текст" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Текст поред иконица" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Самостално (Гном или окружење)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "ХТТП сервер посредник" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Без посредничког сервера" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Кром" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Сафари" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "Ајфон" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Фајерфокс" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Интернет експлорер" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Стил траке алата:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Одређује изглед траке алата" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Када се Мидори покрене:" - -# bug(slobo): једноставно разлистај? -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Отвори нове странице у:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Представи се као" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Одређује како ће се програм представити веб страницама" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Увек користи моје изборе словног лика" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "" "Преписује словне ликове изабране веб сајтовима оним које изабере корисник" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не могу да учитам подешавања: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Вредност „%s“ је неисправна за %s" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неисправна је вредност „%s“ у подешавањима" -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Не могу да уметнем пресвлаку: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Верујте овом веб сајту" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Непозната безбедност" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s жели да сачува ХТМЛ5 базу податдака." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Одбиј" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Допусти" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s жели да зна ваше место." -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Грешка — %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не могу да учитам страницу „%s“." -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Покушај поново" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Грешка - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Нешто је пошло наопако са „%s“" + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Пошаљи поруку %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Додајте погон претраге" -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "Провери _елемент" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Отвори везу у новом _листу" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Отвори везу у про_челном листу" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Отвори везу у по_задинском листу" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Отвори везу у _новом прозору" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Отвори везу као веб _програм" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "Умножи _одредиште везе" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "Сачувај _као…" +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Отвори _слику у новом прозору" + # bug: no plural-forms -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Отвори слику у _новом листу" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Умножи _слику" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Сачувај _слику" # bug: no plural-forms -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Отвори у _прегледнику слика" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Умножи _адресу снимка" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Сачувај _снимак" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Преузми _снимак" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Пре_тражи са" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "П_ретражи Интернет" # bug: no plural-forms -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Отвору адресу у новом _листу" # bug: no plural-forms -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Отвори кадар у новом _листу" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Отворите или преузмите датотеку из %s" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Назив датотеке: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Врста датотеке: „%s“" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Врста датотеке: %s („%s“)" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Величина: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Отворите %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Провера странице — %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Није инсталирана помоћ" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "Мидори не чува никакве личне податке:" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Нису сачувани ни историјат ни веб колачићи." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Проширења су искључена." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "" "ХТМЛ5 скалдиштење, месна база података и причувавања програма су искључена." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Мидори спречава веб сајтове да прате корисника:" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "Адресе преусмеривача су отцепљене на назив домаћина." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "ДНС довлачење је искључено." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "Језик и временска зона нису откривени веб сајтовима." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "Веб сајтови не могу да излистају Флеш или друге Нетскејп прикључке." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "Бројеви издања у заградама приказују издање коришћено за време покретања." -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Учитавање странице је одложено" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Учитавање је одложено или због недавног пада програма или због поставки " "покретања." -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Учитај страницу" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Празна страница" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "_Удвостручи лист" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "Прикажи _натпис листа" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "Прикажи само _иконицу листа" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Затвори _други лист" @@ -1365,24 +1364,24 @@ msgstr[2] "Затвори _друге листове" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "Претходно" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "Следеће" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Прикажи позадинске слике" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Одређује да ли треба приказати слике за позадину" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Могућности" @@ -1488,114 +1487,118 @@ msgid "Startup" msgstr "Покретање" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Када се Мидори покрене:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Матична страница:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Користи _тренутну страницу" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Искористи тренутну страницу као почетну" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Словни ликови" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Породица сразмерног писма" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Основна породица писма за приказ текста" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Основна величина писма за приказ текста" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Породица писма сталне ширине" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Породица писма за приказ текста сталне ширине" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "Величина писма за приказ текста сталне ширине" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Најмања величина писма" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Најмања величина писма за приказ текста" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Омиљено кодирање" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Понашање" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Сам учитај слике" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Укључи проверу писања" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Укључи скрипте" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Укључи ВебГЛ подршку" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Укључи прикључке Нетскејпа" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Увећај текст и слике" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Омогући скриптама да отворе облачиће" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" "Да ли ће скриптама бити допуштено да самостално отварају искачуће прозоре" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:415 msgid "Middle click opens Selection" msgstr "Средњи клик отвара избор" -#: ../midori/midori-preferences.c:401 +#: ../midori/midori-preferences.c:416 msgid "Load an address from the selection via middle click" msgstr "Учитава адресу из избора на средњи клик мишем" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:420 msgid "Flash window on background tabs" msgstr "Трепни прозором на позадинским листовима" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:425 msgid "Preferred languages" msgstr "Пожељни језици" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1603,95 +1606,117 @@ "Зарезом одвојен списак пожељних језика за исцртавање вишејезичних веб " "страница, на пример „de“, „ru,nl“ или „en-us;q=1.0, fr-fr;q=0.667“" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:431 msgid "Save downloaded files to:" msgstr "Сачувај преузете датотеке у:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:438 msgid "Browsing" msgstr "Разгледање" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Стил траке алата:" + +# bug(slobo): једноставно разлистај? +#: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Отвори нове странице у:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Понашање новог језичка:" + +#: ../midori/midori-preferences.c:456 msgid "Close Buttons on Tabs" msgstr "Дугме за затварање листова" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:460 msgid "Always Show Tabbar" msgstr "Увек прикажи листове" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:464 msgid "Open Tabs next to Current" msgstr "Отворите листове поред тренутног" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:465 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Да ли да отвори нове листове поред текућег или након последњег листа" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:468 msgid "Open tabs in the background" msgstr "Отворите листове у позадини" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:472 msgid "Text Editor" msgstr "Уређивач текста" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:477 msgid "News Aggregator" msgstr "Читач вести" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:484 msgid "Network" msgstr "Мрежа" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:486 msgid "Proxy server" msgstr "Сервер посредник" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:491 msgid "Hostname" msgstr "Домаћин" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:499 msgid "Port" msgstr "Прикључак" +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Подржане врсте посредника" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 #: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 msgid "Web Cache" msgstr "Веб кеш" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 msgid "The maximum size of cached pages on disk" msgstr "Највећа величина причуваних страница на диску" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:538 msgid "MB" msgstr "MB" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Представи се као" + +#: ../midori/midori-preferences.c:560 msgid "Privacy" msgstr "Приватност" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:562 msgid "Delete old Cookies after:" msgstr "Обриши старе колачиће након:" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 msgid "The maximum number of days to save cookies for" msgstr "Највећи број дана за које ће бити причувани колачићи" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:571 msgid "Only accept Cookies from sites you visit" msgstr "Прихвати колачиће само са сајтова које посетим" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:572 msgid "Block cookies sent by third-party websites" msgstr "Блокира колачиће које пошаљу веб сајтови трећих страна" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:577 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1699,74 +1724,74 @@ "Колачићи чувају податке пријава, сачуване игре, или корисничке профиле за " "сврхе оглашавања." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:584 msgid "Enable offline web application cache" msgstr "Укључи тренутну меморију веб програма ван мреже" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:587 msgid "Enable HTML5 local storage support" msgstr "Укључи подршку ХТМЛ5 месног скалдиштења" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:591 msgid "Strip referrer details sent to websites" msgstr "Отцепи податке преусмеривача послате веб сајтовима" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:593 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Да ли заглавље преусмеривача треба да буде скраћено на назив домаћина" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:596 msgid "Delete pages from history after:" msgstr "Обриши странице из историјата након:" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 msgid "The maximum number of days to save the history for" msgstr "Највећи број дана за које ће бити причуван историјат" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Проширења" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Додајте погон претраге" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Уреди погон претраге" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Назив:" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "_Израз:" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Подеси погоне претраге" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "_Постави за основни" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не могу да учитам погоне претраге. %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не могу да сачувам погоне претраге. %s" @@ -1811,9 +1836,14 @@ msgstr "Изаберите програм или наредбу којом ће бити отворено „%s“:" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Не могу да покренем спољни програм." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "Неисправна УРИ адреса" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1835,28 +1865,28 @@ msgid "Close Findbar" msgstr "Затворите траку за претрагу" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "Датотека „%s“ је преузета." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Пренос је завршен" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Очисти све" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Неке датотеке су преузете" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Напусти Мидори" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Преноси ће бити отказани ако затворите Мидори." @@ -1987,47 +2017,47 @@ msgid "Animation frames are broken" msgstr "Оквири са анимацијама су неисправни" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Вредност „%s“ није исправна за %s" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Изаберите датотеку" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Изаберите фасциклу" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "Ништа" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 сата" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 дана" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 недеље" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 месеца" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 године" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Поставке за %s" @@ -2044,7 +2074,7 @@ msgid "Configure Advertisement filters" msgstr "Подесите пропуснике реклама" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2053,27 +2083,27 @@ "Упишите адресу претподешеног списка филтера у поље за унос текста и кликните " "„Додај“ да га додате на списак. Више спискова можете да пронађете на %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Измени правило" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Правило:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Блокирај _слику" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Блокирај _везу" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Зауставник реклама" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Блокира рекламе у складу са списком пропусника" @@ -2163,11 +2193,11 @@ msgid "Support for userscripts and userstyles" msgstr "Подршка за корисничке скрипте и корисничке стилове" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Листови у боји" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Обојите сваки лист другачије" @@ -2248,7 +2278,7 @@ "Колачићи: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 msgid "Name" msgstr "Назив" @@ -2483,69 +2513,69 @@ msgid "Failed to select suggestions\n" msgstr "Нисам успео да изаберем предлоге\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Нема непосећених листова" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Списак историјата" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Понашање затварања листа" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Не ради ништа" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Пребаци на последњи виђени лист" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Пребаци на најновији лист" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:443 msgid "Next new Tab (History List)" msgstr "Следећи нови лист (списак историјата)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:444 msgid "Next new tab from history" msgstr "Следећи нови лист из историјата" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:453 msgid "Previous new Tab (History List)" msgstr "Претходни нови лист (списак историјата)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:454 msgid "Previous new tab from history" msgstr "Претходни нови лист из историјата" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:463 msgid "Display tab in background (History List)" msgstr "Прикажи лист у позадини (списак историјата)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:464 msgid "Display the current selected tab in background" msgstr "Прикажи текући изабрани лист у позадини" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:591 msgid "History List" msgstr "Списак историјата" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:592 msgid "Move to the last used tab when switching or closing tabs" msgstr "" "Прелази на последње коришћени лист приликом пребацивања или затварања листова" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Гестови миша" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Управља Мидоријем помоћу миша" @@ -2558,7 +2588,7 @@ msgstr "Прилагодите пречице са тастатуре" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." +msgid "Customize Sh_ortcuts…" msgstr "Прилагодите _пречице…" #: ../extensions/shortcuts.c:312 @@ -2597,15 +2627,15 @@ msgid "Easily toggle features on web pages on and off" msgstr "Једноставно укључује и искључује опције на веб страницама" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Бочна површ" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Бочна _површ" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Приказује листове у усправној површи" @@ -2617,11 +2647,11 @@ msgid "New tabs have no label by default" msgstr "Нови листови немају ознаку по задатим поставкама" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Прилагоди траку алата" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2629,23 +2659,23 @@ "Изаберите ставке које ће бити приказане на траци алата. Ставкама може бити " "промењено место превлачењем и увацивањем." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Доступне ставке" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Приказане ставке" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "_Подеси траку алата…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Уређивач траке алата" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "Лако мењајте распоред траке алата" @@ -2742,34 +2772,34 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Не могу да сачувам обележиваче. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Није доступна корена датотека уверења. ССЛ уверења не могу бити проверена." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не могу да сачувам подешавања. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не могу да учитам сесију: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не могу да сачувам сесију. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не могу да сачувам документ. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2777,101 +2807,109 @@ "Изгледа да је Мидори неисправно завршио рад приликом последњег покретања. " "Уколико се ово често понавља покушајте неки од понуђених предлога." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "Измени пос_тавке" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Онемогући сва п_роширења" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Приказује прозорче након пада Мидорија" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Одбаци старе језичке" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Прикажи последњи _дневник грешака" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "Покрени уз _праћење грешака" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "" "Један примерак Мидорија је већ покренут али не даје одзив.\n" "\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не могу да учитам забелешку: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не могу да учитам смеће: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не могу да учитам историјат: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "Јавиле су се следеће грешке:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Занемари" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 #, c-format msgid "SQL fails: %s" msgstr "СКуЛ грешка: %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 msgid "Accept" msgstr "Прихвати" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 msgid "Accept for session" msgstr "Прихвати за ову сесију" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 msgid "Block" msgstr "Забрани" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format msgid "Could not open database of extenstion: %s" msgstr "Не могу да отворим базу података са наставко,: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 #, c-format msgid "Failed to execute database statement: %s" msgstr "Нисам успео да извршим тврдњу базе података: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Да ли желите да обришете све дозволе колачића?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Обрисати све дозволе колачића?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." @@ -2879,20 +2917,20 @@ "Ова радња ће избрисати све дозволе колачића. Бићете поново упитани за свако " "посећено веб место." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Управник дозволама колачића" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "Примерак тренутног управника колачића" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "Подесите дозволе колачићима" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2905,25 +2943,25 @@ "правило за домен ручно уносом домена ниже, одабиром правила и кликом на " "Додај." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 msgid "Domain" msgstr "Домен" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "Правило" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "Обриши _све" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "Пи_тај за правило ако је непозната за одређени домен" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." @@ -2931,122 +2969,128 @@ "Десила се кобна грешка која спречава даљи рад управника дозвола колачића. " "Потребно је да га онемогућите." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "Грешка у проширењу управника овлашћења колачића" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "Разлог" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 msgid "Could not get path to configuration of extension: path is NULL" msgstr "Нисам успео да поставим путању ка поставкама проширења: путања је NULL" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 msgid "Could not get path to configuration of extension." msgstr "Нисам успео да поставим путању до поставки проширења." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "Нисам успео да образујем фасциклу поставки за проширење: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 msgid "Could not create configuration folder for extension." msgstr "Нисам успео да образујем фасциклу проширења." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 msgid "Could not open database of extension." msgstr "Нисам успео да отворим базу података." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 msgid "Could not set up database structure of extension." msgstr "Нисам успео да поставим грађу проширења." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "Нисам успео да одредим подешавања општег правила за домен: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "Потврди сладиштење колачића" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "Док сесија траје" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 #, c-format msgid "The website %s wants to store %d cookies." msgstr "Веб место %s жели да ускладишти %d колачића." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 #, c-format msgid "The website %s wants to store a cookie." msgstr "Веб место %s жели да ускладишти колачић." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "Више веб места желе да ускладиште %d колачића укупно." -#. Create expander for details -#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 -msgid "_Details" -msgstr "_Појединости" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "_Прихвати" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Прихвати за ову _сесију" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "Од_биј" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" +msgstr "_Овог пута одбиј" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 msgid "Path" msgstr "Путања" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 msgid "Value" msgstr "Вредност" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 msgid "Expire date" msgstr "Датум истека" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" -msgstr "_Прихвати" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "Прихвати за ову _сесију" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" -msgstr "Од_биј" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 msgid "Extension instance" msgstr "Примерак проширења" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 msgid "The Midori extension instance for this extension" msgstr "Примерак проширења Мидорија за ово проширење" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 msgid "Application instance" msgstr "Примерак програма" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 msgid "The Midori application instance this extension belongs to" msgstr "Примерак програма Мидори коме ово проширење припада" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 msgid "Database instance" msgstr "Примерак базе података" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 msgid "Pointer to sqlite database instance used by this extension" msgstr "Показивач на базу података „sqlite“ коришћен овим проширењем" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "Путања базе података" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "Путања ка бази података „sqlite“ коришћена овим проширењем" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 msgid "Ask for unknown policy" msgstr "Питај за непознато правило" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 msgid "" "If true this extension ask for policy for every unknown domain.If false this " "extension uses the global cookie policy set in Midori settings." @@ -3055,7 +3099,7 @@ "нетачно, ово проширење ће користити поставке општег правила колачића у " "поставкама Мидорија." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 msgid "Undetermined" msgstr "Неодређено" @@ -3067,6 +3111,18 @@ msgid "Manage cookie permission per site" msgstr "Управљај дозволама колачића по пореклу" +#~ msgid "Confirm storing cookie" +#~ msgstr "Потврди сладиштење колачића" + +#~ msgid "_Details" +#~ msgstr "_Појединости" + +#~ msgid "Custom..." +#~ msgstr "Прилагођено…" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Одређује како ће се програм представити веб страницама" + #~ msgid "Writing failed." #~ msgstr "Није успело уписивање." diff -Nru midori-0.4.9/po/sv.po midori-0.5.0/po/sv.po --- midori-0.4.9/po/sv.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/sv.po 2013-04-04 20:31:20.000000000 +0000 @@ -4,2334 +4,3623 @@ # Mikael Magnusson , 2008. # Daniel Nylander , 2008, 2009. # Oscar Rentzhog 2010. -# +# msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-29 23:58+0200\n" +"POT-Creation-Date: 2013-03-27 17:54+0000\n" "PO-Revision-Date: 2009-12-16 18:44+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "Resurssnål webbläsare" +msgid "Browse the Web" +msgstr "Surfa på webben" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1343 -#: ../midori/main.c:1517 -#: ../midori/main.c:1525 -#: ../midori/main.c:1536 -#: ../midori/midori-websettings.c:287 +msgid "Internet;WWW;Explorer" +msgstr "Internet;WWW;Explorer" + +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1440 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Midori" -#: ../data/midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:4 +msgid "Midori Web Browser" +msgstr "Webbläsaren Midori" + +#: ../data/midori.desktop.in.h:5 +msgid "New Private Browsing Window" +msgstr "Nytt Privat Fönster" + +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1362 +msgid "New Tab" +msgstr "Ny Flik" + +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1359 +msgid "New Window" +msgstr "Nytt Fönster" + +#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Webbläsare" -#: ../midori/main.c:96 -#, c-format -msgid "The configuration couldn't be loaded: %s\n" -msgstr "Konfigurationsfilen kunde inte läsas in: %s\n" - -#: ../midori/main.c:151 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Värdet \"%s\" är ogiltigt för %s" - -#: ../midori/main.c:158 -#: ../midori/main.c:238 -#, c-format -msgid "Invalid configuration value '%s'" -msgstr "Ogiltigt konfigurationsvärde för '%s'" - -#: ../midori/main.c:350 -#, c-format -msgid "Failed to open database: %s\n" -msgstr "Misslyckades med att öppna databasen: %s\n" - -#: ../midori/main.c:382 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "" - -#: ../midori/main.c:436 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Borttagning av historikpost misslyckades: %s\n" - -#: ../midori/main.c:460 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Misslyckades med att rensa historik: %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 "" - -#. 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 "Borttagning av gamla historikobjekt misslyckades: %s\n" - -#: ../midori/main.c:741 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Konfigurationsfilen kunde inte sparas. %s" - -#: ../midori/main.c:779 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Sökmotorer kunde inte sparas. %s" - -#: ../midori/main.c:798 -#: ../midori/main.c:826 -#: ../midori/main.c:855 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Bokmärkena kunde inte sparas. %s" - -#. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 -#: ../midori/main.c:901 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Papperskorgen kunde inte sparas. %s" - -#: ../midori/main.c:974 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "Sessionen kunde inte sparas. %s" - -#: ../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 verkar ha krashat vid senaste körningen. Om det händer flera gånger, prova något av dessa alternativ för att lösa problemet." - -#: ../midori/main.c:1116 -msgid "Modify _preferences" -msgstr "Redigera _inställningar" - -#: ../midori/main.c:1120 -msgid "Reset the last _session" -msgstr "Återställ senaste _sessionen" - -#: ../midori/main.c:1125 -msgid "Disable all _extensions" -msgstr "Inaktivera alla _tillägg" - -#: ../midori/main.c:1343 -msgid "No filename specified" -msgstr "Inget filnamn valt" +#: ../data/midori-private.desktop.in.h:1 +#, fuzzy +msgid "Midori Private Browsing" +msgstr "P_rivat läge" -#: ../midori/main.c:1366 -msgid "An unknown error occured." -msgstr "Ett okänt fel inträffade." +#: ../data/midori-private.desktop.in.h:2 +msgid "Open a new private browsing window" +msgstr "Öppna ett nytt privat fönster" + +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 +#, fuzzy +msgid "Private Browsing" +msgstr "P_rivat läge" -#: ../midori/main.c:1398 +#: ../midori/main.c:63 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "" +msgstr "Ögonblicksbild sparad till: %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:90 msgid "Run ADDRESS as a web application" msgstr "Kör ADRESS som en webapp" -#: ../midori/main.c:1447 +#: ../midori/main.c:90 msgid "ADDRESS" msgstr "ADRESS" -#: ../midori/main.c:1449 +#: ../midori/main.c:92 msgid "Use FOLDER as configuration folder" msgstr "Använd MAPP som konfigurationsmapp" -#: ../midori/main.c:1449 +#: ../midori/main.c:92 msgid "FOLDER" msgstr "MAPP" -#: ../midori/main.c:1451 +#: ../midori/main.c:94 +msgid "Private browsing, no changes are saved" +msgstr "Privat surfning, inga ändringar kommer att sparas" + +#: ../midori/main.c:97 +msgid "Portable mode, all runtime files are stored in one place" +msgstr "" + +#: ../midori/main.c:100 +msgid "Plain GTK+ window with WebKit, akin to GtkLauncher" +msgstr "Enkelt GTK+ fönster med WebKit, liknande GtkLauncher" + +#: ../midori/main.c:102 +#, fuzzy +msgid "Show a diagnostic dialog" +msgstr "Visa krashdialogen" + +#: ../midori/main.c:104 +msgid "Run within gdb and save a backtrace on crash" +msgstr "Kör inuti gdb och spara bakåtspåringen vid crash" + +#: ../midori/main.c:106 msgid "Run the specified filename as javascript" msgstr "Kör det valda filnamnet som javaskript" -#: ../midori/main.c:1454 +#: ../midori/main.c:108 msgid "Take a snapshot of the specified URI" -msgstr "" +msgstr "Ta en ögonblicksbild av det specifierade URI" -#: ../midori/main.c:1457 +#: ../midori/main.c:110 msgid "Execute the specified command" msgstr "Kör det valda kommandot" -#: ../midori/main.c:1459 +#: ../midori/main.c:112 +msgid "List available commands to execute with -e/ --execute" +msgstr "Visa tillgängliga kommandon som kan köras med -e/ --execute" + +#: ../midori/main.c:114 msgid "Display program version" msgstr "Visa programversion" -#: ../midori/main.c:1461 +#: ../midori/main.c:116 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1514 -msgid "[Addresses]" -msgstr "[Adresser]" +#: ../midori/main.c:118 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:118 +msgid "PATTERN" +msgstr "MÖNSTER" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:122 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Återställ Midori efter SECONDS sekunders inaktivitet" + +#: ../midori/main.c:122 +msgid "SECONDS" +msgstr "SEKUNDER" + +#: ../midori/main.c:147 +msgid "Error: \"gdb\" can't be found\n" +msgstr "Fel: \"gdb\" kunde inte hittas\n" -#: ../midori/main.c:1537 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" -#: ../midori/main.c:1539 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Leta efter nya verioner på:" -#: ../midori/main.c:1619 -msgid "The specified configuration folder is invalid." -msgstr "Den valda konfigurationsmappen är ogiltig." +#: ../midori/main.c:369 +msgid "An unknown error occured" +msgstr "Ett okänt fel inträffade." -#: ../midori/main.c:1655 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "En instans av Midori körs redan, men svarar inte.\n" +#: ../midori/midori-app.c:1341 ../midori/midori-browser.c:6116 +msgid "_Bookmarks" +msgstr "_Bokmärken" -#: ../midori/main.c:1715 -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Sökmotorerna kunde inte läsas in. %s\n" +#: ../midori/midori-app.c:1342 +msgid "Add Boo_kmark" +msgstr "Lägg till bokmä_rke" -#: ../midori/main.c:1727 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Bokmärkena kunde inte läsas in: %s\n" +#: ../midori/midori-app.c:1343 +msgid "_Extensions" +msgstr "_Tillägg" -#: ../midori/main.c:1742 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Sessionen kunde inte läsas in: %s\n" +#. i18n: Browsing history, visited web pages, closed tabs +#: ../midori/midori-app.c:1344 ../midori/midori-privatedata.c:153 +msgid "_History" +msgstr "_Historik" -#: ../midori/main.c:1755 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "Papperskorgen kunde inte läsas in: %s\n" +#: ../midori/midori-app.c:1345 +msgid "_Userscripts" +msgstr "_Användarskript" -#: ../midori/main.c:1768 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "Historiken kunde inte läsas in: %s\n" +#: ../midori/midori-app.c:1346 +msgid "User_styles" +msgstr "Användar_stilar" -#: ../midori/main.c:1780 -msgid "The following errors occured:" -msgstr "Följande fel inträffade:" +#: ../midori/midori-app.c:1347 +msgid "New _Tab" +msgstr "Ny fli_k" -#: ../midori/main.c:1796 -msgid "_Ignore" -msgstr "_Ignorera" +#: ../midori/midori-app.c:1348 +msgid "_Transfers" +msgstr "_Överföringar" + +#: ../midori/midori-app.c:1349 +msgid "Netscape p_lugins" +msgstr "Netscape-_tillägg" + +#: ../midori/midori-app.c:1350 +msgid "_Closed Tabs" +msgstr "_Stängda flikar" + +#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:5255 +msgid "New _Window" +msgstr "Nytt _fönster" + +#: ../midori/midori-app.c:1352 +msgid "New _Folder" +msgstr "Ny Mapp" + +#: ../midori/midori-app.c:1407 ../midori/midori-app.c:1410 +#: ../midori/midori-app.c:1413 +msgid "[Addresses]" +msgstr "[Adresser]" -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Filen hittades inte." -#: ../midori/midori-array.c:258 -#: ../midori/midori-array.c:267 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Felformaterat dokument." -#: ../midori/midori-array.c:429 -#: ../midori/sokoke.c:694 -#, c-format -msgid "Writing failed." -msgstr "Kunde inte skriva." +#: ../midori/midori-array.c:658 +msgid "Unrecognized bookmark format." +msgstr "Oigenkännt bokmärkesformat." + +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5391 +msgid "Go forward to the next page" +msgstr "Gå fram till nästa sida" -#: ../midori/midori-browser.c:307 -#: ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4235 +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5402 +#, fuzzy +msgid "Go to the next sub-page" +msgstr "Gå fram till nästa sida" + +#: ../midori/midori-browser.c:447 ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5349 msgid "Reload the current page" msgstr "Uppdatera sidan" -#: ../midori/midori-browser.c:318 -#: ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:455 ../midori/midori-browser.c:5346 msgid "Stop loading the current page" msgstr "Stoppa inläsning av sidan" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:525 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "Misslyckades att uppdatera titel: %s\n" + +#: ../midori/midori-browser.c:562 ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:605 ../midori/midori-websettings.c:1430 #, c-format -msgid "%d%% loaded" -msgstr "%d%% inläst" +msgid "Value '%s' is invalid for %s" +msgstr "Värdet \"%s\" är ogiltigt för %s" -#: ../midori/midori-browser.c:434 +#: ../midori/midori-browser.c:569 ../midori/midori-browser.c:614 #, c-format msgid "Unexpected action '%s'." msgstr "Oväntat beteende '%s'." -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:691 +#, c-format +msgid "%s (Private Browsing)" +msgstr "%s (Privat Surfning)" + +#: ../midori/midori-browser.c:801 ../midori/midori-browser.c:843 +#: ../panels/midori-bookmarks.c:114 +msgid "Bookmarks" +msgstr "Bokmärken" + +#: ../midori/midori-browser.c:897 msgid "New folder" msgstr "Ny mapp" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:897 msgid "Edit folder" msgstr "Redigera mapp" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:899 msgid "New bookmark" msgstr "Nytt bokmärke" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:899 msgid "Edit bookmark" msgstr "Redigera bokmärke" -#: ../midori/midori-browser.c:648 -msgid "_Title:" -msgstr "_Titel:" - -#: ../midori/midori-browser.c:661 -#: ../midori/midori-searchaction.c:952 -msgid "_Description:" -msgstr "_Beskrivning" - -#: ../midori/midori-browser.c:680 -#: ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 -msgid "_Address:" -msgstr "_Adress:" - -#: ../midori/midori-browser.c:699 -msgid "_Folder:" -msgstr "_Mapp:" +#: ../midori/midori-browser.c:933 +msgid "Type a name for this bookmark and choose where to keep it." +msgstr "Skriv in ett namn för detta bokmärke och ange vart det skall sparas." + +#: ../midori/midori-browser.c:989 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Webbgenvägar" -#: ../midori/midori-browser.c:704 -#: ../midori/midori-browser.c:745 -msgid "Toplevel folder" -msgstr "" +#: ../midori/midori-browser.c:995 +msgid "Show in the tool_bar" +msgstr "Visa i verktygsraden" + +#: ../midori/midori-browser.c:1003 +msgid "Run as _web application" +msgstr "Kör som en _webbapplikation" -#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:1119 ../midori/midori-browser.c:4498 msgid "Save file as" msgstr "Spara fil som" -#: ../midori/midori-browser.c:1172 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Filen '%s' har hämtats." - -#: ../midori/midori-browser.c:1176 -msgid "Transfer completed" -msgstr "Överföring färdig" +#: ../midori/midori-browser.c:1129 +#, fuzzy +msgid "Save associated _resources" +msgstr "De associerade inställningarna" + +#: ../midori/midori-browser.c:1359 +msgid "A new window has been opened" +msgstr "Ett nytt fönster har öppnats" + +#: ../midori/midori-browser.c:1362 +msgid "A new tab has been opened" +msgstr "En ny flik har öppnats" + +#: ../midori/midori-browser.c:1380 +msgid "Error opening the image!" +msgstr "Fel när bilden försökte öppnas!" + +#: ../midori/midori-browser.c:1381 +msgid "Can not open selected image in a default viewer." +msgstr "Kan inte öppna den valda bilden i standardbildläsaren." + +#: ../midori/midori-browser.c:1387 +msgid "Error downloading the image!" +msgstr "Fel vid nerladdning av bilden!" + +#: ../midori/midori-browser.c:1388 +msgid "Can not download selected image." +msgstr "Kan inte ladda ner vald bild." -#: ../midori/midori-browser.c:1317 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "Spara fil" -#: ../midori/midori-browser.c:1984 +#: ../midori/midori-browser.c:2419 msgid "Open file" msgstr "Öppna fil" -#: ../midori/midori-browser.c:3430 -#: ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2547 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" + +#: ../midori/midori-browser.c:2553 ../extensions/feed-panel/main.c:356 +msgid "New feed" +msgstr "Nytt flöde" + +#: ../midori/midori-browser.c:2585 ../midori/midori-browser.c:5415 +#: ../panels/midori-bookmarks.c:527 +msgid "Add a new bookmark" +msgstr "Lägg till ett nytt bokmärke" + +#: ../midori/midori-browser.c:3111 ../midori/midori-searchaction.c:450 +msgid "Empty" +msgstr "Tom" + +#: ../midori/midori-browser.c:3493 ../midori/midori-browser.c:3494 +msgid "Toggle text cursor navigation" +msgstr "Växla navigering med textmarkör" + +#: ../midori/midori-browser.c:3496 +msgid "" +"Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " +"all websites." +msgstr "" +"F7 växlar Markörläsning. När detta alternativ är aktiverat så kommer en " +"textmarkör att visas på alla webbplatser. " + +#: ../midori/midori-browser.c:3499 +#, fuzzy +msgid "_Enable Caret Browsing" +msgstr "P_rivat läge" + +#: ../midori/midori-browser.c:3915 ../midori/midori-browser.c:5863 +#, fuzzy, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Borttagning av historikpost misslyckades: %s\n" + +#: ../midori/midori-browser.c:4230 ../panels/midori-bookmarks.c:835 +#: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Öppna alla i fli_kar" -#: ../midori/midori-browser.c:3437 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 -#: ../extensions/feed-panel/feed-panel.c:542 +#: ../midori/midori-browser.c:4237 ../panels/midori-bookmarks.c:841 +#: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Öppna i ny fli_k" -#: ../midori/midori-browser.c:3440 -#: ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4240 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 +#: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Öppna i nytt _fönster" -#: ../midori/midori-browser.c:3750 -msgid "Clear Private Data" -msgstr "Rensa Privat Data" - -#: ../midori/midori-browser.c:3754 -msgid "_Clear private data" -msgstr "_Rensa privat data" +#: ../midori/midori-browser.c:4329 +msgid "Arora" +msgstr "Arora" -#: ../midori/midori-browser.c:3767 -msgid "Clear the following data:" -msgstr "Rensa följande data:" +#: ../midori/midori-browser.c:4330 +msgid "Kazehakase" +msgstr "Kazehakase" -#: ../midori/midori-browser.c:3777 -#: ../midori/midori-preferences.c:671 -#: ../panels/midori-history.c:108 -msgid "History" -msgstr "Historik" +#: ../midori/midori-browser.c:4331 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4332 +msgid "Konqueror" +msgstr "Konqueror" -#: ../midori/midori-browser.c:3782 -msgid "Cookies" -msgstr "Kakor" - -#: ../midori/midori-browser.c:3787 -msgid "'Flash' Cookies" -msgstr "Flashkakor" +#: ../midori/midori-browser.c:4333 +msgid "Epiphany" +msgstr "Epiphany" -#: ../midori/midori-browser.c:3792 -msgid "Website icons" -msgstr "" +#: ../midori/midori-browser.c:4334 +#, c-format +msgid "Firefox (%s)" +msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:3797 -#: ../midori/sokoke.c:868 -msgid "_Closed Tabs" -msgstr "_Stängda flikar" +#: ../midori/midori-browser.c:4335 +msgid "Midori 0.2.6" +msgstr "Midori 0.2.6" + +#: ../midori/midori-browser.c:4353 +msgid "Import bookmarks…" +msgstr "Importera bokmärken..." + +#: ../midori/midori-browser.c:4356 ../midori/midori-browser.c:5420 +msgid "_Import bookmarks" +msgstr "_Importera bokmärken" + +#: ../midori/midori-browser.c:4367 +#, fuzzy +msgid "_Application:" +msgstr "Program" -#: ../midori/midori-browser.c:3805 -msgid "Clear private data when _quitting Midori" -msgstr "Rensa privat data när Midori _avslutas" +#: ../midori/midori-browser.c:4432 +msgid "Import from XBEL or HTML file" +msgstr "Importera från XBEL- eller HTML-fil" + +#: ../midori/midori-browser.c:4460 +msgid "Import from a file" +msgstr "Importera från en fil" + +#: ../midori/midori-browser.c:4472 +msgid "Failed to import bookmarks" +msgstr "Misslyckades att importera bokmärken" + +#: ../midori/midori-browser.c:4503 +msgid "XBEL Bookmarks" +msgstr "XBEL Bokmärken" + +#: ../midori/midori-browser.c:4508 +#, fuzzy +msgid "Netscape Bookmarks" +msgstr "_Hantera bokmärken" + +#: ../midori/midori-browser.c:4522 +msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" +msgstr "Midori kan enbart exportera till XBEL (*.xbel) och Netscape (*.html)" + +#: ../midori/midori-browser.c:4537 +msgid "Failed to export bookmarks" +msgstr "Misslyckades att exportera bokmärken" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4753 msgid "A lightweight web browser." msgstr "En resurssnål webbläsare." -#: ../midori/midori-browser.c:3897 +#: ../midori/midori-browser.c:4754 +msgid "See about:version for version info." +msgstr "Se about:version för att visa versionsinformation." + +#: ../midori/midori-browser.c:4756 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" + +#: ../midori/midori-browser.c:4791 msgid "translator-credits" msgstr "" "Mikael Magnusson \n" "Daniel Nylander \n" "Oscar Rentzhog " -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:5253 msgid "_File" msgstr "_Arkiv" -#: ../midori/midori-browser.c:4165 -#: ../midori/sokoke.c:869 -msgid "New _Window" -msgstr "Nytt _fönster" - -#: ../midori/midori-browser.c:4166 +#: ../midori/midori-browser.c:5256 msgid "Open a new window" -msgstr "Öppna i nytt fönster" +msgstr "Öppna ett nytt fönster" -#: ../midori/midori-browser.c:4169 +#: ../midori/midori-browser.c:5259 msgid "Open a new tab" msgstr "Öppna en ny flik" -#: ../midori/midori-browser.c:4172 +#: ../midori/midori-browser.c:5261 +msgid "New P_rivate Browsing Window" +msgstr "Nytt P_rivat Webbläsarfönster" + +#: ../midori/midori-browser.c:5265 msgid "Open a file" msgstr "Öppna en fil" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:5267 +msgid "_Save Page As…" +msgstr "_Spara Sida Som..." + +#: ../midori/midori-browser.c:5268 msgid "Save to a file" msgstr "Spara till fil" -#: ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:5270 msgid "Add to Speed _dial" msgstr "" -#: ../midori/midori-browser.c:4178 -msgid "Add shortcut to speed dial" -msgstr "Lägg till genväg i Webbgenvägar" +#. N_("Add Shortcut to the _desktop"), "", +#: ../midori/midori-browser.c:5274 +msgid "Create _Launcher" +msgstr "Skapa startare" + +#: ../midori/midori-browser.c:5277 +msgid "Subscribe to News _feed" +msgstr "Prenumerera på Nyhets_flöde" -#: ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:5283 msgid "_Close Tab" msgstr "_Stäng flik" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:5284 msgid "Close the current tab" msgstr "Stäng den aktuella fliken" -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:5286 msgid "C_lose Window" msgstr "S_täng fönster" -#: ../midori/midori-browser.c:4184 -msgid "Close this window" -msgstr "Stäng det här fönstret" +#: ../midori/midori-browser.c:5290 +msgid "_Share" +msgstr "_Dela" -#: ../midori/midori-browser.c:4187 +#: ../midori/midori-browser.c:5291 +msgid "Share this page" +msgstr "" + +#: ../midori/midori-browser.c:5295 msgid "Print the current page" msgstr "Skriv ut denna sida" -#: ../midori/midori-browser.c:4190 -msgid "Quit the application" -msgstr "Avsluta programmet" +#: ../midori/midori-browser.c:5298 +msgid "Close a_ll Windows" +msgstr "Stäng a_lla Fönster" -#: ../midori/midori-browser.c:4192 +#: ../midori/midori-browser.c:5301 msgid "_Edit" msgstr "_Redigera" -#: ../midori/midori-browser.c:4195 -msgid "Cut the selected text" -msgstr "Klipp ut markerad text" - -#: ../midori/midori-browser.c:4198 -#: ../midori/midori-browser.c:4201 -msgid "Copy the selected text" -msgstr "Kopiera markerad text" - -#: ../midori/midori-browser.c:4204 -msgid "Paste text from the clipboard" -msgstr "Klistra in text från klippbordet" - -#: ../midori/midori-browser.c:4207 -msgid "Delete the selected text" -msgstr "Ta bort markerad text" - -#: ../midori/midori-browser.c:4210 -msgid "Select all text" -msgstr "Markera all text" +#: ../midori/midori-browser.c:5324 +msgid "_Find…" +msgstr "_Hitta" -#: ../midori/midori-browser.c:4213 +#: ../midori/midori-browser.c:5325 msgid "Find a word or phrase in the page" msgstr "Hitta ett ord eller en fras på sidan" -#: ../midori/midori-browser.c:4215 +#: ../midori/midori-browser.c:5327 msgid "Find _Next" msgstr "Hitta _nästa" -#: ../midori/midori-browser.c:4216 -msgid "Find the next occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:4218 +#: ../midori/midori-browser.c:5330 msgid "Find _Previous" msgstr "Hitta _förra" -#: ../midori/midori-browser.c:4219 -msgid "Find the previous occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:4223 +#: ../midori/midori-browser.c:5334 msgid "Configure the application preferences" msgstr "Redigera programinställiningarna" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:5336 msgid "_View" msgstr "_Visa" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:5337 msgid "_Toolbars" msgstr "_Verktygsfält" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:5342 +msgid "Reload page without caching" +msgstr "Ladda om sidan utan att cacha" + +#: ../midori/midori-browser.c:5352 msgid "Increase the zoom level" msgstr "Zooma in" -#: ../midori/midori-browser.c:4241 +#: ../midori/midori-browser.c:5355 msgid "Decrease the zoom level" msgstr "Zooma ut" -#: ../midori/midori-browser.c:4244 -msgid "Reset the zoom level" -msgstr "Återställ zoom-nivån" - -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:5359 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:4247 +#: ../midori/midori-browser.c:5361 msgid "View So_urce" msgstr "Visa k_ällkod" -#: ../midori/midori-browser.c:4248 -msgid "View the source code of the page" -msgstr "Visa källkod för sidan" - -#: ../midori/midori-browser.c:4250 -msgid "View Selection Source" -msgstr "Visa källkod för markering" - -#: ../midori/midori-browser.c:4251 -msgid "View the source code of the selection" -msgstr "" +#: ../midori/midori-browser.c:5364 +#, fuzzy +msgid "Ca_ret Browsing" +msgstr "P_rivat läge" -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:5368 msgid "Toggle fullscreen view" msgstr "Växla fullskärmsläge" -#: ../midori/midori-browser.c:4257 +#: ../midori/midori-browser.c:5370 +msgid "Scroll _Left" +msgstr "Rulla åt _Vänster" + +#: ../midori/midori-browser.c:5373 +msgid "Scroll _Down" +msgstr "Rulla _Ner" + +#: ../midori/midori-browser.c:5376 +msgid "Scroll _Up" +msgstr "Rulla _Upp" + +#: ../midori/midori-browser.c:5379 +msgid "Scroll _Right" +msgstr "Rulla åt _Höger" + +#: ../midori/midori-browser.c:5382 +msgid "_Readable" +msgstr "" + +#: ../midori/midori-browser.c:5385 msgid "_Go" msgstr "_Gå" -#: ../midori/midori-browser.c:4260 +#: ../midori/midori-browser.c:5388 msgid "Go back to the previous page" msgstr "Gå tillbaka till föregående sida" -#: ../midori/midori-browser.c:4263 -msgid "Go forward to the next page" -msgstr "Gå fram till nästa sida" +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5395 +#, fuzzy +msgid "Go to the previous sub-page" +msgstr "Gå tillbaka till föregående sida" + +#: ../midori/midori-browser.c:5404 +msgid "_Homepage" +msgstr "_Hemsida" -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:5405 msgid "Go to your homepage" msgstr "Gå till startsida" -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:5407 msgid "Empty Trash" msgstr "Töm papperskorgen" -#: ../midori/midori-browser.c:4269 -msgid "Delete the contents of the trash" -msgstr "Ta bort innehållet i papperskorgen" - -#: ../midori/midori-browser.c:4271 +#: ../midori/midori-browser.c:5410 msgid "Undo _Close Tab" msgstr "Ångra s_tängning av flik" -#: ../midori/midori-browser.c:4272 -msgid "Open the last closed tab" -msgstr "Öppna senast stängda flik" - -#: ../midori/midori-browser.c:4276 -#: ../panels/midori-bookmarks.c:231 -msgid "Add a new bookmark" -msgstr "Lägg till ett nytt bokmärke" - -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:5417 msgid "Add a new _folder" msgstr "Lägg till en ny _mapp" -#: ../midori/midori-browser.c:4279 -msgid "Add a new bookmark folder" -msgstr "Lägg till en ny bokmärkesmapp" +#: ../midori/midori-browser.c:5423 +msgid "_Export bookmarks" +msgstr "_Exportera bokmärken" -#: ../midori/midori-browser.c:4281 -#: ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5426 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Hantera sökmotorer" -#: ../midori/midori-browser.c:4282 -msgid "Add, edit and remove search engines…" -msgstr "Lägg till, ändra och ta bort sökmotorer…" - -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:5429 msgid "_Clear Private Data" msgstr "_Rensa privat data" -#: ../midori/midori-browser.c:4286 -msgid "Clear private data…" -msgstr "Rensa privat data…" +#: ../midori/midori-browser.c:5432 +msgid "_Inspect Page" +msgstr "_Inspektera Sida" -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:5436 msgid "_Previous Tab" msgstr "_Föregående flik" -#: ../midori/midori-browser.c:4291 -msgid "Switch to the previous tab" -msgstr "Byt till föregående flik" - -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:5439 msgid "_Next Tab" msgstr "_Nästa flik" -#: ../midori/midori-browser.c:4294 -msgid "Switch to the next tab" -msgstr "Byt till nästa flik" +#: ../midori/midori-browser.c:5441 +msgid "Move Tab to _first position" +msgstr "Flytta flik till _första positionen" -#: ../midori/midori-browser.c:4296 -msgid "_Help" -msgstr "_Hjälp" +#: ../midori/midori-browser.c:5443 +msgid "Move Tab _Backward" +msgstr "Flytta Flik _Bakåt" -#: ../midori/midori-browser.c:4298 -msgid "_Contents" -msgstr "_Innehåll" - -#: ../midori/midori-browser.c:4299 -msgid "Show the documentation" -msgstr "Visa dokumentation" +#: ../midori/midori-browser.c:5445 +msgid "_Move Tab Forward" +msgstr "Flytta Flik _Framåt" -#: ../midori/midori-browser.c:4301 -msgid "_Frequent Questions" -msgstr "_Vanliga Frågor" +#: ../midori/midori-browser.c:5447 +msgid "Move Tab to _last position" +msgstr "Flytta flik till _sista positionen" -#: ../midori/midori-browser.c:4302 -msgid "Show the Frequently Asked Questions" -msgstr "Visa FAQ" - -#: ../midori/midori-browser.c:4304 -msgid "_Report a Bug" -msgstr "_Rapportera ett fel" - -#: ../midori/midori-browser.c:4305 -msgid "Open Midori's bug tracker" -msgstr "Öppna Midoris bugghanterare" - -#: ../midori/midori-browser.c:4308 -msgid "Show information about the program" -msgstr "Visa information om programmet" +#: ../midori/midori-browser.c:5450 +msgid "Focus _Current Tab" +msgstr "Fokusera Aktuell Flik" -#: ../midori/midori-browser.c:4315 -msgid "P_rivate Browsing" -msgstr "P_rivat läge" +#: ../midori/midori-browser.c:5453 +msgid "Focus _Next view" +msgstr "" -#: ../midori/midori-browser.c:4316 -msgid "Don't save any private data while browsing" -msgstr "Spara inte webbläsardata när jag surfar" +#: ../midori/midori-browser.c:5456 +msgid "Only show the Icon of the _Current Tab" +msgstr "Visa enbart ikon för den aktuella fliken" -#: ../midori/midori-browser.c:4321 -msgid "_Menubar" -msgstr "_Menyrad" +#: ../midori/midori-browser.c:5459 +msgid "_Duplicate Current Tab" +msgstr "_Duplicera aktuell flik" -#: ../midori/midori-browser.c:4322 -msgid "Show menubar" -msgstr "Visa menyrad" +#: ../midori/midori-browser.c:5462 +msgid "Close Ot_her Tabs" +msgstr "Stäng Övriga Flikar" -#: ../midori/midori-browser.c:4325 -msgid "_Navigationbar" -msgstr "_Navigeringsfält" +#: ../midori/midori-browser.c:5465 +msgid "Open last _session" +msgstr "Återställ senaste _sessionen" + +#: ../midori/midori-browser.c:5468 +msgid "_Help" +msgstr "_Hjälp" -#: ../midori/midori-browser.c:4326 -msgid "Show navigationbar" -msgstr "Visa navigeringsfält" +#: ../midori/midori-browser.c:5470 +msgid "_Frequent Questions" +msgstr "_Vanliga Frågor" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:5473 +msgid "_Report a Problem…" +msgstr "_Rapportera ett fel..." + +#: ../midori/midori-browser.c:5478 ../midori/midori-browser.c:6135 +msgid "_Tools" +msgstr "_Verktyg" + +#: ../midori/midori-browser.c:5485 +msgid "_Menubar" +msgstr "_Menyrad" + +#: ../midori/midori-browser.c:5489 +msgid "_Navigationbar" +msgstr "_Navigeringsfält" + +#: ../midori/midori-browser.c:5493 msgid "Side_panel" msgstr "Sido_panel" -#: ../midori/midori-browser.c:4330 -msgid "Show sidepanel" -msgstr "Visa sidopanel" +#: ../midori/midori-browser.c:5494 +msgid "Sidepanel" +msgstr "Sido_panel" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:5497 msgid "_Bookmarkbar" msgstr "_Bokmärkesrad" -#: ../midori/midori-browser.c:4334 -msgid "Show bookmarkbar" -msgstr "Visa bokmärkesrad" - -#: ../midori/midori-browser.c:4337 -msgid "_Transferbar" -msgstr "Ö_verföringsrad" - -#: ../midori/midori-browser.c:4338 -msgid "Show transferbar" -msgstr "Visa överföringsrad" - -#: ../midori/midori-browser.c:4341 +#: ../midori/midori-browser.c:5501 msgid "_Statusbar" msgstr "_Statusrad" -#: ../midori/midori-browser.c:4342 -msgid "Show statusbar" -msgstr "Visa statusrad" - -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:5510 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:4352 -#: ../midori/midori-websettings.c:214 -msgid "Chinese (BIG5)" -msgstr "Kinesiska (BIG5)" +#: ../midori/midori-browser.c:5513 ../midori/midori-websettings.c:151 +msgid "Chinese Traditional (BIG5)" +msgstr "Traditionell Kinesiska (BIG5)" + +#: ../midori/midori-browser.c:5516 ../midori/midori-websettings.c:152 +msgid "Chinese Simplified (GB18030)" +msgstr "Förenklad Kinesiska (GB18030)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4356 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5520 msgid "Japanese (SHIFT__JIS)" msgstr "Japanska (SHIFT__JIS)" -#: ../midori/midori-browser.c:4359 -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5523 ../midori/midori-websettings.c:154 +msgid "Korean (EUC-KR)" +msgstr "Koreanska (EUC-KR)" + +#: ../midori/midori-browser.c:5526 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Ryska (KOI8-R)" -#: ../midori/midori-browser.c:4362 -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5529 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4365 -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5532 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Västerländsk (ISO-8859-1)" -#: ../midori/midori-browser.c:4368 -#: ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-browser.c:5535 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Anpassad…" -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:6041 msgid "_Separator" msgstr "_Avskiljare" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:6048 msgid "_Location…" msgstr "_Plats…" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:6050 msgid "Open a particular location" msgstr "Öppna en plats" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:6072 msgid "_Web Search…" msgstr "_Webbsökning…" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:6074 msgid "Run a web search" msgstr "Kör en webbsökning" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:6101 msgid "Reopen a previously closed tab or window" msgstr "Öppna en tidigare stängd flik eller fönster" -#: ../midori/midori-browser.c:4877 -msgid "_Recently visited pages" -msgstr "_Nyligen besökta sidor" - -#: ../midori/midori-browser.c:4879 -msgid "Reopen pages that you visited earlier" -msgstr "Öppna sidor du tidigare besökt" - -#: ../midori/midori-browser.c:4894 -#: ../midori/sokoke.c:857 -msgid "_Bookmarks" -msgstr "_Bokmärken" - -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:6118 msgid "Show the saved bookmarks" msgstr "Visa sparade bokmärken" -#: ../midori/midori-browser.c:4911 -msgid "_Tools" -msgstr "_Verktyg" - -#: ../midori/midori-browser.c:4923 -msgid "_Window" -msgstr "_Fönster" +#: ../midori/midori-browser.c:6151 +msgid "_Tabs" +msgstr "Flikar" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:6153 msgid "Show a list of all open tabs" msgstr "Visa en lista över öppna flikar" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:6167 msgid "_Menu" msgstr "_Meny" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:6169 msgid "Menu" msgstr "Meny" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5127 -msgid "_Inline Find:" -msgstr "_Sök på sidan:" +#: ../midori/midori-browser.c:6934 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Oväntad inställning '%s'" -#: ../midori/midori-browser.c:5152 -msgid "Previous" -msgstr "Föregående" +#: ../midori/midori-extension.c:341 +#, c-format +msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +msgstr "Konfigurationen för tillägget '%s' kunde inte läsas in: %s\n" -#: ../midori/midori-browser.c:5157 -msgid "Next" -msgstr "Nästa" +#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Konfigurationen för tillägget '%s' kunde inte sparas. %s\n" -#: ../midori/midori-browser.c:5162 -msgid "Match Case" -msgstr "_Gör skillnad på skiftläge" +#: ../midori/midori-locationaction.c:1328 +msgid "Export certificate" +msgstr "Exportera certifikat" -#: ../midori/midori-browser.c:5170 -msgid "Highlight Matches" +#: ../midori/midori-locationaction.c:1360 +msgid "The signing certificate authority is not known." msgstr "" -#: ../midori/midori-browser.c:5180 -msgid "Close Findbar" -msgstr "Stäng sökfältet" +#: ../midori/midori-locationaction.c:1362 +msgid "" +"The certificate does not match the expected identity of the site that it was " +"retrieved from." +msgstr "" -#: ../midori/midori-browser.c:5215 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "Ta bort alla" +#: ../midori/midori-locationaction.c:1364 +msgid "The certificate's activation time is still in the future." +msgstr "" -#: ../midori/midori-browser.c:5552 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Oväntad inställning '%s'" +#: ../midori/midori-locationaction.c:1366 +msgid "The certificate has expired" +msgstr "Certifikatet har gått ut" -#: ../midori/midori-locationaction.c:901 -#, c-format -msgid "Search with %s" -msgstr "Sök med %s" +#: ../midori/midori-locationaction.c:1368 +msgid "" +"The certificate has been revoked according to the GTlsConnection's " +"certificate revocation list." +msgstr "" + +#: ../midori/midori-locationaction.c:1370 +msgid "The certificate's algorithm is considered insecure." +msgstr "Certifikatets algoritm anses vara osäker." + +#: ../midori/midori-locationaction.c:1372 +msgid "Some other error occurred validating the certificate." +msgstr "Något annat fel uppstod vid valideringen av certifikatet." -#: ../midori/midori-panel.c:382 -#: ../midori/midori-panel.c:384 -msgid "Detach chosen panel from the window" -msgstr "Koppla från valda panel från fönstret" - -#: ../midori/midori-panel.c:394 -#: ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 -#: ../midori/midori-panel.c:580 +#: ../midori/midori-locationaction.c:1420 +msgid "_Export certificate" +msgstr "_Exportera certifikat" + +#: ../midori/midori-locationaction.c:1435 +msgid "Self-signed" +msgstr "Självsignerad" + +#: ../midori/midori-locationaction.c:1459 +msgid "Security details" +msgstr "Säkerhetsdetaöjer" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1542 +msgid "Paste and p_roceed" +msgstr "Klistra in och fortsätt" + +#: ../midori/midori-locationaction.c:1774 +msgid "Not verified" +msgstr "Inte verifierad" + +#: ../midori/midori-locationaction.c:1782 +msgid "Verified and encrypted connection" +msgstr "Verifierad och krypterad uppkoppling" + +#: ../midori/midori-locationaction.c:1789 +msgid "Open, unencrypted connection" +msgstr "Öppna, okrypterad uppkoppling" + +#: ../midori/midori-panel.c:314 ../midori/midori-panel.c:316 +#: ../midori/midori-panel.c:480 ../midori/midori-panel.c:483 msgid "Align sidepanel to the right" -msgstr "" +msgstr "Justera sidpanelen till höger" -#: ../midori/midori-panel.c:406 -#: ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:326 ../midori/midori-panel.c:327 msgid "Close panel" msgstr "Stäng panel" -#: ../midori/midori-panel.c:578 -#: ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:481 ../midori/midori-panel.c:484 msgid "Align sidepanel to the left" -msgstr "" - -#: ../midori/midori-panel.c:704 -msgid "Show panel _titles" -msgstr "Visa panel_titlar" - -#: ../midori/midori-panel.c:712 -msgid "Show operating _controls" -msgstr "" +msgstr "Justera sidpanelen till vänster" -#: ../midori/midori-panel.c:783 -msgid "Options" -msgstr "Alternativ" +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 +#, fuzzy +msgid "Show Speed Dial" +msgstr "Visa webbgenvägar" -#: ../midori/midori-websettings.c:197 -msgid "Show Blank page" -msgstr "Visa tom sida" - -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" -msgstr "Visa Hemsida" +msgstr "Visa hemsida" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Visa senast öppna flikar" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 +msgid "Show last tabs without loading" +msgstr "Visa senaste flikarna utan att ladda dom" + +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Visa tom sida" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Visa standardsökmotor" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Visa anpassad sida" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Japanska (SHIFT_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Ny flik" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Nytt fönster" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Aktuell flik" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:192 +msgid "Small icons" +msgstr "Små ikoner" + +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Ikoner och text" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Text bredvid ikoner" -#: ../midori/midori-websettings.c:270 -msgid "All cookies" -msgstr "Alla kakor" - -#: ../midori/midori-websettings.c:271 -msgid "Session cookies" -msgstr "Sessionskakor" - -#: ../midori/midori-websettings.c:272 -#: ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 -msgid "None" -msgstr "Inga" +#: ../midori/midori-websettings.c:210 +msgid "Automatic (GNOME or environment)" +msgstr "Automatisk (GNOME eller miljö)" + +#: ../midori/midori-websettings.c:211 +msgid "HTTP proxy server" +msgstr "HTTP proxyserver" + +#: ../midori/midori-websettings.c:212 +msgid "No proxy server" +msgstr "Ingen proxyserver" + +#: ../midori/midori-websettings.c:229 +msgid "Chrome" +msgstr "Chrome" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:231 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 -msgid "Remember last window size" -msgstr "Kom ihåg senaste fönsterstorlek" - -#: ../midori/midori-websettings.c:344 -msgid "Whether to save the last window size" -msgstr "Ifall senaste fönsterstorlek ska sparas" - -#: ../midori/midori-websettings.c:352 -msgid "Last window width" -msgstr "Senaste fönsterbredd" +#: ../midori/midori-websettings.c:308 +msgid "The style of the toolbar" +msgstr "Stil för verktygsfält" -#: ../midori/midori-websettings.c:353 -msgid "The last saved window width" -msgstr "Senast sparade fönsterbredd" +#: ../midori/midori-websettings.c:510 +msgid "Always use my font choices" +msgstr "Använd alltid mina valda typsnitt" -#: ../midori/midori-websettings.c:361 -msgid "Last window height" -msgstr "Senaste fönsterhöjd" +#: ../midori/midori-websettings.c:511 +msgid "Override fonts picked by websites with user preferences" +msgstr "Åsidosätt de typsnitt webbplatserna valt med användarens preferenser" -#: ../midori/midori-websettings.c:362 -msgid "The last saved window height" -msgstr "Senast sparade fönsterhöjd" +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Konfigurationsfilen kunde inte läsas in: %s\n" -#: ../midori/midori-websettings.c:387 -msgid "Last panel position" -msgstr "Senaste panelpositionen" +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Ogiltigt konfigurationsvärde för '%s'" -#: ../midori/midori-websettings.c:388 -msgid "The last saved panel position" -msgstr "Senast sparade panelposition" +#: ../midori/midori-tab.vala:121 +#, fuzzy, c-format +msgid "Failed to inject stylesheet: %s" +msgstr "Misslyckades med att öppna databasen: %s\n" -#. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 -msgid "Last panel page" -msgstr "" +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 +msgid "Trust this website" +msgstr "Lita på denna websida" -#: ../midori/midori-websettings.c:398 -msgid "The last saved panel page" -msgstr "" +#: ../midori/midori-view.c:895 +msgid "Security unknown" +msgstr "Okänd säkerhet" -#: ../midori/midori-websettings.c:406 -msgid "Last Web search" -msgstr "Senaste websökning" +#: ../midori/midori-view.c:1196 +#, c-format +msgid "%s wants to save an HTML5 database." +msgstr "%s vill spara en HTML5-databas." -#: ../midori/midori-websettings.c:407 -msgid "The last saved Web search" -msgstr "Senast sparade websökning" +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 +msgid "_Deny" +msgstr "_Neka" -#: ../midori/midori-websettings.c:416 -msgid "Show Menubar" -msgstr "Visa menyrad" +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 +msgid "_Allow" +msgstr "_Tillåt" -#: ../midori/midori-websettings.c:417 -msgid "Whether to show the menubar" -msgstr "Ifall menyraden ska visas" +#: ../midori/midori-view.c:1228 +#, c-format +msgid "%s wants to know your location." +msgstr "%s vill veta din plats" -#: ../midori/midori-websettings.c:425 -msgid "Show Navigationbar" -msgstr "Visa Navigeringsfält" +#: ../midori/midori-view.c:1362 +#, c-format +msgid "Error - %s" +msgstr "Fel - %s" -#: ../midori/midori-websettings.c:426 -msgid "Whether to show the navigationbar" -msgstr "Ifall naveringsfältet ska visas" +#: ../midori/midori-view.c:1363 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Sidan \"%s\" kunde inte läsas in." -#: ../midori/midori-websettings.c:434 -msgid "Show Bookmarkbar" -msgstr "Visa Bokmärkesfält" +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 +msgid "Try again" +msgstr "Försök igen" -#: ../midori/midori-websettings.c:435 -msgid "Whether to show the bookmarkbar" -msgstr "Ifall bokmärkesraden ska visas" +#: ../midori/midori-view.c:1505 +#, fuzzy, c-format +msgid "Oops - %s" +msgstr "Fel - %s" -#: ../midori/midori-websettings.c:443 -msgid "Show Panel" -msgstr "Visa Sidopanel" +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Något gick gel med '%s'." -#: ../midori/midori-websettings.c:444 -msgid "Whether to show the panel" -msgstr "Ifall sidopanelen ska visas" +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 +#, c-format +msgid "Send a message to %s" +msgstr "Skicka ett meddelande till %s" -#: ../midori/midori-websettings.c:459 -msgid "Show Transferbar" -msgstr "Visa överföringsrad" +#: ../midori/midori-view.c:2526 +msgid "Add _search engine..." +msgstr "Lägg till sökmotor..." -#: ../midori/midori-websettings.c:460 -msgid "Whether to show the transferbar" -msgstr "Ifall överföringsraden ska visas" +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 +msgid "Inspect _Element" +msgstr "Inspektera _Element" -#: ../midori/midori-websettings.c:468 -msgid "Show Statusbar" -msgstr "Visa Statusrad" +#: ../midori/midori-view.c:2621 +msgid "Open Link in New _Tab" +msgstr "Öppna Länk i Ny Fli_k" -#: ../midori/midori-websettings.c:469 -msgid "Whether to show the statusbar" -msgstr "Ifall statusraden ska visas" +#: ../midori/midori-view.c:2625 +msgid "Open Link in _Foreground Tab" +msgstr "Öppna Länk i _Förgrundsflik" -#: ../midori/midori-websettings.c:478 -msgid "Toolbar Style:" -msgstr "Stil för verktygsfält:" +#: ../midori/midori-view.c:2626 +msgid "Open Link in _Background Tab" +msgstr "Öppna Länk i Ny _Bakgrundsflik" -#: ../midori/midori-websettings.c:479 -msgid "The style of the toolbar" -msgstr "Stil för verktygsfält" +#: ../midori/midori-view.c:2629 +msgid "Open Link in New _Window" +msgstr "Öppna Länk i Nytt _Fönster" -#: ../midori/midori-websettings.c:495 -msgid "Show progress in location entry" -msgstr "" +#: ../midori/midori-view.c:2632 +#, fuzzy +msgid "Open Link as Web A_pplication" +msgstr "Kör ADRESS som en webapp" -#: ../midori/midori-websettings.c:496 -msgid "Whether to show loading progress in the location entry" -msgstr "" +#: ../midori/midori-view.c:2637 +msgid "Copy Link de_stination" +msgstr "Kopiera länk_plats" -#: ../midori/midori-websettings.c:511 -msgid "Search engines in location completion" -msgstr "" +#: ../midori/midori-view.c:2643 +msgid "Save _As…" +msgstr "Spara _Som..." + +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Öppna _Bild i Nytt Fönster" + +#: ../midori/midori-view.c:2654 +msgid "Open _Image in New Tab" +msgstr "Öppna Bild i Ny Fli_k" + +#: ../midori/midori-view.c:2658 +msgid "Copy Im_age" +msgstr "Kopiera Bild" + +#: ../midori/midori-view.c:2661 +msgid "Save I_mage" +msgstr "_Spara Bild" + +#: ../midori/midori-view.c:2664 +msgid "Open in Image _Viewer" +msgstr "Öppna i Bildvisare" + +#: ../midori/midori-view.c:2671 +msgid "Copy Video _Address" +msgstr "Kopiera Video _Adress" + +#: ../midori/midori-view.c:2674 +msgid "Save _Video" +msgstr "Spara _Video" + +#: ../midori/midori-view.c:2674 +msgid "Download _Video" +msgstr "Ladda Ner _Video" -#: ../midori/midori-websettings.c:512 -msgid "Whether to show search engines in the location completion" -msgstr "" +#: ../midori/midori-view.c:2700 +msgid "Search _with" +msgstr "Sök _med" -#: ../midori/midori-websettings.c:520 -msgid "Toolbar Items" -msgstr "Föremål i verktygsfält" +#: ../midori/midori-view.c:2729 +msgid "_Search the Web" +msgstr "_Sök på webben" -#: ../midori/midori-websettings.c:521 -msgid "The items to show on the toolbar" -msgstr "Föremål att visa i verktygsraden" +#: ../midori/midori-view.c:2749 +msgid "Open Address in New _Tab" +msgstr "Öppna Adress i Ny Fli_k" -#: ../midori/midori-websettings.c:529 -msgid "Compact Sidepanel" -msgstr "Kompakt sidopanel" +#: ../midori/midori-view.c:2796 +#, fuzzy +msgid "Open _Frame in New Tab" +msgstr "Öppna i ny Fli_k" -#: ../midori/midori-websettings.c:530 -msgid "Whether to make the sidepanel compact" -msgstr "Ifall sidopaneles ska göras kompakt" +#: ../midori/midori-view.c:3013 +#, c-format +msgid "Open or download file from %s" +msgstr "Öppna eller hämta fil från %s" -#: ../midori/midori-websettings.c:545 -msgid "Show operating controls of the panel" -msgstr "" +#: ../midori/midori-view.c:3026 +#, c-format +msgid "File Name: %s" +msgstr "Filnamn: %s" -#: ../midori/midori-websettings.c:546 -msgid "Whether to show the operating controls of the panel" -msgstr "" +#: ../midori/midori-view.c:3031 +#, c-format +msgid "File Type: '%s'" +msgstr "Filtyp: \"%s\"" -#: ../midori/midori-websettings.c:561 -msgid "Align sidepanel on the right" -msgstr "" +#: ../midori/midori-view.c:3033 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Filtyp: %s (\"%s\")" -#: ../midori/midori-websettings.c:562 -msgid "Whether to align the sidepanel on the right" -msgstr "Ifall sidopanelen ska justeras till höger" +#: ../midori/midori-view.c:3070 +#, c-format +msgid "Size: %s" +msgstr "Storlek: %s" -#: ../midori/midori-websettings.c:571 -msgid "When Midori starts:" -msgstr "När Midori startar:" +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:3081 +#, c-format +msgid "Open %s" +msgstr "Öppna %s" -#: ../midori/midori-websettings.c:572 -msgid "What to do when Midori starts" -msgstr "Vad som ska göras när Midori startar" +#: ../midori/midori-view.c:3610 +#, c-format +msgid "Inspect page - %s" +msgstr "Inspektera sida - %s" -#: ../midori/midori-websettings.c:581 -msgid "Homepage:" -msgstr "Startsida:" +#: ../midori/midori-view.c:4138 +#, c-format +msgid "No documentation installed" +msgstr "Ingen dokumentation installerad" -#: ../midori/midori-websettings.c:582 -msgid "The homepage" -msgstr "Startsidan" +#: ../midori/midori-view.c:4214 +msgid "Midori doesn't store any personal data:" +msgstr "Midori sparar inte något personlig information:" -#: ../midori/midori-websettings.c:597 -msgid "Show crash dialog" -msgstr "Visa krashdialogen" +#: ../midori/midori-view.c:4215 +msgid "No history or web cookies are being saved." +msgstr "Ingen historik eller kakor sparas." -#: ../midori/midori-websettings.c:598 -msgid "Show a dialog after Midori crashed" -msgstr "Visa en dialog efter att Midori har krashat" +#: ../midori/midori-view.c:4216 +msgid "Extensions are disabled." +msgstr "Tillägg är inaktiverade." -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 -msgid "Show speed dial in new tabs" -msgstr "Visa Webbgenvägar i nya flikar" - -#: ../midori/midori-websettings.c:615 -msgid "Show speed dial in newly opened tabs" -msgstr "Visa Webbgenvägar i nyligen öppnade flikar" +#: ../midori/midori-view.c:4217 +msgid "HTML5 storage, local database and application caches are disabled." +msgstr "" -#: ../midori/midori-websettings.c:623 -msgid "Save downloaded files to:" -msgstr "Spara hämtade filer i:" +#: ../midori/midori-view.c:4218 +msgid "Midori prevents websites from tracking the user:" +msgstr "Midori förhindrar websidor från att spåra användaren:" -#: ../midori/midori-websettings.c:624 -msgid "The folder downloaded files are saved to" -msgstr "Mappen som filer ska hämtas till" - -#: ../midori/midori-websettings.c:643 -msgid "Ask for the destination folder" -msgstr "Fråga vart filer ska sparas" - -#: ../midori/midori-websettings.c:644 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Ifall Midori ska fråga vilken mapp filer ska hämtas till" - -#: ../midori/midori-websettings.c:663 -msgid "Notify when a transfer has been completed" -msgstr "Underrätta när en överföring är klar" - -#: ../midori/midori-websettings.c:664 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "Ifall en underrättelse ska visas när en överföring är klar" - -#: ../midori/midori-websettings.c:676 -msgid "Download Manager" -msgstr "Hämtningshanterare" - -#: ../midori/midori-websettings.c:677 -msgid "An external download manager" -msgstr "En extern hämtningshanterare" +#: ../midori/midori-view.c:4219 +msgid "Referrer URLs are stripped down to the hostname." +msgstr "" -#: ../midori/midori-websettings.c:685 -msgid "Text Editor" -msgstr "Textredigerare" +#: ../midori/midori-view.c:4220 +msgid "DNS prefetching is disabled." +msgstr "" -#: ../midori/midori-websettings.c:686 -msgid "An external text editor" -msgstr "En extern textredigerare" +#: ../midori/midori-view.c:4221 +msgid "The language and timezone are not revealed to websites." +msgstr "Språk och tidszon visas inte för websidor." -#: ../midori/midori-websettings.c:701 -msgid "News Aggregator" -msgstr "RSS-läsare" +#: ../midori/midori-view.c:4222 +msgid "Flash and other Netscape plugins cannot be listed by websites." +msgstr "" -#: ../midori/midori-websettings.c:702 -msgid "An external news aggregator" -msgstr "En extern RSS-läsare" +#: ../midori/midori-view.c:4262 +msgid "Version numbers in brackets show the version used at runtime." +msgstr "" -#: ../midori/midori-websettings.c:710 -msgid "Location entry Search" -msgstr "Sökmotor för Addressfältet" +#: ../midori/midori-view.c:4312 +msgid "Page loading delayed" +msgstr "Laddning av sidan är försenad" -#: ../midori/midori-websettings.c:711 -msgid "The search to perform inside the location entry" +#: ../midori/midori-view.c:4313 +msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" +"Laddning försenad antingen på grund av en nyligen inträffad chrash eller på " +"grund av uppstartsinställningar." -#: ../midori/midori-websettings.c:719 -msgid "Preferred Encoding" -msgstr "Föredragen kodning" +#: ../midori/midori-view.c:4314 +msgid "Load Page" +msgstr "Ladda Sida" -#: ../midori/midori-websettings.c:720 -msgid "The preferred character encoding" -msgstr "Den föredragna teckenkodningen" - -#: ../midori/midori-websettings.c:730 -msgid "Always Show Tabbar" -msgstr "Visa alltid flikrad" +#: ../midori/midori-view.c:4481 +msgid "Blank page" +msgstr "Tom sida" -#: ../midori/midori-websettings.c:731 -msgid "Always show the tabbar" -msgstr "Visa alltid flikraden" +#: ../midori/midori-view.c:4695 +msgid "_Duplicate Tab" +msgstr "_Duplicera flik" -#: ../midori/midori-websettings.c:739 -msgid "Close Buttons on Tabs" -msgstr "Stängknappar på flikar" +#: ../midori/midori-view.c:4700 +msgid "Show Tab _Label" +msgstr "Visa Fliketikett" + +#: ../midori/midori-view.c:4700 +msgid "Show Tab _Icon Only" +msgstr "Visa Enbart Flikikon" + +#: ../midori/midori-view.c:4707 +#, fuzzy +msgid "Close Ot_her Tab" +msgid_plural "Close Ot_her Tabs" +msgstr[0] "Stäng den aktuella fliken" +msgstr[1] "Stäng den aktuella fliken" + +#. i18n: word stem of "previous page" type links, case is not important +#: ../midori/midori-view.c:5396 +msgid "previous" +msgstr "Föregående" -#: ../midori/midori-websettings.c:740 -msgid "Whether tabs have close buttons" -msgstr "Om flikar har stängknappar" +#. i18n: word stem of "next page" type links, case is not important +#: ../midori/midori-view.c:5415 +msgid "next" +msgstr "nästa" -#: ../midori/midori-websettings.c:748 -msgid "Open new pages in:" -msgstr "Öppna nya sidor i:" +#: ../midori/midori-view.c:5428 +msgid "Print background images" +msgstr "Skriv ut bakgrundsbilder" -#: ../midori/midori-websettings.c:749 -msgid "Where to open new pages" -msgstr "Hur nya sidor ska öppnas" - -#: ../midori/midori-websettings.c:758 -msgid "Open external pages in:" -msgstr "Öppna externa sidor i:" - -#: ../midori/midori-websettings.c:759 -msgid "Where to open externally opened pages" -msgstr "Hur externt öppnade sidor ska öppnas" +#: ../midori/midori-view.c:5429 +msgid "Whether background images should be printed" +msgstr "Ifall bakgrundsbilder ska visas" -#: ../midori/midori-websettings.c:768 -msgid "Middle click opens Selection" -msgstr "Mittenklick öppnar markering" +#: ../midori/midori-view.c:5454 +msgid "Features" +msgstr "Funktioner" -#: ../midori/midori-websettings.c:769 -msgid "Load an address from the selection via middle click" -msgstr "Läs in en adress från markeringen via mittenklick" +#. i18n: Download tooltip (size): 4KB of 43MB +#: ../midori/midori-download.vala:63 +#, c-format +msgid "%s of %s" +msgstr "%s av %s" -#: ../midori/midori-websettings.c:777 -msgid "Open tabs in the background" -msgstr "Öppna flikar i bakgrunden" +#: ../midori/midori-download.vala:79 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d timme" +msgstr[1] "%d timmar" -#: ../midori/midori-websettings.c:778 -msgid "Whether to open new tabs in the background" -msgstr "Ifall nya flikar ska öppnas i bakgrunden" +#: ../midori/midori-download.vala:80 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minut" +msgstr[1] "%d minuter" -#: ../midori/midori-websettings.c:786 -msgid "Open Tabs next to Current" -msgstr "Öppna Flikar bredvid Nuvarande" +#: ../midori/midori-download.vala:81 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekund" +msgstr[1] "%d sekunder" -#: ../midori/midori-websettings.c:787 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Ifall nya flikar ska öppnas efter den nuvarande eller den sista" +#. i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning +#: ../midori/midori-download.vala:96 +#, c-format +msgid " - %s remaining" +msgstr " - %s återstår" -#: ../midori/midori-websettings.c:795 -msgid "Open popups in tabs" -msgstr "Öppna popupfönster i flikar" - -#: ../midori/midori-websettings.c:796 -msgid "Whether to open popup windows in tabs" -msgstr "Ifall popup-rutor ska öppnas i flikar" +#. i18n: Unknown number of bytes, used for transfer rate like ?B/s +#: ../midori/midori-download.vala:107 +msgid "?B" +msgstr "?B" -#: ../midori/midori-websettings.c:812 -msgid "Zoom Text and Images" -msgstr "Zooma text och bilder" +#. i18n: Download tooltip (transfer rate): (130KB/s) +#: ../midori/midori-download.vala:109 +#, c-format +msgid " (%s/s)" +msgstr " (%s/s)" -#: ../midori/midori-websettings.c:813 -msgid "Whether to zoom text and images" -msgstr "Iffall text och bilder ska zoomas" +#: ../midori/midori-download.vala:224 +msgid "The downloaded file is erroneous." +msgstr "De nerladdade filerna är felaktiga." -#: ../midori/midori-websettings.c:828 -msgid "Find inline while typing" -msgstr "Sök automatiskt på sidan" +#: ../midori/midori-download.vala:225 +msgid "" +"The checksum provided with the link did not match. This means the file is " +"probably incomplete or was modified afterwards." +msgstr "Kontrollsumman som tillhandahölls av länken stämde inte. Detta innebär troligtvis att filen är ofullständig eller hat modifierats i efterhand." -#: ../midori/midori-websettings.c:829 -msgid "Whether to automatically find inline while typing" -msgstr "Om en sökning på sidan automatiskt ska ske när du skriver" +#: ../midori/midori-download.vala:345 +#, c-format +msgid "The file \"%s\" can't be saved in this folder." +msgstr "Filen \"%s\" kan inte sparas i denna katalog," -#: ../midori/midori-websettings.c:837 -msgid "Accept cookies" -msgstr "Acceptera kakor" +#: ../midori/midori-download.vala:347 +msgid "You don't have permission to write in this location." +msgstr "Du har inte tillstånd att skriva på denna plats." -#: ../midori/midori-websettings.c:838 -msgid "What type of cookies to accept" -msgstr "Vilka typer av kakor som ska accepteras" +#: ../midori/midori-download.vala:350 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Det finns inte tillräckligt fritt utrymme för att ladda ner \"%s\"." -#: ../midori/midori-websettings.c:847 -msgid "Original cookies only" -msgstr "" +#: ../midori/midori-download.vala:352 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Filen behöver %s men enbart %s finns kvar." -#: ../midori/midori-websettings.c:848 -msgid "Accept cookies from the original website only" -msgstr "Tillåt kakor enbart från den ursprungliga webbplatsen" +#: ../midori/midori-speeddial.vala:180 +msgid "Speed Dial" +msgstr "Webbgenvägar" -#: ../midori/midori-websettings.c:856 -msgid "Maximum cookie age" -msgstr "Maximal kakålder" +#: ../midori/midori-speeddial.vala:181 ../midori/midori-speeddial.vala:261 +msgid "Click to add a shortcut" +msgstr "Klicka för att lägga till genväg" -#: ../midori/midori-websettings.c:857 -msgid "The maximum number of days to save cookies for" -msgstr "Maximalt antal dagar kakor sparas" +#: ../midori/midori-speeddial.vala:182 +msgid "Enter shortcut address" +msgstr "Skriv adress till genväg" -#: ../midori/midori-websettings.c:867 -msgid "Remember last visited pages" -msgstr "Kom ihåg senast besökta sidor" - -#: ../midori/midori-websettings.c:868 -msgid "Whether the last visited pages are saved" -msgstr "Ifall de senast besökta sidorna ska sparas" - -#: ../midori/midori-websettings.c:876 -msgid "Maximum history age" -msgstr "Maximal historikålder" +#: ../midori/midori-speeddial.vala:183 +msgid "Enter shortcut title" +msgstr "Skriv titel på genväg" -#: ../midori/midori-websettings.c:877 -msgid "The maximum number of days to save the history for" -msgstr "Maximalt antal dagar som historik ska sparas" +#: ../midori/midori-speeddial.vala:184 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Är du säker på att du vill ta bort den här genvägen?" -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "" +#: ../midori/midori-preferences.c:299 +msgid "Startup" +msgstr "Uppstart" -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "" +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "När Midori startar:" -#: ../midori/midori-websettings.c:894 -msgid "Remember last downloaded files" -msgstr "Kom ihåg senast hämtade filer" +#: ../midori/midori-preferences.c:306 +msgid "Homepage:" +msgstr "Startsida:" -#: ../midori/midori-websettings.c:895 -msgid "Whether the last downloaded files are saved" -msgstr "" +#: ../midori/midori-preferences.c:314 +#, fuzzy +msgid "Use _current page" +msgstr "Skriv ut denna sida" -#: ../midori/midori-websettings.c:905 -msgid "Proxy Server" -msgstr "Proxyserver" +#: ../midori/midori-preferences.c:318 +msgid "Use current page as homepage" +msgstr "Använd nuvarande sida som startsida" -#: ../midori/midori-websettings.c:906 -msgid "The proxy server used for HTTP connections" -msgstr "Proxyserver för HTTP-anslutningar" - -#: ../midori/midori-websettings.c:921 -msgid "Detect proxy server automatically" -msgstr "Upptäck proxiserver automatiskt" - -#: ../midori/midori-websettings.c:922 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Ifall en global proxyserver ska upptäckas automatiskt" +#. Page "Appearance" +#: ../midori/midori-preferences.c:327 +msgid "Fonts" +msgstr "Typsnitt" + +#: ../midori/midori-preferences.c:329 +msgid "Proportional Font Family" +msgstr "Typsnitt med variabel bredd" -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 -msgid "Identify as" -msgstr "Identifiera som" +#: ../midori/midori-preferences.c:333 +msgid "The default font family used to display text" +msgstr "Typsnitt som används för att visa text" -#: ../midori/midori-websettings.c:939 -msgid "What to identify as to web pages" -msgstr "Vad Midori ska identifiera sig som" +#: ../midori/midori-preferences.c:336 +msgid "The default font size used to display text" +msgstr "Standardstorlek för typsnitt som används för att visa text" -#: ../midori/midori-websettings.c:955 -msgid "Identification string" -msgstr "Identifikationssträng" +#: ../midori/midori-preferences.c:338 +msgid "Fixed-width Font Family" +msgstr "Typsnitt med fast bredd" -#: ../midori/midori-websettings.c:956 -msgid "The application identification string" -msgstr "" +#: ../midori/midori-preferences.c:342 +msgid "The font family used to display fixed-width text" +msgstr "Typsnitt som används för att visa text med fast bredd" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "Cache-storlek" +#: ../midori/midori-preferences.c:345 +msgid "The font size used to display fixed-width text" +msgstr "Typsnittsstorlek som används för att visa text med fast bredd" -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "Tillåtna storleken på cache" +#: ../midori/midori-preferences.c:347 +msgid "Minimum Font Size" +msgstr "Minsta typsnittsstorlek" -#: ../midori/midori-websettings.c:980 -msgid "Clear private data" -msgstr "Rensa privat data" +#: ../midori/midori-preferences.c:351 +msgid "The minimum font size used to display text" +msgstr "Den minimala typsnittsstorleken för text" -#: ../midori/midori-websettings.c:981 -msgid "The private data selected for deletion" -msgstr "Privat data vald för borttagning" +#: ../midori/midori-preferences.c:355 +msgid "Preferred Encoding" +msgstr "Föredragen kodning" -#: ../midori/midori-view.c:781 +#. Page "Behavior" +#: ../midori/midori-preferences.c:362 +msgid "Behavior" +msgstr "Beteende" + +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 +msgid "Load images automatically" +msgstr "Ladda bilder automatiskt" + +#: ../midori/midori-preferences.c:368 +msgid "Enable Spell Checking" +msgstr "Aktivera stavningskontroll" + +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 +msgid "Enable scripts" +msgstr "Aktivera skript" + +#: ../midori/midori-preferences.c:386 +msgid "Enable WebGL support" +msgstr "Aktivera stöd för WebGL" + +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 +msgid "Enable Netscape plugins" +msgstr "Aktivera Netscape-tillägg" + +#: ../midori/midori-preferences.c:408 +msgid "Zoom Text and Images" +msgstr "Zooma text och bilder" + +#: ../midori/midori-preferences.c:411 +msgid "Allow scripts to open popups" +msgstr "Tillåt skript att öppna popup-rutor." + +#: ../midori/midori-preferences.c:412 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Ifall skript är tillåtna att automatiskt öppna popup-fönster" + +#: ../midori/midori-preferences.c:415 +msgid "Middle click opens Selection" +msgstr "Mittenklick öppnar markering" + +#: ../midori/midori-preferences.c:416 +msgid "Load an address from the selection via middle click" +msgstr "Läs in en adress från markeringen via mittenklick" + +#: ../midori/midori-preferences.c:420 +msgid "Flash window on background tabs" +msgstr "Blinka fönster på bakgrundsflikar" + +#: ../midori/midori-preferences.c:425 +msgid "Preferred languages" +msgstr "Föredraget språk" + +#: ../midori/midori-preferences.c:429 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +#: ../midori/midori-preferences.c:431 +msgid "Save downloaded files to:" +msgstr "Spara hämtade filer i:" + +#. Page "Interface" +#: ../midori/midori-preferences.c:438 +msgid "Browsing" +msgstr "Bläddring" + +#: ../midori/midori-preferences.c:442 +msgid "Toolbar Style:" +msgstr "Stil för verktygsfält:" + +#: ../midori/midori-preferences.c:447 +msgid "Open new pages in:" +msgstr "Öppna nya sidor i:" + +#: ../midori/midori-preferences.c:451 +msgid "New tab behavior:" +msgstr "Inställning för nya flikar" + +#: ../midori/midori-preferences.c:456 +msgid "Close Buttons on Tabs" +msgstr "Stängknappar på flikar" + +#: ../midori/midori-preferences.c:460 +msgid "Always Show Tabbar" +msgstr "Visa alltid flikrad" + +#: ../midori/midori-preferences.c:464 +msgid "Open Tabs next to Current" +msgstr "Öppna flikar bredvid nuvarande" + +#: ../midori/midori-preferences.c:465 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Ifall nya flikar ska öppnas efter den nuvarande eller den sista" + +#: ../midori/midori-preferences.c:468 +msgid "Open tabs in the background" +msgstr "Öppna flikar i bakgrunden" + +#: ../midori/midori-preferences.c:472 +msgid "Text Editor" +msgstr "Textredigerare" + +#: ../midori/midori-preferences.c:477 +msgid "News Aggregator" +msgstr "RSS-läsare" + +#. Page "Network" +#: ../midori/midori-preferences.c:484 +msgid "Network" +msgstr "Nätverk" + +#: ../midori/midori-preferences.c:486 +msgid "Proxy server" +msgstr "Proxyserver" + +#: ../midori/midori-preferences.c:491 +msgid "Hostname" +msgstr "Värdnamn" + +#: ../midori/midori-preferences.c:499 +msgid "Port" +msgstr "Port" + +#: ../midori/midori-preferences.c:512 +msgid "Supported proxy types:" +msgstr "Proxytyper som stödjs:" + +#. TODO: Preserve page icons of search engines and merge privacy items +#: ../midori/midori-preferences.c:532 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 +msgid "Web Cache" +msgstr "Webbcache" + +#: ../midori/midori-preferences.c:533 ../midori/midori-preferences.c:536 +msgid "The maximum size of cached pages on disk" +msgstr "" + +#: ../midori/midori-preferences.c:538 +msgid "MB" +msgstr "MB" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:545 +msgid "Identify as" +msgstr "Identifiera som" + +#: ../midori/midori-preferences.c:560 +msgid "Privacy" +msgstr "Integritet" + +#: ../midori/midori-preferences.c:562 +msgid "Delete old Cookies after:" +msgstr "Ta bort gammla kakor efter:" + +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:567 +msgid "The maximum number of days to save cookies for" +msgstr "Maximalt antal dagar kakor sparas" + +#: ../midori/midori-preferences.c:571 +msgid "Only accept Cookies from sites you visit" +msgstr "Tillåt kakor enbart från de webbplatser du besöker" + +#: ../midori/midori-preferences.c:572 +msgid "Block cookies sent by third-party websites" +msgstr "Blockera kakor från tredjeparts-webbplatser" + +#: ../midori/midori-preferences.c:577 +msgid "" +"Cookies store login data, saved games, or user profiles for advertisement " +"purposes." +msgstr "" +"Kakor sparar logininformation, sparade spel, eller användarprofiler för " +"reklamsyften." + +#: ../midori/midori-preferences.c:584 +msgid "Enable offline web application cache" +msgstr "Aktivera frånkopplad webbapplikations-cache." + +#: ../midori/midori-preferences.c:587 +msgid "Enable HTML5 local storage support" +msgstr "Aktivera stöd för lokal HTML5 lagring" + +#. i18n: Reworded: Shorten details propagated when going to another page +#: ../midori/midori-preferences.c:591 +msgid "Strip referrer details sent to websites" +msgstr "" + +#. i18n: Referer here is not a typo but a technical term +#: ../midori/midori-preferences.c:593 +msgid "Whether the \"Referer\" header should be shortened to the hostname" +msgstr "" + +#: ../midori/midori-preferences.c:596 +msgid "Delete pages from history after:" +msgstr "Ta bort sidor från historiken efter:" + +#: ../midori/midori-preferences.c:598 ../midori/midori-preferences.c:601 +msgid "The maximum number of days to save the history for" +msgstr "Maximalt antal dagar som historik ska sparas" + +#: ../midori/midori-preferences.c:638 ../panels/midori-extensions.c:90 +msgid "Extensions" +msgstr "Tillägg" + +#: ../midori/midori-searchaction.c:1049 +msgid "Add search engine" +msgstr "Lägg till sökmotor" + +#: ../midori/midori-searchaction.c:1049 +msgid "Edit search engine" +msgstr "Redigera sökmotor" + +#: ../midori/midori-searchaction.c:1077 +msgid "_Name:" +msgstr "_Namn:" + +#: ../midori/midori-searchaction.c:1092 +msgid "_Description:" +msgstr "_Beskrivning" + +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 +msgid "_Address:" +msgstr "_Adress:" + +#: ../midori/midori-searchaction.c:1124 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1414 +msgid "Manage Search Engines" +msgstr "Hantera sökmotorer" + +#: ../midori/midori-searchaction.c:1514 +msgid "Use as _default" +msgstr "Använd som _standard" + +#: ../midori/midori-searchaction.c:1625 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Sökmotorerna kunde inte läsas in. %s\n" + +#: ../midori/midori-searchaction.c:1680 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Sökmotorer kunde inte sparas. %s" + +#: ../midori/midori-historycompletion.vala:17 ../panels/midori-history.c:111 +msgid "History" +msgstr "Historik" + +#: ../midori/midori-historycompletion.vala:54 +#, fuzzy, c-format +msgid "Failed to initialize history: %s" +msgstr "Misslyckades med att rensa historik: %s\n" + +#: ../midori/midori-historycompletion.vala:65 +#, fuzzy, c-format +msgid "Failed to select from history: %s" +msgstr "Misslyckades med att rensa historik: %s\n" + +#. search_view +#: ../midori/midori-historycompletion.vala:83 +#, c-format +msgid "Search for %s" +msgstr "Sök efter %s" + +#: ../midori/midori-searchcompletion.vala:20 +#: ../midori/midori-searchcompletion.vala:60 +msgid "Search with…" +msgstr "Sök _med..." + +#: ../midori/midori-searchcompletion.vala:48 +#, c-format +msgid "Search with %s" +msgstr "Sök med %s" + +#: ../midori/sokoke.c:243 +msgid "Open with" +msgstr "Öppna med" + +#: ../midori/sokoke.c:251 +#, c-format +msgid "Choose an application or command to open \"%s\":" +msgstr "Välj program eller kommando för att öppna \"%s\":" + +#: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 +msgid "Could not run external program." +msgstr "Kunde inte köra externt program." + +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "Ogilltigt URI" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:233 +msgid "_Inline Find:" +msgstr "_Sök på sidan:" + +#: ../toolbars/midori-findbar.c:251 +msgid "Previous" +msgstr "Föregående" + +#: ../toolbars/midori-findbar.c:257 +msgid "Next" +msgstr "Nästa" + +#: ../toolbars/midori-findbar.c:261 +msgid "Match Case" +msgstr "_Gör skillnad på skiftläge" + +#: ../toolbars/midori-findbar.c:270 +msgid "Close Findbar" +msgstr "Stäng sökfältet" + +#: ../toolbars/midori-transferbar.c:109 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Filen '%s' har hämtats." + +#: ../toolbars/midori-transferbar.c:114 +msgid "Transfer completed" +msgstr "Överföring färdig" + +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 +msgid "Clear All" +msgstr "Rensa Allt" + +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 +msgid "Some files are being downloaded" +msgstr "Några filer håller på att laddas ner" + +#: ../toolbars/midori-transferbar.c:283 +msgid "_Quit Midori" +msgstr "Avsluta Midori" + +#: ../toolbars/midori-transferbar.c:285 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Överföringen kommer avbrytas när Midori stängs." + +#: ../panels/midori-bookmarks.c:308 +#, fuzzy, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Borttagning av historikpost misslyckades: %s\n" + +#: ../panels/midori-bookmarks.c:475 +#, c-format +msgid "Failed to update bookmark : %s\n" +msgstr "Misslyckades med att uppdatera bokmärke: %s\n" + +#: ../panels/midori-bookmarks.c:535 +msgid "Edit the selected bookmark" +msgstr "Redigera det valda bokmärket" + +#: ../panels/midori-bookmarks.c:543 +msgid "Delete the selected bookmark" +msgstr "Ta bort det markerade bokmärket" + +#: ../panels/midori-bookmarks.c:558 +msgid "Add a new folder" +msgstr "Lägg till en ny mapp" + +#: ../panels/midori-bookmarks.c:687 ../panels/midori-history.c:629 +msgid "Separator" +msgstr "Avskiljare" + +#. Create the filter entry +#: ../panels/midori-bookmarks.c:1009 +msgid "Search Bookmarks" +msgstr "Sök i Bokmärken" + +#: ../panels/midori-history.c:158 ../panels/midori-history.c:191 +msgid "Today" +msgstr "Idag" + +#: ../panels/midori-history.c:160 ../panels/midori-history.c:193 +msgid "Yesterday" +msgstr "Igår" + +#: ../panels/midori-history.c:162 ../panels/midori-history.c:188 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d dag sedan" +msgstr[1] "%d dagar sedan" + +#: ../panels/midori-history.c:165 ../panels/midori-history.c:186 +msgid "A week ago" +msgstr "En vecka sedan" + +#: ../panels/midori-history.c:234 ../midori/midori-bookmarks.c:59 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Borttagning av historikpost misslyckades: %s\n" + +#: ../panels/midori-history.c:362 +msgid "Are you sure you want to remove all history items?" +msgstr "Är du säker på att du vill radera hela historiken?" + +#: ../panels/midori-history.c:409 +msgid "Bookmark the selected history item" +msgstr "Lägg till bokmärke för den valda historikposten" + +#: ../panels/midori-history.c:418 +msgid "Delete the selected history item" +msgstr "Ta bort den valda historikposten" + +#: ../panels/midori-history.c:426 +msgid "Clear the entire history" +msgstr "Rensa hela historiken" + +#. Create the filter entry +#: ../panels/midori-history.c:981 +msgid "Search History" +msgstr "Sökhistorik" + +#: ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "Överföringar" + +#: ../panels/midori-transfers.c:442 +msgid "Open Destination _Folder" +msgstr "Öppna mål_mapp" + +#: ../panels/midori-transfers.c:445 +msgid "Copy Link Loc_ation" +msgstr "Kopiera länk_plats" + +#: ../katze/katze-http-auth.c:210 +msgid "Authentication Required" +msgstr "Autentisering krävs" + +#: ../katze/katze-http-auth.c:226 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Användarnamn och lösenord behövs\n" +"för att öppna den här platsen:" + +#: ../katze/katze-http-auth.c:240 +msgid "Username" +msgstr "Användarnamn" + +#: ../katze/katze-http-auth.c:253 +msgid "Password" +msgstr "Lösenord" + +#: ../katze/katze-http-auth.c:267 +msgid "_Remember password" +msgstr "Kom ihåg lösenord" + +#: ../katze/katze-throbber.c:947 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:960 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:1040 +msgid "Animation frames are broken" +msgstr "Animeringsramar är trasiga" + +#: ../katze/katze-utils.c:442 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Egenskapen '%s' är ogilltig för %s" + +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 +#: ../extensions/addons.c:309 +msgid "Choose file" +msgstr "Välj fil" + +#: ../katze/katze-utils.c:494 +msgid "Choose folder" +msgstr "Välj mapp" + +#: ../katze/katze-utils.c:603 +msgid "None" +msgstr "Ingen" + +#: ../katze/katze-utils.c:719 +msgid "1 hour" +msgstr "1 timme" + +#: ../katze/katze-utils.c:720 +msgid "1 day" +msgstr "1 dag" + +#: ../katze/katze-utils.c:721 +msgid "1 week" +msgstr "1 vecka" + +#: ../katze/katze-utils.c:722 +msgid "1 month" +msgstr "1 månad" + +#: ../katze/katze-utils.c:723 +msgid "1 year" +msgstr "1 år" + +#: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 +#: ../extensions/external-download-manager.vala:224 +#: ../extensions/history-list.vala:243 +#, c-format +msgid "Preferences for %s" +msgstr "Inställningar för %s" + +#: ../katze/midori-uri.vala:182 +msgid "MD5-Checksum:" +msgstr "" + +#: ../katze/midori-uri.vala:189 +msgid "SHA1-Checksum:" +msgstr "" + +#: ../extensions/adblock.c:483 +msgid "Configure Advertisement filters" +msgstr "Redigera reklamblockeringsfilter" + +#: ../extensions/adblock.c:512 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" + +#: ../extensions/adblock.c:926 +msgid "Edit rule" +msgstr "Redigera regel" + +#: ../extensions/adblock.c:940 +msgid "_Rule:" +msgstr "_Regel:" + +#: ../extensions/adblock.c:994 +msgid "Bl_ock image" +msgstr "Bl_ockera bild" + +#: ../extensions/adblock.c:999 +msgid "Bl_ock link" +msgstr "Bl_ockera länk" + +#: ../extensions/adblock.c:1925 +msgid "Advertisement blocker" +msgstr "Reklamblockeringsfilter" + +#: ../extensions/adblock.c:1926 +msgid "Block advertisements according to a filter list" +msgstr "Blockera annonser enligt en filterlista" + +#. i18n: An infobar shows up when viewing a script on userscripts.org +#: ../extensions/addons.c:222 +msgid "This page appears to contain a user script. Do you wish to install it?" +msgstr "" +"Denna sida verkar innehålla ett användar-skript. Vill du installera det?" + +#: ../extensions/addons.c:223 +msgid "_Install user script" +msgstr "_Installera användarskript" + +#. i18n: An infobar shows up when viewing a style on userstyles.org +#: ../extensions/addons.c:228 +msgid "This page appears to contain a user style. Do you wish to install it?" +msgstr "Denna sida verkar innehålla en användarstil. Vill du installera den?" + +#: ../extensions/addons.c:229 +msgid "_Install user style" +msgstr "_Installera användarstil" + +#: ../extensions/addons.c:237 +msgid "Don't install" +msgstr "Installera inte" + +#: ../extensions/addons.c:320 ../extensions/addons.c:675 +msgid "Userscripts" +msgstr "Användarskript" + +#: ../extensions/addons.c:325 ../extensions/addons.c:677 +msgid "Userstyles" +msgstr "Användarstil" + +#: ../extensions/addons.c:371 ../extensions/addons.c:450 +#: ../extensions/feed-panel/main.c:120 +msgid "Error" +msgstr "Fel" + +#: ../extensions/addons.c:412 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Vill du verkligen ta bort '%s'?" + +#: ../extensions/addons.c:418 +msgid "Delete user script" +msgstr "Ta bort användarskript" + +#: ../extensions/addons.c:419 +msgid "Delete user style" +msgstr "Ta bort användarstil" + +#: ../extensions/addons.c:422 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Filen %s kommer att raderas permanent." + +#: ../extensions/addons.c:564 ../extensions/addons.c:641 +msgid "Open in Text Editor" +msgstr "Öppma i Textredigerare" + +#: ../extensions/addons.c:566 ../extensions/addons.c:650 +msgid "Open Target Folder" +msgstr "Öppna mål_mapp" + +#: ../extensions/addons.c:632 +msgid "Add new addon" +msgstr "Lägg till nytt tillägg" + +#: ../extensions/addons.c:658 +msgid "Remove selected addon" +msgstr "Ta bort valt tillägg" + +#: ../extensions/addons.c:1677 ../extensions/addons.c:1893 +msgid "User addons" +msgstr "Användartillägg" + +#: ../extensions/addons.c:1807 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Kan inte övervaka katalog '%s': %s" + +#: ../extensions/addons.c:1894 +msgid "Support for userscripts and userstyles" +msgstr "Stöd för användarskript och användarstilar" + +#: ../extensions/colorful-tabs.c:168 +msgid "Colorful Tabs" +msgstr "Färgglada flikar" + +#: ../extensions/colorful-tabs.c:169 +msgid "Tint each tab distinctly" +msgstr "Tona varje flik olika" + +#: ../extensions/cookie-manager/cookie-manager-page.c:73 +#: ../extensions/cookie-manager/main.c:35 +msgid "Cookie Manager" +msgstr "Kakhanterare" + +#: ../extensions/cookie-manager/cookie-manager-page.c:103 +msgid "Delete All" +msgstr "Ta bort alla" + +#: ../extensions/cookie-manager/cookie-manager-page.c:105 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Tar bort alla visade kakor. Om ett filter är konfigurerat kommer bara " +"matchande kakor att tas bort." + +#: ../extensions/cookie-manager/cookie-manager-page.c:120 +msgid "Expand All" +msgstr "Expandera alla" + +#: ../extensions/cookie-manager/cookie-manager-page.c:127 +msgid "Collapse All" +msgstr "Fäll ihop alla" + +#: ../extensions/cookie-manager/cookie-manager-page.c:575 +msgid "Do you really want to delete all cookies?" +msgstr "Vill du verkligen ta bort alla kakor?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:577 +msgid "Question" +msgstr "Fråga" + +#: ../extensions/cookie-manager/cookie-manager-page.c:588 +msgid "Only cookies which match the filter will be deleted." +msgstr "Endast kakor som matchar filtret kommer att tas bort." + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +msgid "At the end of the session" +msgstr "Vid slutet av en session." + +#: ../extensions/cookie-manager/cookie-manager-page.c:683 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Värd/b>: %s\n" +"Namn: %s\n" +"Värde: %s\n" +"Sökväg: %s\n" +"Säker: %s\n" +"Förfaller: %s" + +#. i18n: is this cookie secure (SSL)? yes/ no +#: ../extensions/cookie-manager/cookie-manager-page.c:690 +msgid "Yes" +msgstr "Ja" + +#: ../extensions/cookie-manager/cookie-manager-page.c:690 +msgid "No" +msgstr "Nej" + +#: ../extensions/cookie-manager/cookie-manager-page.c:705 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"Domän: %s\n" +"Kakor: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1028 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:575 +msgid "Name" +msgstr "Namn" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1080 +msgid "_Expand All" +msgstr "_Expandera alla" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1088 +msgid "_Collapse All" +msgstr "_Fäll ihop alla" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1140 +msgid "Search Cookies by Name or Domain" +msgstr "Sök bland kakorna genom Namn eller Domän" + +#: ../extensions/cookie-manager/main.c:36 +msgid "List, view and delete cookies" +msgstr "Visa och ta bort kakor" + +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Kopiera Flik_adresser" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy Addresses of Tabs" +msgstr "Kopiera Flikadresser" + +#: ../extensions/copy-tabs.c:97 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Kopiera alla flikadresser till urklippet" + +#: ../extensions/delayed-load.vala:24 ../extensions/delayed-load.vala:209 +#, c-format +msgid "Delayed load" +msgstr "Försenad laddning" + +#: ../extensions/delayed-load.vala:49 +msgid "Delay in seconds until loading the page:" +msgstr "" + +#: ../extensions/delayed-load.vala:210 +msgid "Delay page load until you actually use the tab." +msgstr "" + +#: ../extensions/external-download-manager.vala:124 +msgid "" +"An error occurred when attempting to download a file with the following " +"plugin:\n" +msgstr "" + +#: ../extensions/external-download-manager.vala:175 +msgid "External Download Manager - Aria2" +msgstr "Extern Hämtningshanterare - Aria2" + +#: ../extensions/external-download-manager.vala:176 +msgid "Download files with Aria2" +msgstr "Ladda ner filer med Aria2" + +#: ../extensions/external-download-manager.vala:202 +msgid "External Download Manager - SteadyFlow" +msgstr "Extern Hämtningshanterare -SteadyFlow" + +#: ../extensions/external-download-manager.vala:203 +msgid "Download files with SteadyFlow" +msgstr "Ladda ner filer med SteadyFlow" + +#: ../extensions/external-download-manager.vala:249 +msgid "Command:" +msgstr "Kommando:" + +#: ../extensions/external-download-manager.vala:304 +#, c-format +msgid "Download files with \"%s\" or a custom command" +msgstr "" + +#: ../extensions/external-download-manager.vala:320 +msgid "External Download Manager - CommandLine" +msgstr "En extern hämtningshanterare - kommandotolken" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:375 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Senast uppdaterad: %s." + +#: ../extensions/feed-panel/feed-panel.c:629 +msgid "Feeds" +msgstr "Flöden" + +#: ../extensions/feed-panel/feed-panel.c:682 +msgid "Add new feed" +msgstr "Lägg till nytt flöde" + +#: ../extensions/feed-panel/feed-panel.c:689 +msgid "Delete feed" +msgstr "Ta bort flöde" + +#: ../extensions/feed-panel/feed-panel.c:769 +msgid "_Feeds" +msgstr "_Flöden" + +#: ../extensions/feed-panel/feed-parse.c:195 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:235 +#, c-format +msgid "Unsupported feed format." +msgstr "Formatet för flödet stöds inte." + +#: ../extensions/feed-panel/feed-parse.c:265 +#, 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:122 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Flödet '%s' finns redan" + +#: ../extensions/feed-panel/main.c:199 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Fel vid laddning av flödet '%s'" + +#: ../extensions/feed-panel/main.c:509 +msgid "Feed Panel" +msgstr "Flödespanel" + +#: ../extensions/feed-panel/main.c:510 +msgid "Read Atom/ RSS feeds" +msgstr "Läs Atom/RSS-flöden" + +#: ../extensions/formhistory/formhistory.c:38 +#, fuzzy, c-format +msgid "Failed to add form value: %s\n" +msgstr "Misslyckades med att öppna databasen: %s" + +#: ../extensions/formhistory/formhistory.c:100 +msgid "Form history" +msgstr "Formulärhistorik" + +#: ../extensions/formhistory/formhistory.c:117 +msgid "" +"Master password required\n" +"to open password database" +msgstr "" +"Användarnamn och lösenord behövs\n" +"för att öppna den här platsen:" + +#: ../extensions/formhistory/formhistory.c:294 +msgid "Remember password on this page?" +msgstr "Kom ihåg lösenord för denna sida?" + +#: ../extensions/formhistory/formhistory.c:299 +msgid "Remember" +msgstr "Kom ihåg" + +#: ../extensions/formhistory/formhistory.c:300 +msgid "Not now" +msgstr "Inte nu" + +#: ../extensions/formhistory/formhistory.c:301 +msgid "Never for this page" +msgstr "Aldrig för denna sida" + +#: ../extensions/formhistory/formhistory.c:427 +msgid "Toggle form history state" +msgstr "Växla läget för formulärhistorik" + +#: ../extensions/formhistory/formhistory.c:428 +msgid "Activate or deactivate form history for the current tab." +msgstr "Aktivera eller inaktivera formulärhistorik för den aktuella fliken." + +#: ../extensions/formhistory/formhistory.c:515 ../midori/midori-history.c:47 +#: ../midori/midori-bookmarks.c:155 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Misslyckades med att öppna databasen: %s\n" + +#: ../extensions/formhistory/formhistory.c:533 +#: ../extensions/formhistory/formhistory.c:537 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:624 +msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:681 +msgid "Form history filler" +msgstr "" + +#: ../extensions/formhistory/formhistory.c:682 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory/formhistory-gdom-frontend.c:223 +#: ../extensions/formhistory/formhistory-js-frontend.c:104 +#, c-format +msgid "Failed to select suggestions\n" +msgstr "" + +#: ../extensions/history-list.vala:205 +msgid "There are no unvisited tabs" +msgstr "Det finns inga flikar som ej besökts" + +#: ../extensions/history-list.vala:243 +#, c-format +msgid "History-List" +msgstr "Historik-lista" + +#: ../extensions/history-list.vala:283 +msgid "Tab closing behavior" +msgstr "Beteende vid stängning av flikar" + +#: ../extensions/history-list.vala:291 +msgid "Do nothing" +msgstr "Gör ingenting" + +#: ../extensions/history-list.vala:297 +msgid "Switch to last viewed tab" +msgstr "Byt till den senast visade fliken" + +#: ../extensions/history-list.vala:303 +msgid "Switch to newest tab" +msgstr "Byt till den nyaste fliken" + +#: ../extensions/history-list.vala:443 +msgid "Next new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:444 +msgid "Next new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:453 +msgid "Previous new Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:454 +msgid "Previous new tab from history" +msgstr "" + +#: ../extensions/history-list.vala:463 +msgid "Display tab in background (History List)" +msgstr "" + +#: ../extensions/history-list.vala:464 +msgid "Display the current selected tab in background" +msgstr "Visa den valda fliken i bakgrunden" + +#: ../extensions/history-list.vala:591 +msgid "History List" +msgstr "Historiklista" + +#: ../extensions/history-list.vala:592 +msgid "Move to the last used tab when switching or closing tabs" +msgstr "Byt till sist använda flik vid byte eller stängning av flikar." + +#: ../extensions/mouse-gestures.c:513 +msgid "Mouse Gestures" +msgstr "Musgester" + +#: ../extensions/mouse-gestures.c:514 +msgid "Control Midori by moving the mouse" +msgstr "Kontrollera Midori genom att flytta musen" + +#: ../extensions/shortcuts.c:109 +msgid "Reload page or stop loading" +msgstr "Ladda om sida eller sluta ladda" + +#: ../extensions/shortcuts.c:168 +msgid "Customize Keyboard shortcuts" +msgstr "Ställ in tangentbordsgenvägar" + +#: ../extensions/shortcuts.c:275 +#, fuzzy +msgid "Customize Sh_ortcuts…" +msgstr "Ställ in gen_vägar…" + +#: ../extensions/shortcuts.c:312 +msgid "Shortcuts" +msgstr "Genvägar" + +#: ../extensions/shortcuts.c:313 +msgid "View and edit keyboard shortcuts" +msgstr "Visa och redigera tangentbordsgenvägar" + +#: ../extensions/status-clock.c:177 +msgid "Statusbar Clock" +msgstr "Klocka i Statusbaren" + +#: ../extensions/status-clock.c:178 +msgid "Display date and time in the statusbar" +msgstr "Visa datum och tid i statusraden" + +#: ../extensions/statusbar-features.c:152 +msgid "Images" +msgstr "Bilder" + +#: ../extensions/statusbar-features.c:162 +msgid "Scripts" +msgstr "Skript" + +#: ../extensions/statusbar-features.c:174 +msgid "Netscape plugins" +msgstr "Netscapetillägg" + +#: ../extensions/statusbar-features.c:259 +msgid "Statusbar Features" +msgstr "Statusradsfunktioner" + +#: ../extensions/statusbar-features.c:260 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 +msgid "Tab Panel" +msgstr "Flikrad" + +#: ../extensions/tab-panel.c:663 +msgid "T_ab Panel" +msgstr "Visa f_likraden" + +#: ../extensions/tab-panel.c:681 +msgid "Show tabs in a vertical panel" +msgstr "Visa flikar i en vertikal panel" + +#: ../extensions/tabs-minimized.c:76 +msgid "Only Icons on Tabs by default" +msgstr "Enbart ikoner på flikar som standard" + +#: ../extensions/tabs-minimized.c:77 +msgid "New tabs have no label by default" +msgstr "Nya flikar har ingen etikett som standard" + +#: ../extensions/toolbar-editor.c:393 +msgid "Customize Toolbar" +msgstr "Redigera verktygsrad" + +#: ../extensions/toolbar-editor.c:409 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Välj föremål att visa i verktygsraden. Föremål kan omarrangeras genom att " +"dra och släppa." + +#: ../extensions/toolbar-editor.c:425 +msgid "Available Items" +msgstr "Tillgängliga föremål" + +#: ../extensions/toolbar-editor.c:446 +msgid "Displayed Items" +msgstr "Visade föremål" + +#: ../extensions/toolbar-editor.c:586 +msgid "_Customize Toolbar…" +msgstr "Redigera _verktygsrad…" + +#: ../extensions/toolbar-editor.c:615 +msgid "Toolbar Editor" +msgstr "Verktygsradseditor" + +#: ../extensions/toolbar-editor.c:616 +msgid "Easily edit the toolbar layout" +msgstr "Redigera verktygsradens layout enkelt" + +#: ../extensions/web-cache.c:462 +msgid "Cache HTTP communication on disk" +msgstr "" + +#: ../katze/katze-http-cookies-sqlite.c:129 #, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "Sidan \"%s\" kunde inte läsas in." +msgid "Failed to load cookies\n" +msgstr "Misslyckades med att ladda kakor\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:783 -#: ../midori/midori-view.c:3013 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Fel" +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-privatedata.c:120 +msgid "Clear Private Data" +msgstr "Rensa Privat Data" -#: ../midori/midori-view.c:786 -msgid "Try again" -msgstr "Försök igen" +#: ../midori/midori-privatedata.c:124 +msgid "_Clear private data" +msgstr "_Rensa privat data" -#. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:818 -#: ../midori/midori-view.c:3017 -#, c-format -msgid "Not found - %s" -msgstr "Hittades inte - %s" - -#: ../midori/midori-view.c:1205 -msgid "Open _Link" -msgstr "Öppna _länk" +#: ../midori/midori-privatedata.c:137 +msgid "Clear the following data:" +msgstr "Rensa följande data:" -#: ../midori/midori-view.c:1207 -msgid "Open Link in New _Tab" -msgstr "Öppna länk i ny fli_k" +#: ../midori/midori-privatedata.c:147 +msgid "Last open _tabs" +msgstr "Senast öppnade flikar" -#: ../midori/midori-view.c:1224 -msgid "Open Link in New _Window" -msgstr "Öppna länk i nytt _fönster" +#: ../midori/midori-privatedata.c:173 +msgid "Clear private data when _quitting Midori" +msgstr "Rensa privat data när Midori _avslutas" -#: ../midori/midori-view.c:1230 -msgid "_Download Link destination" -msgstr "_Hämta länkplats" +#. i18n: Logins and passwords in websites and web forms +#: ../midori/midori-privatedata.c:302 +msgid "Saved logins and _passwords" +msgstr "Sparade inloggningar och l_ösenord" + +#: ../midori/midori-privatedata.c:304 +msgid "Cookies and Website data" +msgstr "Kakor och Webbplatsdata" -#: ../midori/midori-view.c:1236 -msgid "_Save Link destination" -msgstr "_Spara länkplats" +#: ../midori/midori-privatedata.c:311 +msgid "Website icons" +msgstr "Webbplatsikoner" -#: ../midori/midori-view.c:1245 -msgid "Download with Download _Manager" -msgstr "Hämta med hämtnings_hanterare" +#: ../midori/midori-viewcompletion.vala:18 +msgid "Open tabs" +msgstr "Öppna flikar" + +#: ../midori/midori-viewcompletion.vala:75 +#, fuzzy +msgid "More open tabs…" +msgstr "Visa senast öppna flikar" -#: ../midori/midori-view.c:1274 -msgid "Search _with" -msgstr "Sök _med" +#: ../midori/midori-history.c:25 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Misslyckades med att rensa historik: %s\n" -#: ../midori/midori-view.c:1306 -msgid "_Search the Web" -msgstr "_Sök på webben" +#. i18n: Couldn't remove items that are older than n days +#: ../midori/midori-history.c:122 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Borttagning av gamla historikobjekt misslyckades: %s\n" -#: ../midori/midori-view.c:1316 -msgid "Open Address in New _Tab" -msgstr "Öppna adress i ny fli_k" +#: ../midori/midori-bookmarks.c:104 +msgid "failed to ATTACH old db" +msgstr "" + +#: ../midori/midori-bookmarks.c:111 +msgid "failed to import from old db" +msgstr "" + +#: ../midori/midori-bookmarks.c:115 +msgid "failed to rollback the transaction" +msgstr "" -#: ../midori/midori-view.c:1494 -msgid "Open or download file" -msgstr "Öppna eller hämta fil" +#: ../midori/midori-bookmarks.c:119 +msgid "failed to DETACH " +msgstr "" -#: ../midori/midori-view.c:1511 +#: ../midori/midori-bookmarks.c:259 #, c-format -msgid "File Type: '%s'" -msgstr "Filtyp: \"%s\"" +msgid "Couldn't create bookmarks table: %s\n" +msgstr "" -#: ../midori/midori-view.c:1514 +#: ../midori/midori-bookmarks.c:274 #, c-format -msgid "File Type: %s ('%s')" -msgstr "Filtyp: %s (\"%s\")" +msgid "Couldn't import from old database: %s\n" +msgstr "Misslyckades med att importera från gammal databas: %s\n" -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1518 +#: ../midori/midori-bookmarks.c:311 #, c-format -msgid "Open %s" -msgstr "Öppna %s" +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bokmärkena kunde inte sparas. %s" + +#: ../midori/midori-session.c:192 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" -#: ../midori/midori-view.c:1957 +#: ../midori/midori-session.c:361 #, c-format -msgid "Inspect page - %s" -msgstr "Inspektera sida - %s" +msgid "The configuration couldn't be saved. %s" +msgstr "Konfigurationsfilen kunde inte sparas. %s" -#: ../midori/midori-view.c:2147 -msgid "Speed Dial" -msgstr "Webbgenvägar" +#: ../midori/midori-session.c:382 ../midori/midori-frontend.c:505 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sessionen kunde inte läsas in: %s\n" -#: ../midori/midori-view.c:2148 -msgid "Click to add a shortcut" -msgstr "Klicka för att lägga till genväg" +#: ../midori/midori-session.c:412 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sessionen kunde inte sparas. %s" -#: ../midori/midori-view.c:2149 -msgid "Enter shortcut address" -msgstr "Skriv adress till genväg" +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/midori-frontend.c:129 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Papperskorgen kunde inte sparas. %s" -#: ../midori/midori-view.c:2150 -msgid "Enter shortcut title" -msgstr "Skriv titel på genväg" +#: ../midori/midori-frontend.c:337 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori verkar ha krashat vid senaste körningen. Om det händer flera gånger, " +"prova något av dessa alternativ för att lösa problemet." -#: ../midori/midori-view.c:2151 -msgid "Are you sure you want to delete this shortcut?" -msgstr "Är du säker på att du vill ta bort den här genvägen?" +#: ../midori/midori-frontend.c:347 +msgid "Modify _preferences" +msgstr "Redigera _inställningar" + +#: ../midori/midori-frontend.c:351 +msgid "Disable all _extensions" +msgstr "Inaktivera alla _tillägg" + +#: ../midori/midori-frontend.c:360 +msgid "Show a dialog after Midori crashed" +msgstr "Visa en dialog efter att Midori har krashat" + +#: ../midori/midori-frontend.c:365 +msgid "Discard old tabs" +msgstr "Kasta bort gamla flikar" + +#: ../midori/midori-frontend.c:373 +#, fuzzy +msgid "Show last crash _log" +msgstr "Visa senast öppna flikar" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "" + +#: ../midori/midori-frontend.c:457 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "En instans av Midori körs redan, men svarar inte.\n" + +#: ../midori/midori-frontend.c:490 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "Bokmärkena kunde inte läsas in: %s\n" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-frontend.c:521 #, c-format -msgid "Document cannot be displayed" -msgstr "Dokumentet kan inte visas" +msgid "The trash couldn't be loaded: %s\n" +msgstr "Papperskorgen kunde inte läsas in: %s\n" -#: ../midori/midori-view.c:2198 +#: ../midori/midori-frontend.c:529 #, c-format -msgid "No documentation installed" -msgstr "Ingen dokumentation installerad" +msgid "The history couldn't be loaded: %s\n" +msgstr "Historiken kunde inte läsas in: %s\n" -#: ../midori/midori-view.c:2323 -msgid "Blank page" -msgstr "Tom sida" +#: ../midori/midori-frontend.c:540 +msgid "The following errors occured:" +msgstr "Följande fel inträffade:" -#: ../midori/midori-view.c:2551 -#: ../midori/sokoke.c:865 -msgid "New _Tab" -msgstr "Ny fli_k" +#: ../midori/midori-frontend.c:545 +msgid "_Ignore" +msgstr "_Ignorera" -#: ../midori/midori-view.c:2565 -msgid "_Duplicate Tab" -msgstr "_Duplicera flik" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:252 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:297 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:667 +#, c-format +msgid "SQL fails: %s" +msgstr "" -#: ../midori/midori-view.c:2570 -msgid "_Restore Tab" -msgstr "_Återställ flik" - -#: ../midori/midori-view.c:2570 -msgid "_Minimize Tab" -msgstr "_Minimera flik" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1121 +msgid "Accept" +msgstr "Acceptera" -#: ../midori/midori-preferences.c:91 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1122 +msgid "Accept for session" +msgstr "Acceptera för sessionen" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1123 +msgid "Block" +msgstr "Blockera" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:156 #, c-format -msgid "Preferences for %s" -msgstr "Inställningar för %s" +msgid "Could not open database of extenstion: %s" +msgstr "Kunde inte öppna databasen för tillägget: %s" -#. Page "General" -#: ../midori/midori-preferences.c:398 -msgid "General" -msgstr "Allmänt" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:201 +#, c-format +msgid "Failed to execute database statement: %s" +msgstr "" -#: ../midori/midori-preferences.c:399 -msgid "Startup" -msgstr "Uppstart" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 +msgid "Do you really want to delete all cookie permissions?" +msgstr "Vill du verkligen radera alla tillstånd för kakorna?" -#: ../midori/midori-preferences.c:415 -msgid "Use current page as homepage" -msgstr "Använd nuvarande sida som startsida" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +msgid "Delete all cookie permissions?" +msgstr "" -#: ../midori/midori-preferences.c:425 -#: ../panels/midori-transfers.c:88 -msgid "Transfers" -msgstr "Överföringar" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 +msgid "" +"This action will delete all cookie permissions. You will be asked for " +"permissions again for each web site visited." +msgstr "" -#. Page "Appearance" -#: ../midori/midori-preferences.c:440 -msgid "Appearance" -msgstr "Utseende" - -#: ../midori/midori-preferences.c:441 -msgid "Font settings" -msgstr "Typsnittsinställningar" - -#: ../midori/midori-preferences.c:443 -msgid "Default Font Family" -msgstr "Standardtypsnittsfamilj" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 +msgid "Cookie permission manager" +msgstr "Rättighetshanterare för kakor" -#: ../midori/midori-preferences.c:447 -msgid "The default font family used to display text" -msgstr "Typsnittsfamilj som används för att visa text" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 +msgid "Instance of current cookie permission manager" +msgstr "" -#: ../midori/midori-preferences.c:450 -msgid "The default font size used to display text" -msgstr "Standardstorlek för typsnitt som används för att visa text" +#. Set up dialog +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 +msgid "Configure cookie permission" +msgstr "" -#: ../midori/midori-preferences.c:453 -msgid "Fixed-width Font Family" -msgstr "Typsnittsfamilj med fast bredd" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 +#, c-format +msgid "" +"Below is a list of all web sites and the policy set for them. You can delete " +"policies by marking the entries and clicking on Delete.You can also " +"add a policy for a domain manually by entering the domain below, choosing " +"the policy and clicking on Add." +msgstr "" -#: ../midori/midori-preferences.c:457 -msgid "The font family used to display fixed-width text" +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:561 +msgid "Domain" +msgstr "Domän" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 +msgid "Policy" +msgstr "Policy" + +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 +msgid "Delete _all" +msgstr "Ta bort _alla" + +#. Add "ask-for-unknown-policy" checkbox +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 +msgid "A_sk for policy if unknown for a domain" msgstr "" -#: ../midori/midori-preferences.c:460 -msgid "The font size used to display fixed-width text" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 +msgid "" +"A fatal error occurred which prevents the cookie permission manager " +"extension to continue. You should disable it." msgstr "" -#: ../midori/midori-preferences.c:463 -msgid "Minimum Font Size" -msgstr "Minsta typsnittsstorlek" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 +msgid "Error in cookie permission manager extension" +msgstr "" -#: ../midori/midori-preferences.c:466 -msgid "The minimum font size used to display text" -msgstr "Den minimala typsnittsstorleken för text" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 +msgid "Reason" +msgstr "Anledning" -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Kodning" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "Teckenkodning som ska användas som standard" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:137 +msgid "Could not get path to configuration of extension: path is NULL" +msgstr "" -#. Page "Behavior" -#: ../midori/midori-preferences.c:483 -msgid "Behavior" -msgstr "Beteende" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:139 +msgid "Could not get path to configuration of extension." +msgstr "" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Funktioner" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#, c-format +msgid "Could not create configuration folder for extension: %s" +msgstr "Kunde inte skapa konfigurationskatalog för tillägget: %s" -#: ../midori/midori-preferences.c:487 -#: ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Ladda bilder automatiskt" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:147 +msgid "Could not create configuration folder for extension." +msgstr "Kunde inte skapa konfigurationskatalog för tillägget." -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Ladda och visa bilder automatiskt" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:164 +#, fuzzy +msgid "Could not open database of extension." +msgstr "Misslyckades med att öppna databasen: %s\n" -#: ../midori/midori-preferences.c:491 -msgid "Shrink images automatically" -msgstr "Förminska bilder automatiskt" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:197 +msgid "Could not set up database structure of extension." +msgstr "" -#: ../midori/midori-preferences.c:492 -msgid "Automatically shrink standalone images to fit" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:318 +#, c-format +msgid "Could not determine global cookie policy to set for domain: %s" msgstr "" -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Skriv ut bakgrundsbilder" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:493 +msgid "Till session end" +msgstr "" -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Ifall bakgrundsbilder ska visas" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:517 +#, c-format +msgid "The website %s wants to store %d cookies." +msgstr "Webbplatsen %s vill spara %d kakor." -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:519 +#, c-format +msgid "The website %s wants to store a cookie." +msgstr "Webbplatsen vill spara en kaka." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:523 +#, c-format +msgid "Multiple websites want to store %d cookies in total." +msgstr "Flertalet webbplatser vill spara totalt %d kakor." + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:532 +msgid "_Accept" +msgstr "_Acceptera" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:533 +msgid "Accept for this _session" +msgstr "Acceptera för denna _sessionen" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:534 +msgid "De_ny" +msgstr "Vägra" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:535 +msgid "Deny _this time" msgstr "" -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:568 +msgid "Path" msgstr "" -#: ../midori/midori-preferences.c:503 -#: ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Aktivera skript" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:582 +msgid "Value" +msgstr "Värde" -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded scripting languages" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:593 +msgid "Expire date" msgstr "" -#: ../midori/midori-preferences.c:507 -#: ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Aktivera Netscape-tillägg" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1016 +#, fuzzy +msgid "Extension instance" +msgstr "Tillägg" -#: ../midori/midori-preferences.c:508 -msgid "Enable embedded Netscape plugin objects" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1017 +msgid "The Midori extension instance for this extension" msgstr "" -#: ../midori/midori-preferences.c:511 -msgid "Enforce 96 dots per inch" -msgstr "Tvinga 96 punkter per tum" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1023 +#, fuzzy +msgid "Application instance" +msgstr "Program" -#: ../midori/midori-preferences.c:512 -msgid "Enforce a video dot density of 96 DPI" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1024 +msgid "The Midori application instance this extension belongs to" msgstr "" -#: ../midori/midori-preferences.c:515 -msgid "Enable developer tools" -msgstr "Aktivera utvecklingsverktyg" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1030 +msgid "Database instance" +msgstr "" -#: ../midori/midori-preferences.c:516 -msgid "Enable special extensions for developers" -msgstr "Aktivera speciella tillägg för utvecklare" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 +msgid "Pointer to sqlite database instance used by this extension" +msgstr "" -#: ../midori/midori-preferences.c:523 -msgid "Spell Checking" -msgstr "Stavningskontroll" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1036 +msgid "Database path" +msgstr "" -#: ../midori/midori-preferences.c:526 -msgid "Enable Spell Checking" -msgstr "Aktivera stavningskontroll" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1037 +msgid "Path to sqlite database instance used by this extension" +msgstr "" -#: ../midori/midori-preferences.c:527 -msgid "Enable spell checking while typing" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1043 +msgid "Ask for unknown policy" 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\"" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1044 +msgid "" +"If true this extension ask for policy for every unknown domain.If false this " +"extension uses the global cookie policy set in Midori settings." msgstr "" -#. Page "Interface" -#: ../midori/midori-preferences.c:536 -msgid "Interface" -msgstr "Gränssnitt" - -#: ../midori/midori-preferences.c:537 -msgid "Navigationbar" -msgstr "Navigeringsfält" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1120 +msgid "Undetermined" +msgstr "" -#: ../midori/midori-preferences.c:548 -msgid "Browsing" -msgstr "Bläddring" +#: ../extensions/cookie-permissions/main.c:62 +msgid "Cookie Security Manager" +msgstr "Säkerhetshanterare för kakor" -#. Page "Applications" -#: ../midori/midori-preferences.c:574 -msgid "Applications" -msgstr "Program" +#: ../extensions/cookie-permissions/main.c:63 +msgid "Manage cookie permission per site" +msgstr "" -#: ../midori/midori-preferences.c:575 -msgid "External applications" -msgstr "Externa program" +#~ msgid "Custom..." +#~ msgstr "Anpassad…" -#. Page "Network" -#: ../midori/midori-preferences.c:621 -#: ../midori/midori-preferences.c:622 -msgid "Network" -msgstr "Nätverk" +#~ msgid "_Details" +#~ msgstr "_Detaljer" -#: ../midori/midori-preferences.c:649 -msgid "MB" -msgstr "MB" +#~ msgid "Lightweight web browser" +#~ msgstr "Resurssnål webbläsare" -#. Page "Privacy" -#: ../midori/midori-preferences.c:654 -msgid "Privacy" -msgstr "Integritet" +#~ msgid "No filename specified" +#~ msgstr "Inget filnamn valt" -#: ../midori/midori-preferences.c:655 -msgid "Web Cookies" -msgstr "Webbkakor" - -#: ../midori/midori-preferences.c:668 -#: ../midori/midori-preferences.c:678 -msgid "days" -msgstr "dagar" +#~ msgid "The specified configuration folder is invalid." +#~ msgstr "Den valda konfigurationsmappen är ogiltig." -#: ../midori/midori-searchaction.c:488 -#: ../katze/katze-arrayaction.c:335 -msgid "Empty" -msgstr "Tom" +#~ msgid "Writing failed." +#~ msgstr "Kunde inte skriva." -#: ../midori/midori-searchaction.c:908 -msgid "Add search engine" -msgstr "Lägg till sökmotor" +#~ msgid "%d%% loaded" +#~ msgstr "%d%% inläst" -#: ../midori/midori-searchaction.c:908 -msgid "Edit search engine" -msgstr "Redigera sökmotor" +#~ msgid "_Title:" +#~ msgstr "_Titel:" -#: ../midori/midori-searchaction.c:936 -msgid "_Name:" -msgstr "_Namn:" +#~ msgid "_Folder:" +#~ msgstr "_Mapp:" -#: ../midori/midori-searchaction.c:980 -msgid "_Icon:" -msgstr "_Ikon:" +#~ msgid "Cookies" +#~ msgstr "Kakor" -#: ../midori/midori-searchaction.c:994 -msgid "_Token:" -msgstr "" +#~ msgid "'Flash' Cookies" +#~ msgstr "Flashkakor" -#: ../midori/midori-searchaction.c:1213 -msgid "Manage Search Engines" -msgstr "Hantera sökmotorer" +#~ msgid "Add shortcut to speed dial" +#~ msgstr "Lägg till genväg i Webbgenvägar" -#: ../midori/midori-searchaction.c:1312 -msgid "Use as _default" -msgstr "Använd som _standard" +#~ msgid "Close this window" +#~ msgstr "Stäng det här fönstret" -#: ../midori/sokoke.c:162 -#: ../midori/sokoke.c:174 -msgid "Could not run external program." -msgstr "Kunde inte köra externt program." +#~ msgid "Quit the application" +#~ msgstr "Avsluta programmet" -#: ../midori/sokoke.c:856 -msgid "_Bookmark" -msgstr "_Bokmärke" +#~ msgid "Cut the selected text" +#~ msgstr "Klipp ut markerad text" -#: ../midori/sokoke.c:858 -msgid "Add Boo_kmark" -msgstr "Lägg till bokmä_rke" +#~ msgid "Copy the selected text" +#~ msgstr "Kopiera markerad text" -#: ../midori/sokoke.c:859 -msgid "_Console" -msgstr "_Konsol" +#~ msgid "Paste text from the clipboard" +#~ msgstr "Klistra in text från klippbordet" -#: ../midori/sokoke.c:860 -msgid "_Extensions" -msgstr "_Tillägg" +#~ msgid "Delete the selected text" +#~ msgstr "Ta bort markerad text" -#: ../midori/sokoke.c:861 -msgid "_History" -msgstr "_Historik" +#~ msgid "Select all text" +#~ msgstr "Markera all text" + +#~ msgid "Reset the zoom level" +#~ msgstr "Återställ zoom-nivån" + +#~ msgid "View the source code of the page" +#~ msgstr "Visa källkod för sidan" + +#~ msgid "View Selection Source" +#~ msgstr "Visa källkod för markering" + +#~ msgid "Delete the contents of the trash" +#~ msgstr "Ta bort innehållet i papperskorgen" + +#~ msgid "Open the last closed tab" +#~ msgstr "Öppna senast stängda flik" + +#~ msgid "Add a new bookmark folder" +#~ msgstr "Lägg till en ny bokmärkesmapp" + +#~ msgid "Add, edit and remove search engines…" +#~ msgstr "Lägg till, ändra och ta bort sökmotorer…" + +#~ msgid "Clear private data…" +#~ msgstr "Rensa privat data…" + +#~ msgid "Switch to the previous tab" +#~ msgstr "Byt till föregående flik" + +#~ msgid "_Contents" +#~ msgstr "_Innehåll" + +#~ msgid "Show the documentation" +#~ msgstr "Visa dokumentation" + +#~ msgid "Show the Frequently Asked Questions" +#~ msgstr "Visa FAQ" + +#~ msgid "Open Midori's bug tracker" +#~ msgstr "Öppna Midoris bugghanterare" + +#~ msgid "Show information about the program" +#~ msgstr "Visa information om programmet" + +#~ msgid "Don't save any private data while browsing" +#~ msgstr "Spara inte webbläsardata när jag surfar" + +#~ msgid "Show menubar" +#~ msgstr "Visa menyrad" + +#~ msgid "Show navigationbar" +#~ msgstr "Visa navigeringsfält" + +#~ msgid "Show sidepanel" +#~ msgstr "Visa sidopanel" + +#~ msgid "Show bookmarkbar" +#~ msgstr "Visa bokmärkesrad" + +#~ msgid "_Transferbar" +#~ msgstr "Ö_verföringsrad" + +#~ msgid "Show transferbar" +#~ msgstr "Visa överföringsrad" + +#~ msgid "Show statusbar" +#~ msgstr "Visa statusrad" -#: ../midori/sokoke.c:862 -msgid "_Homepage" -msgstr "_Hemsida" +#~ msgid "_Recently visited pages" +#~ msgstr "_Nyligen besökta sidor" -#: ../midori/sokoke.c:863 -msgid "_Userscripts" -msgstr "_Användarskript" +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Öppna sidor du tidigare besökt" -#: ../midori/sokoke.c:864 -msgid "User_styles" -msgstr "" +#~ msgid "_Window" +#~ msgstr "_Fönster" -#: ../midori/sokoke.c:866 -msgid "_Transfers" -msgstr "_Överföringar" +#~ msgid "Detach chosen panel from the window" +#~ msgstr "Koppla från valda panel från fönstret" -#: ../midori/sokoke.c:867 -msgid "Netscape p_lugins" -msgstr "Netscape-_tillägg" +#~ msgid "Show panel _titles" +#~ msgstr "Visa panel_titlar" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 -msgid "Userscripts" -msgstr "Användarskript" +#~ msgid "Options" +#~ msgstr "Alternativ" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 -msgid "Userstyles" -msgstr "" +#~ msgid "All cookies" +#~ msgstr "Alla kakor" -#: ../panels/midori-bookmarks.c:108 -msgid "Bookmarks" -msgstr "Bokmärken" +#~ msgid "Session cookies" +#~ msgstr "Sessionskakor" -#: ../panels/midori-bookmarks.c:239 -msgid "Edit the selected bookmark" -msgstr "Redigera det valda bokmärket" +#~ msgid "Whether to save the last window size" +#~ msgstr "Ifall senaste fönsterstorlek ska sparas" -#: ../panels/midori-bookmarks.c:247 -msgid "Delete the selected bookmark" -msgstr "Ta bort det markerade bokmärket" +#~ msgid "Last window width" +#~ msgstr "Senaste fönsterbredd" -#: ../panels/midori-bookmarks.c:260 -msgid "Add a new folder" -msgstr "Lägg till en ny mapp" +#~ msgid "The last saved window width" +#~ msgstr "Senast sparade fönsterbredd" -#: ../panels/midori-bookmarks.c:592 -msgid "Separator" -msgstr "Avskiljare" +#~ msgid "Last window height" +#~ msgstr "Senaste fönsterhöjd" -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "Konsol" +#~ msgid "The last saved window height" +#~ msgstr "Senast sparade fönsterhöjd" -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "Tillägg" +#~ msgid "Last panel position" +#~ msgstr "Senaste panelpositionen" -#: ../panels/midori-history.c:162 -msgid "Are you sure you want to remove all history items?" -msgstr "Är du säker på att du vill radera hela historiken?" +#~ msgid "The last saved panel position" +#~ msgstr "Senast sparade panelposition" -#: ../panels/midori-history.c:217 -msgid "Bookmark the selected history item" -msgstr "Lägg till bokmärke för den valda historikposten" +#~ msgid "Last Web search" +#~ msgstr "Senaste websökning" -#: ../panels/midori-history.c:226 -msgid "Delete the selected history item" -msgstr "Ta bort den valda historikposten" +#~ msgid "The last saved Web search" +#~ msgstr "Senast sparade websökning" -#: ../panels/midori-history.c:234 -msgid "Clear the entire history" -msgstr "Rensa hela historiken" +#~ msgid "Show Menubar" +#~ msgstr "Visa menyrad" -#: ../panels/midori-history.c:601 -msgid "A week ago" -msgstr "En vecka sedan" +#~ msgid "Whether to show the menubar" +#~ msgstr "Ifall menyraden ska visas" -#: ../panels/midori-history.c:606 -#, c-format -msgid "%d day ago" -msgid_plural "%d days ago" -msgstr[0] "%d dag sedan" -msgstr[1] "%d dagar sedan" +#~ msgid "Show Navigationbar" +#~ msgstr "Visa Navigeringsfält" -#: ../panels/midori-history.c:614 -msgid "Today" -msgstr "Idag" +#~ msgid "Whether to show the navigationbar" +#~ msgstr "Ifall naveringsfältet ska visas" -#: ../panels/midori-history.c:616 -msgid "Yesterday" -msgstr "Igår" +#~ msgid "Show Bookmarkbar" +#~ msgstr "Visa Bokmärkesfält" -#: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:108 -msgid "Netscape plugins" -msgstr "Netscapetillägg" +#~ msgid "Whether to show the bookmarkbar" +#~ msgstr "Ifall bokmärkesraden ska visas" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s av %s" +#~ msgid "Whether to show the panel" +#~ msgstr "Ifall sidopanelen ska visas" -#: ../panels/midori-transfers.c:479 -msgid "Open Destination _Folder" -msgstr "Öppna mål_mapp" +#~ msgid "Show Transferbar" +#~ msgstr "Visa överföringsrad" -#: ../panels/midori-transfers.c:482 -msgid "Copy Link Loc_ation" -msgstr "Kopiera länk_plats" +#~ msgid "Whether to show the transferbar" +#~ msgstr "Ifall överföringsraden ska visas" -#: ../katze/katze-http-auth.c:97 -msgid "Authentication Required" -msgstr "Autentisering krävs" +#~ msgid "Show Statusbar" +#~ msgstr "Visa Statusrad" -#: ../katze/katze-http-auth.c:113 -msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "Användarnamn och lösenord behövs\n" -"för att öppna den här platsen:" +#~ msgid "Whether to show the statusbar" +#~ msgstr "Ifall statusraden ska visas" -#: ../katze/katze-http-auth.c:127 -msgid "Username" -msgstr "Användarnamn" +#~ msgid "Toolbar Items" +#~ msgstr "Föremål i verktygsfält" -#: ../katze/katze-http-auth.c:138 -msgid "Password" -msgstr "Lösenord" +#~ msgid "Compact Sidepanel" +#~ msgstr "Kompakt sidopanel" -#: ../katze/katze-throbber.c:828 -#, c-format -msgid "Named icon '%s' couldn't be loaded" -msgstr "" +#~ msgid "Whether to make the sidepanel compact" +#~ msgstr "Ifall sidopaneles ska göras kompakt" -#: ../katze/katze-throbber.c:841 -#, c-format -msgid "Stock icon '%s' couldn't be loaded" -msgstr "" +#~ msgid "Whether to align the sidepanel on the right" +#~ msgstr "Ifall sidopanelen ska justeras till höger" -#: ../katze/katze-throbber.c:907 -msgid "Animation frames are broken" -msgstr "Animeringsramar är trasiga" +#~ msgid "What to do when Midori starts" +#~ msgstr "Vad som ska göras när Midori startar" -#: ../katze/katze-utils.c:200 -#: ../katze/katze-utils.c:407 -#, c-format -msgid "Property '%s' is invalid for %s" -msgstr "" +#~ msgid "The homepage" +#~ msgstr "Startsidan" -#: ../katze/katze-utils.c:235 -#: ../katze/katze-utils.c:264 -msgid "Choose file" -msgstr "Välj fil" +#~ msgid "Show speed dial in new tabs" +#~ msgstr "Visa Webbgenvägar i nya flikar" -#: ../katze/katze-utils.c:250 -msgid "Choose folder" -msgstr "Välj mapp" +#~ msgid "Show speed dial in newly opened tabs" +#~ msgstr "Visa Webbgenvägar i nyligen öppnade flikar" -#: ../extensions/adblock.c:167 -msgid "Configure Advertisement filters" -msgstr "Redigera reklamblockeringsfilter" +#~ msgid "The folder downloaded files are saved to" +#~ msgstr "Mappen som filer ska hämtas till" -#: ../extensions/adblock.c:304 -msgid "Configure _Advertisement filters…" -msgstr "Redigera _reklamblockeringsfilter…" +#~ msgid "Ask for the destination folder" +#~ msgstr "Fråga vart filer ska sparas" -#: ../extensions/adblock.c:562 -msgid "Advertisement blocker" -msgstr "Reklamblockeringsfilter" +#~ msgid "Whether to ask for the destination folder when downloading a file" +#~ msgstr "Ifall Midori ska fråga vilken mapp filer ska hämtas till" -#: ../extensions/adblock.c:563 -msgid "Block advertisements according to a filter list" -msgstr "Blockera annonser enligt en filterlista" +#~ msgid "Whether to show a notification when a transfer has been completed" +#~ msgstr "Ifall en underrättelse ska visas när en överföring är klar" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "" +#~ msgid "An external text editor" +#~ msgstr "En extern textredigerare" -#: ../extensions/colorful-tabs.c:151 -msgid "Colorful Tabs" -msgstr "Färgglada flikar" +#~ msgid "An external news aggregator" +#~ msgstr "En extern RSS-läsare" -#: ../extensions/colorful-tabs.c:152 -msgid "Tint each tab distinctly" -msgstr "" +#~ msgid "Location entry Search" +#~ msgstr "Sökmotor för Addressfältet" -#: ../extensions/cookie-manager/cookie-manager-page.c:79 -#: ../extensions/cookie-manager/main.c:56 -msgid "Cookie Manager" -msgstr "Kakhanterare" +#~ msgid "The preferred character encoding" +#~ msgstr "Den föredragna teckenkodningen" -#: ../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 "Tar bort alla visade kakor. Om ett filter är konfigurerat kommer bara matchande kakor att tas bort." +#~ msgid "Always show the tabbar" +#~ msgstr "Visa alltid flikraden" -#: ../extensions/cookie-manager/cookie-manager-page.c:126 -msgid "Expand All" -msgstr "Expandera alla" +#~ msgid "Whether tabs have close buttons" +#~ msgstr "Om flikar har stängknappar" -#: ../extensions/cookie-manager/cookie-manager-page.c:133 -msgid "Collapse All" -msgstr "Fäll ihop alla" +#~ msgid "Where to open new pages" +#~ msgstr "Hur nya sidor ska öppnas" -#: ../extensions/cookie-manager/cookie-manager-page.c:460 -msgid "Do you really want to delete all cookies?" -msgstr "Vill du verkligen ta bort alla kakor?" +#~ msgid "Open external pages in:" +#~ msgstr "Öppna externa sidor i:" -#: ../extensions/cookie-manager/cookie-manager-page.c:462 -msgid "Question" -msgstr "Fråga" +#~ msgid "Where to open externally opened pages" +#~ msgstr "Hur externt öppnade sidor ska öppnas" -#: ../extensions/cookie-manager/cookie-manager-page.c:471 -msgid "Only cookies which match the filter will be deleted." -msgstr "Endast kakor som matchar filtret kommer att tas bort." +#~ msgid "Whether to open new tabs in the background" +#~ msgstr "Ifall nya flikar ska öppnas i bakgrunden" -#: ../extensions/cookie-manager/cookie-manager-page.c:539 -msgid "At the end of the session" -msgstr "Vid slutet av en session." +#~ msgid "Open popups in tabs" +#~ msgstr "Öppna popupfönster i flikar" -#: ../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 "" -"Värd/b>: %s\n" -"Namn: %s\n" -"Värde: %s\n" -"Sökväg: %s\n" -"Säker: %s\n" -"Förfaller: %s" +#~ msgid "Whether to zoom text and images" +#~ msgstr "Iffall text och bilder ska zoomas" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 -msgid "Yes" -msgstr "Ja" +#~ msgid "Find inline while typing" +#~ msgstr "Sök automatiskt på sidan" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 -msgid "No" -msgstr "Nej" +#~ msgid "Whether to automatically find inline while typing" +#~ msgstr "Om en sökning på sidan automatiskt ska ske när du skriver" -#: ../extensions/cookie-manager/cookie-manager-page.c:811 -msgid "Name" -msgstr "Namn" +#~ msgid "What type of cookies to accept" +#~ msgstr "Vilka typer av kakor som ska accepteras" -#: ../extensions/cookie-manager/cookie-manager-page.c:862 -msgid "_Expand All" -msgstr "_Expandera alla" +#~ msgid "Maximum cookie age" +#~ msgstr "Maximal kakålder" -#: ../extensions/cookie-manager/cookie-manager-page.c:870 -msgid "_Collapse All" -msgstr "_Fäll ihop alla" +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Ifall de senast besökta sidorna ska sparas" -#: ../extensions/cookie-manager/cookie-manager-page.c:923 -msgid "Filter:" -msgstr "Filter:" +#~ msgid "Maximum history age" +#~ msgstr "Maximal historikålder" -#: ../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 "" +#~ msgid "Remember last downloaded files" +#~ msgstr "Kom ihåg senast hämtade filer" -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "_Kakhanterare" +#~ msgid "The proxy server used for HTTP connections" +#~ msgstr "Proxyserver för HTTP-anslutningar" -#: ../extensions/cookie-manager/main.c:57 -msgid "List, view and delete cookies" -msgstr "Visa och ta bort kakor" +#~ msgid "Detect proxy server automatically" +#~ msgstr "Upptäck proxiserver automatiskt" -#: ../extensions/feed-panel/feed-atom.c:242 -msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Ifall en global proxyserver ska upptäckas automatiskt" -#: ../extensions/feed-panel/feed-atom.c:348 -msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" +#~ msgid "What to identify as to web pages" +#~ msgstr "Vad Midori ska identifiera sig som" -#. 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 "Senast uppdaterad: %s." +#~ msgid "Identification string" +#~ msgstr "Identifikationssträng" -#: ../extensions/feed-panel/feed-panel.c:664 -msgid "Feeds" -msgstr "Flöden" +#~ msgid "Cache size" +#~ msgstr "Cache-storlek" -#: ../extensions/feed-panel/feed-panel.c:717 -msgid "Add new feed" -msgstr "Lägg till nytt flöde" +#~ msgid "The allowed size of the cache" +#~ msgstr "Tillåtna storleken på cache" -#: ../extensions/feed-panel/feed-panel.c:724 -msgid "Delete feed" -msgstr "Ta bort flöde" +#~ msgid "Clear private data" +#~ msgstr "Rensa privat data" -#: ../extensions/feed-panel/feed-panel.c:807 -msgid "_Feeds" -msgstr "_Flöden" +#~ msgid "The private data selected for deletion" +#~ msgstr "Privat data vald för borttagning" -#: ../extensions/feed-panel/feed-parse.c:185 -#, c-format -msgid "Failed to find root element in feed XML data." -msgstr "" +#~ msgid "Not found - %s" +#~ msgstr "Hittades inte - %s" -#: ../extensions/feed-panel/feed-parse.c:225 -#, c-format -msgid "Unsupported feed format." -msgstr "Formatet för flödet stöds inte." +#~ msgid "Open _Link" +#~ msgstr "Öppna _länk" -#: ../extensions/feed-panel/feed-parse.c:255 -#, c-format -msgid "Failed to parse XML feed: %s" -msgstr "" +#~ msgid "_Download Link destination" +#~ msgstr "_Hämta länkplats" -#: ../extensions/feed-panel/feed-rss.c:46 -msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" +#~ msgid "_Save Link destination" +#~ msgstr "_Spara länkplats" -#: ../extensions/feed-panel/feed-rss.c:51 -msgid "Unsupported RSS version found." -msgstr "" +#~ msgid "Download with Download _Manager" +#~ msgstr "Hämta med hämtnings_hanterare" -#: ../extensions/feed-panel/feed-rss.c:148 -msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" +#~ msgid "Document cannot be displayed" +#~ msgstr "Dokumentet kan inte visas" -#: ../extensions/feed-panel/feed-rss.c:248 -msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" +#~ msgid "_Restore Tab" +#~ msgstr "_Återställ flik" -#: ../extensions/feed-panel/main.c:114 -#, c-format -msgid "Feed '%s' already exists" -msgstr "Flödet '%s' finns redan" +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimera flik" -#: ../extensions/feed-panel/main.c:191 -#, c-format -msgid "Error loading feed '%s'" -msgstr "Fel vid laddning av flödet '%s'" +#~ msgid "General" +#~ msgstr "Allmänt" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Nytt flöde" +#~ msgid "Appearance" +#~ msgstr "Utseende" -#: ../extensions/feed-panel/main.c:489 -msgid "Feed Panel" -msgstr "Flödespanel" +#~ msgid "Font settings" +#~ msgstr "Typsnittsinställningar" -#: ../extensions/feed-panel/main.c:490 -msgid "Read Atom/ RSS feeds" -msgstr "Läs Atom/RSS-flöden" +#~ msgid "Encoding" +#~ msgstr "Kodning" -#: ../extensions/mouse-gestures/main.c:236 -msgid "Mouse Gestures" -msgstr "Musgester" +#~ msgid "The character encoding to use by default" +#~ msgstr "Teckenkodning som ska användas som standard" -#: ../extensions/mouse-gestures/main.c:237 -msgid "Control Midori by moving the mouse" -msgstr "Kontrollera Midori genom att flytta musen" +#~ msgid "Load and display images automatically" +#~ msgstr "Ladda och visa bilder automatiskt" -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "Sidhållare" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "_Sidhållare" +#~ msgid "Shrink images automatically" +#~ msgstr "Förminska bilder automatiskt" -#: ../extensions/shortcuts.c:172 -msgid "Customize Keyboard shortcuts" -msgstr "Ställ in tangentbordsgenvägar" +#~ msgid "Enforce 96 dots per inch" +#~ msgstr "Tvinga 96 punkter per tum" -#: ../extensions/shortcuts.c:264 -msgid "Customize Sh_ortcuts…" -msgstr "Ställ in gen_vägar…" +#~ msgid "Enable developer tools" +#~ msgstr "Aktivera utvecklingsverktyg" -#: ../extensions/shortcuts.c:303 -msgid "Shortcuts" -msgstr "Genvägar" +#~ msgid "Enable special extensions for developers" +#~ msgstr "Aktivera speciella tillägg för utvecklare" -#: ../extensions/shortcuts.c:304 -msgid "View and edit keyboard shortcuts" -msgstr "Visa och redigera tangentbordsgenvägar" +#~ msgid "Spell Checking" +#~ msgstr "Stavningskontroll" -#: ../extensions/statusbar-features.c:84 -msgid "Images" -msgstr "Bilder" +#~ msgid "Interface" +#~ msgstr "Gränssnitt" -#: ../extensions/statusbar-features.c:96 -msgid "Scripts" -msgstr "Skript" +#~ msgid "Navigationbar" +#~ msgstr "Navigeringsfält" -#: ../extensions/statusbar-features.c:149 -msgid "Statusbar Features" -msgstr "Statusradsfunktioner" +#~ msgid "External applications" +#~ msgstr "Externa program" -#: ../extensions/statusbar-features.c:150 -msgid "Easily toggle features on web pages on and off" -msgstr "" +#~ msgid "Web Cookies" +#~ msgstr "Webbkakor" -#: ../extensions/tab-panel.c:383 -#: ../extensions/tab-panel.c:443 -msgid "Tab Panel" -msgstr "Flikrad" +#~ msgid "days" +#~ msgstr "dagar" -#: ../extensions/tab-panel.c:427 -msgid "T_ab Panel" -msgstr "Visa f_likraden" +#~ msgid "_Icon:" +#~ msgstr "_Ikon:" -#: ../extensions/tab-panel.c:444 -msgid "Show tabs in a vertical panel" -msgstr "Visa flikar i en vertikal panel" +#~ msgid "_Bookmark" +#~ msgstr "_Bokmärke" -#: ../extensions/toolbar-editor.c:391 -msgid "Customize Toolbar" -msgstr "Redigera verktygsrad" +#~ msgid "_Console" +#~ msgstr "_Konsol" -#: ../extensions/toolbar-editor.c:407 -msgid "Select items to be displayed on the toolbar. Items can be reordered by drag and drop." -msgstr "Välj föremål att visa i verktygsraden. Föremål kan omarrangeras genom att dra och släppa." +#~ msgid "Console" +#~ msgstr "Konsol" -#: ../extensions/toolbar-editor.c:423 -msgid "Available Items" -msgstr "Tillgängliga föremål" +#~ msgid "Configure _Advertisement filters…" +#~ msgstr "Redigera _reklamblockeringsfilter…" -#: ../extensions/toolbar-editor.c:444 -msgid "Displayed Items" -msgstr "Visade föremål" +#~ msgid "Filter:" +#~ msgstr "Filter:" -#: ../extensions/toolbar-editor.c:579 -msgid "Customize _Toolbar…" -msgstr "Redigera _verktygsrad…" +#~ msgid "_Cookie Manager" +#~ msgstr "_Kakhanterare" -#: ../extensions/toolbar-editor.c:611 -msgid "Toolbar Editor" -msgstr "Verktygsradseditor" +#~ msgid "Pageholder" +#~ msgstr "Sidhållare" -#: ../extensions/toolbar-editor.c:612 -msgid "Easily edit the toolbar layout" -msgstr "Redigera verktygsradens layout enkelt" +#~ msgid "_Pageholder" +#~ msgstr "_Sidhållare" -msgid "_Closed Tabs and Windows" -msgstr "_Stängda tabbar och fönster" +#~ msgid "_Closed Tabs and Windows" +#~ msgstr "_Stängda tabbar och fönster" #~ msgid "[URIs]" #~ msgstr "[URL]" + #~ msgid "_URL:" #~ msgstr "_URL:" + #~ msgid "Root" #~ msgstr "Rot" + #~ msgid "_Quick Find" #~ msgstr "_Snabbsök" + #~ msgid "Both" #~ msgstr "Både och" + #~ msgid "Both horizontal" #~ msgstr "Båda horisontellt" + #~ msgid "Load on Startup" #~ msgstr "Ladda vid uppstart" + #~ msgid "Open URL in New _Tab" #~ msgstr "Öppna URL i ny _flik" + #~ msgid "Source" #~ msgstr "Källkod" + #~ msgid "_Icon (name or file):" #~ msgstr "_Ikon (namn eller fil):" + #~ msgid "Manage search engines" #~ msgstr "Hantera sökmotorer" + #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Varning: Du använder ett administratörskonto!" #~ msgid "_Disable" #~ msgstr "_Inaktivera" + #~ msgid "_Fullscreen" #~ msgstr "_Fullskärm" + #~ msgid "_Leave Fullscreen" #~ msgstr "_Lämna fullskärm" + #~ msgid "Settings" #~ msgstr "Inställningar" -#~ msgid "The associated settings" -#~ msgstr "De associerade inställningarna" + #~ msgid "Trash" #~ msgstr "Papperskorgen" + #~ msgid "The trash, collecting recently closed tabs and windows" #~ msgstr "Papperkorgen, samlar senast stängda tabbar och fönster" + #~ msgid "Browser" #~ msgstr "Webbläsare" -#~ msgid "The text that is displayed in the statusbar" -#~ msgstr "Texten som visas i statusraden" + #~ msgid "Pa_ge Setup" #~ msgstr "_Sidinställningar" + #~ msgid "Undo the last modification" #~ msgstr "Ångra senaste ändringen" -#~ msgid "_Manage Bookmarks" -#~ msgstr "_Hantera bokmärken" + #~ msgid "Add, edit and remove bookmarks…" #~ msgstr "Lägg till, ändra och ta bort bokmärken…" + #~ msgid "Tab _Overview" #~ msgstr "Flikö_versikt" + #~ msgid "_Work Offline" #~ msgstr "_Arbeta offline" + #~ msgid "Appearance of the shadow around each panel" #~ msgstr "Utseende på skuggan runt varje panel" + #~ msgid "Menu to hold panel items" #~ msgstr "Meny för att visa panelföremål" + #~ msgid "The index of the current page" #~ msgstr "Indexet för nuvarande sida" + #~ msgid "Show New Tab" #~ msgstr "Visa Ny flik" + #~ msgid "Show Web search" #~ msgstr "Visa Webbsökning" + #~ msgid "Tab Label Size" #~ msgstr "Flikstorlek" + #~ msgid "The desired tab label size" #~ msgstr "Önskad storlek på fliketikett" + #~ msgid "The URI of the currently loaded page" #~ msgstr "URIn för den laddade sidan" + #~ msgid "The title of the currently loaded page" #~ msgstr "Titeln för den laddade sidan" + #~ msgid "Symbolic size to use for the animation" #~ msgstr "Symbolisk storlek för animeringen" + #~ msgid "The name of an icon containing animation frames" #~ msgstr "Namn på en ikon som innehåller animeringsbilder" + #~ msgid "A GdkPixbuf containing animation frames" #~ msgstr "En GdkPixbuf som innehåller animeringbilder" + #~ msgid "The name of an icon to be used as the static image" #~ msgstr "Namn på ikon att använda som statisk bild" + #~ msgid "A GdkPixbuf to be used as the static image" #~ msgstr "En GdkPixbuf att använda som statisk bild" + #~ msgid "The stock ID of an icon to be used as the static image" #~ msgstr "Katalog-ID för en ikon att använda som statisk bild" diff -Nru midori-0.4.9/po/uk.po midori-0.5.0/po/uk.po --- midori-0.4.9/po/uk.po 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/po/uk.po 2013-04-04 20:31:20.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-28 18:33+0000\n" +"POT-Creation-Date: 2013-03-30 15:27+0000\n" "PO-Revision-Date: 2012-11-11 19:55+0200\n" "Last-Translator: Pavlo Bilyak \n" "Language-Team: Ukrainian \n" @@ -27,9 +27,9 @@ msgid "Internet;WWW;Explorer" msgstr "Internet;WWW;Explorer" -#: ../data/midori.desktop.in.h:3 ../midori/main.c:162 -#: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3777 +#: ../data/midori.desktop.in.h:3 ../midori/main.c:153 +#: ../midori/midori-app.c:1459 ../midori/midori-websettings.c:228 +#: ../midori/midori-view.c:3893 msgid "Midori" msgstr "Мідорі" @@ -41,11 +41,11 @@ msgid "New Private Browsing Window" msgstr "Нове вікно в режимі приватності" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1293 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1404 msgid "New Tab" msgstr "Нова вкладка" -#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1290 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1401 msgid "New Window" msgstr "Нове вікно" @@ -61,7 +61,7 @@ msgid "Open a new private browsing window" msgstr "Відкрити нове вікно перегляду в режимі приватності" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4213 msgid "Private Browsing" msgstr "Режим приватності" @@ -147,202 +147,213 @@ msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:155 -#, c-format +#: ../midori/main.c:147 msgid "Error: \"gdb\" can't be found\n" msgstr "Помилка: \"gdb\" неможливо знайти\n" -#: ../midori/main.c:181 +#: ../midori/main.c:173 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:" -#: ../midori/main.c:183 +#: ../midori/main.c:175 msgid "Check for new versions at:" msgstr "Перевірити на наявність нової версії на:" -#: ../midori/main.c:338 +#: ../midori/main.c:369 msgid "An unknown error occured" msgstr "Сталася невідома помилка" -#: ../midori/midori-app.c:1129 ../midori/midori-browser.c:542 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Несподівана дія '%s'." - -#: ../midori/midori-app.c:1351 ../midori/midori-browser.c:6095 +#: ../midori/midori-app.c:1360 ../midori/midori-browser.c:6156 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-app.c:1352 +#: ../midori/midori-app.c:1361 msgid "Add Boo_kmark" msgstr "_Додати закладку" -#: ../midori/midori-app.c:1353 +#: ../midori/midori-app.c:1362 msgid "_Extensions" msgstr "_Розширення" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1354 ../midori/midori-privatedata.c:153 +#: ../midori/midori-app.c:1363 ../midori/midori-privatedata.c:177 msgid "_History" msgstr "_Історія" -#: ../midori/midori-app.c:1355 +#: ../midori/midori-app.c:1364 msgid "_Userscripts" msgstr "_Скрипти користувача" -#: ../midori/midori-app.c:1356 +#: ../midori/midori-app.c:1365 msgid "User_styles" msgstr "Стилі користувача" -#: ../midori/midori-app.c:1357 +#: ../midori/midori-app.c:1366 msgid "New _Tab" msgstr "Нова _вкладка" -#: ../midori/midori-app.c:1358 +#: ../midori/midori-app.c:1367 msgid "_Transfers" msgstr "_Завантаження" -#: ../midori/midori-app.c:1359 +#: ../midori/midori-app.c:1368 msgid "Netscape p_lugins" msgstr "Роз_ширення Netscape" -#: ../midori/midori-app.c:1360 +#: ../midori/midori-app.c:1369 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-app.c:1361 ../midori/midori-browser.c:5234 +#: ../midori/midori-app.c:1370 ../midori/midori-browser.c:5295 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-app.c:1362 +#: ../midori/midori-app.c:1371 msgid "New _Folder" msgstr "Нова _тека" -#: ../midori/midori-app.c:1417 ../midori/midori-app.c:1420 -#: ../midori/midori-app.c:1423 +#: ../midori/midori-app.c:1426 ../midori/midori-app.c:1429 +#: ../midori/midori-app.c:1432 msgid "[Addresses]" msgstr "[Адреси]" -#: ../midori/midori-array.c:522 +#: ../midori/midori-array.c:551 msgid "File not found." msgstr "Файл не знайдений." -#: ../midori/midori-array.c:547 ../midori/midori-array.c:586 -#: ../midori/midori-array.c:609 ../midori/midori-array.c:619 +#: ../midori/midori-array.c:576 ../midori/midori-array.c:615 +#: ../midori/midori-array.c:639 ../midori/midori-array.c:649 msgid "Malformed document." msgstr "Неправильний документ." -#: ../midori/midori-array.c:628 +#: ../midori/midori-array.c:658 msgid "Unrecognized bookmark format." msgstr "Нерозпізнаний формат закладки." -#: ../midori/midori-browser.c:337 ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5431 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5378 -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5442 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:449 ../midori/midori-browser.c:5319 -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:448 ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5389 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:457 ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:456 ../midori/midori-browser.c:5386 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:527 +#: ../midori/midori-browser.c:526 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:622 +#: ../midori/midori-browser.c:565 ../midori/midori-browser.c:621 +#: ../midori/midori-browser.c:624 ../midori/midori-websettings.c:1430 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Значення '%s' є неправильним для %s" + +#: ../midori/midori-browser.c:573 ../midori/midori-browser.c:644 +#: ../midori/midori-browser.c:6974 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Несподівані властивості '%s'" + +#: ../midori/midori-browser.c:581 ../midori/midori-browser.c:654 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Несподівана дія '%s'." + +#: ../midori/midori-browser.c:731 #, c-format msgid "%s (Private Browsing)" msgstr "%s (Режим приватності)" -#: ../midori/midori-browser.c:732 ../midori/midori-browser.c:774 +#: ../midori/midori-browser.c:841 ../midori/midori-browser.c:883 #: ../panels/midori-bookmarks.c:114 msgid "Bookmarks" msgstr "Закладки" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:937 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:828 +#: ../midori/midori-browser.c:937 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:939 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:939 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:973 msgid "Type a name for this bookmark and choose where to keep it." msgstr "Напишіть назву для цієї закладки і виберіть де її зберегти." -#: ../midori/midori-browser.c:920 +#: ../midori/midori-browser.c:1029 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:1037 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:1045 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:1050 ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:1161 ../midori/midori-browser.c:4538 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1060 +#: ../midori/midori-browser.c:1171 msgid "Save associated _resources" msgstr "Показати пов’язані _ресурси" -#: ../midori/midori-browser.c:1290 +#: ../midori/midori-browser.c:1401 msgid "A new window has been opened" msgstr "Відкрито нове вікно" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1404 msgid "A new tab has been opened" msgstr "Відкрито нову вкладку" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1422 msgid "Error opening the image!" msgstr "Помилка відкривання малюнка!" -#: ../midori/midori-browser.c:1312 +#: ../midori/midori-browser.c:1423 msgid "Can not open selected image in a default viewer." msgstr "Неможливо відкрити вибраний малюнок в типовому переглядачі." -#: ../midori/midori-browser.c:1318 +#: ../midori/midori-browser.c:1429 msgid "Error downloading the image!" msgstr "Помилка звантаження малюнка!" -#: ../midori/midori-browser.c:1319 +#: ../midori/midori-browser.c:1430 msgid "Can not download selected image." msgstr "Неможливо звантажити вибраний малюнок." -#: ../midori/midori-browser.c:1378 +#: ../midori/midori-browser.c:1489 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:2351 +#: ../midori/midori-browser.c:2461 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2477 +#: ../midori/midori-browser.c:2589 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -357,24 +368,31 @@ "Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то " "вони будуть додані автоматично." -#: ../midori/midori-browser.c:2483 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2595 ../extensions/feed-panel/main.c:356 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2518 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:2627 ../midori/midori-browser.c:5455 #: ../panels/midori-bookmarks.c:527 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3050 ../midori/midori-searchaction.c:450 +#. FIXME: Blacklist/ custom contract doesn't work +#. gchar* blacklisted_contracts[] = { "print", NULL }; +#. FIXME: granite: should return GtkWidget* like GTK+ +#: ../midori/midori-browser.c:2676 ../midori/midori-browser.c:5331 +msgid "Share this page" +msgstr "Поділитись цією сторінкою" + +#: ../midori/midori-browser.c:3152 ../midori/midori-searchaction.c:450 msgid "Empty" msgstr "Пусто" -#: ../midori/midori-browser.c:3447 ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3534 ../midori/midori-browser.c:3535 msgid "Toggle text cursor navigation" msgstr "Переключити текстовий курсор навігації" -#: ../midori/midori-browser.c:3450 +#: ../midori/midori-browser.c:3537 msgid "" "Pressing F7 toggles Caret Browsing. When active, a text cursor appears in " "all websites." @@ -382,109 +400,109 @@ "Натискання F7 включає курсорний перегляд. Після включення на всіх веб-" "сторінках появляється текстовий курсор." -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3540 msgid "_Enable Caret Browsing" msgstr "_Включення курсорного перегляду" -#: ../midori/midori-browser.c:3879 ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:3956 ../midori/midori-browser.c:5903 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4207 ../panels/midori-bookmarks.c:835 +#: ../midori/midori-browser.c:4270 ../panels/midori-bookmarks.c:835 #: ../panels/midori-history.c:793 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4214 ../panels/midori-bookmarks.c:841 +#: ../midori/midori-browser.c:4277 ../panels/midori-bookmarks.c:841 #: ../panels/midori-history.c:799 ../extensions/feed-panel/feed-panel.c:513 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 -#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4280 ../midori/midori-view.c:2800 +#: ../midori/midori-view.c:4691 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4306 +#: ../midori/midori-browser.c:4369 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4307 +#: ../midori/midori-browser.c:4370 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4371 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4372 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4373 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4374 #, c-format msgid "Firefox (%s)" msgstr "Firefox (%s)" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4375 msgid "Midori 0.2.6" msgstr "Мідорі 0.2.6" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4393 msgid "Import bookmarks…" msgstr "Імпорт закладок…" -#: ../midori/midori-browser.c:4333 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:4396 ../midori/midori-browser.c:5460 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4344 +#: ../midori/midori-browser.c:4407 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4472 msgid "Import from XBEL or HTML file" msgstr "Імпорт з XBEL або HTML файлу" -#: ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:4500 msgid "Import from a file" msgstr "Імпорт з файлу" -#: ../midori/midori-browser.c:4449 +#: ../midori/midori-browser.c:4512 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4543 msgid "XBEL Bookmarks" msgstr "XBEL Закладки" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4548 msgid "Netscape Bookmarks" msgstr "Закладки Netscape" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4562 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)" msgstr "Мідорі може експортувати тільки до XBEL (*.xbel) і Netscape (*.html)" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4577 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:4793 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4794 msgid "See about:version for version info." msgstr "Дивіться about:version для отримання інформації про версію." -#: ../midori/midori-browser.c:4735 +#: ../midori/midori-browser.c:4796 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -497,388 +515,380 @@ "Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою " "версією." -#: ../midori/midori-browser.c:4770 +#: ../midori/midori-browser.c:4831 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5293 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5296 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5299 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5301 msgid "New P_rivate Browsing Window" msgstr "Нове _вікно в режимі приватності" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5305 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:5246 +#: ../midori/midori-browser.c:5307 msgid "_Save Page As…" msgstr "_Зберегти сторінку як…" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5308 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:5249 +#: ../midori/midori-browser.c:5310 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" #. N_("Add Shortcut to the _desktop"), "", -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5314 msgid "Create _Launcher" msgstr "Створити _Запускач" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5317 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5323 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5324 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:5265 +#: ../midori/midori-browser.c:5326 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5330 msgid "_Share" msgstr "_Поділитися" -#: ../midori/midori-browser.c:5270 -msgid "Share this page" -msgstr "Поділитись цією сторінкою" - -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5335 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5338 msgid "Close a_ll Windows" msgstr "З_акрити всі вікна" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5341 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5364 msgid "_Find…" msgstr "_Знайти…" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5365 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5367 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5309 +#: ../midori/midori-browser.c:5370 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5374 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:5376 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5316 +#: ../midori/midori-browser.c:5377 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5382 msgid "Reload page without caching" msgstr "Перезавантажити сторінку без кешування" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5392 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:5395 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5399 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5401 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5404 msgid "Ca_ret Browsing" msgstr "_Перегляд вставками" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5408 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5410 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5413 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5416 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5419 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5422 msgid "_Readable" msgstr "_Можна читати" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5425 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5428 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5435 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5444 msgid "_Homepage" msgstr "Д_омашня сторінка" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5445 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5447 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5450 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5457 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5463 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5405 ../midori/midori-searchaction.c:459 +#: ../midori/midori-browser.c:5466 ../midori/midori-searchaction.c:459 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5469 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5472 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5476 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5479 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5481 msgid "Move Tab to _first position" msgstr "Пересунути вкладку на _першу позицію" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5483 msgid "Move Tab _Backward" msgstr "_Перенести вкладку назад" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5485 msgid "_Move Tab Forward" msgstr "_Перенести вкладку вперед" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5487 msgid "Move Tab to _last position" msgstr "Пересунути вкладку на _останню позицію" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5490 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5493 msgid "Focus _Next view" msgstr "Фокусувати перегляд _наступного" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5496 msgid "Only show the Icon of the _Current Tab" msgstr "Показувати тільки іконку _поточної вкладки" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5499 msgid "_Duplicate Current Tab" msgstr "_Дублювати поточну вкладку" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5502 msgid "Close Ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5505 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5508 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5510 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5513 msgid "_Report a Problem…" msgstr "П_овідомити про проблему…" -#: ../midori/midori-browser.c:5457 ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5518 ../midori/midori-browser.c:6175 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5525 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5529 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5533 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5534 msgid "Sidepanel" msgstr "Бічна панель" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5537 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5541 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5489 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:5550 ../midori/midori-websettings.c:227 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5492 ../midori/midori-websettings.c:124 +#: ../midori/midori-browser.c:5553 ../midori/midori-websettings.c:151 msgid "Chinese Traditional (BIG5)" msgstr "Китайська Традиційна (BIG5)" -#: ../midori/midori-browser.c:5495 ../midori/midori-websettings.c:125 +#: ../midori/midori-browser.c:5556 ../midori/midori-websettings.c:152 msgid "Chinese Simplified (GB18030)" msgstr "Китайська Спрощена (GB18030)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5560 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5502 ../midori/midori-websettings.c:127 +#: ../midori/midori-browser.c:5563 ../midori/midori-websettings.c:154 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5505 ../midori/midori-websettings.c:128 +#: ../midori/midori-browser.c:5566 ../midori/midori-websettings.c:155 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5508 ../midori/midori-websettings.c:129 +#: ../midori/midori-browser.c:5569 ../midori/midori-websettings.c:156 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5511 ../midori/midori-websettings.c:130 +#: ../midori/midori-browser.c:5572 ../midori/midori-websettings.c:157 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5575 ../midori/midori-websettings.c:158 +#: ../midori/midori-websettings.c:234 ../katze/katze-utils.c:634 msgid "Custom…" msgstr "Інша…" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:6081 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:6027 +#: ../midori/midori-browser.c:6088 msgid "_Location…" msgstr "_Адреса…" -#: ../midori/midori-browser.c:6029 +#: ../midori/midori-browser.c:6090 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:6051 +#: ../midori/midori-browser.c:6112 msgid "_Web Search…" msgstr "_Пошук у Веб…" -#: ../midori/midori-browser.c:6053 +#: ../midori/midori-browser.c:6114 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:6080 +#: ../midori/midori-browser.c:6141 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:6097 +#: ../midori/midori-browser.c:6158 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:6130 +#: ../midori/midori-browser.c:6191 msgid "_Tabs" msgstr "_Вкладки" -#: ../midori/midori-browser.c:6132 +#: ../midori/midori-browser.c:6193 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6207 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6148 +#: ../midori/midori-browser.c:6209 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6930 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Несподівані властивості '%s'" - #: ../midori/midori-extension.c:341 #, c-format msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" msgstr "Неможливо завантажити конфігурацію розширення '%s': %s\n" -#: ../midori/midori-extension.c:879 ../extensions/addons.c:1676 +#: ../midori/midori-extension.c:899 ../extensions/addons.c:1676 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Неможливо зберегти конфігурацію розширення '%s': %s\n" @@ -930,24 +940,24 @@ msgid "Self-signed" msgstr "Самопідписаний" -#: ../midori/midori-locationaction.c:1470 +#: ../midori/midori-locationaction.c:1459 msgid "Security details" msgstr "Відомості про захист" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1557 +#: ../midori/midori-locationaction.c:1542 msgid "Paste and p_roceed" msgstr "Вставити і про_довжити" -#: ../midori/midori-locationaction.c:1789 +#: ../midori/midori-locationaction.c:1774 msgid "Not verified" msgstr "Не перевірено" -#: ../midori/midori-locationaction.c:1797 +#: ../midori/midori-locationaction.c:1782 msgid "Verified and encrypted connection" msgstr "Перевірене і захищене з'єднання" -#: ../midori/midori-locationaction.c:1804 +#: ../midori/midori-locationaction.c:1789 msgid "Open, unencrypted connection" msgstr "Відкрите, незахищене з'єднання" @@ -964,391 +974,386 @@ msgid "Align sidepanel to the left" msgstr "Рівняти бічну панель по лівому краю" -#: ../midori/midori-websettings.c:106 +#: ../midori/midori-websettings.c:114 ../midori/midori-websettings.c:135 msgid "Show Speed Dial" msgstr "Показати швидкий виклик" -#: ../midori/midori-websettings.c:107 +#: ../midori/midori-websettings.c:115 ../midori/midori-websettings.c:133 msgid "Show Homepage" msgstr "Показати домашню сторінку" -#: ../midori/midori-websettings.c:108 ../midori/midori-frontend.c:342 +#: ../midori/midori-websettings.c:116 ../midori/midori-frontend.c:367 msgid "Show last open tabs" msgstr "Показати останні відкриті вкладки" -#: ../midori/midori-websettings.c:109 ../midori/midori-frontend.c:341 +#: ../midori/midori-websettings.c:117 ../midori/midori-frontend.c:366 msgid "Show last tabs without loading" msgstr "Показати останні вкладки без завантаження" -#: ../midori/midori-websettings.c:126 +#: ../midori/midori-websettings.c:132 +msgid "Show Blank Page" +msgstr "Показати порожню сторінку" + +#: ../midori/midori-websettings.c:134 +msgid "Show default Search Engine" +msgstr "Показати типову пошукову машину" + +#: ../midori/midori-websettings.c:136 +msgid "Show custom page" +msgstr "Показати користувацьку сторінку" + +#: ../midori/midori-websettings.c:153 msgid "Japanese (SHIFT_JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:207 -#: ../katze/katze-utils.c:603 -msgid "Custom..." -msgstr "Інше…" - -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:173 msgid "New tab" msgstr "Нова вкладка" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:174 msgid "New window" msgstr "Нове вікно" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:175 msgid "Current tab" msgstr "Поточна вкладка" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:190 msgid "Default" msgstr "Типово" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:191 msgid "Icons" msgstr "Значки" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:192 msgid "Small icons" msgstr "Маленькі значки" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:193 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:194 msgid "Icons and text" msgstr "Значки і текст" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:195 msgid "Text beside icons" msgstr "Текст за значками" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:210 msgid "Automatic (GNOME or environment)" msgstr "Автоматично (GNOME або змінні оточення)" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:211 msgid "HTTP proxy server" msgstr "Сервер HTTP проксі" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:212 msgid "No proxy server" msgstr "Немає сервера проксі" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:229 msgid "Chrome" msgstr "Chrome" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:230 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:231 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:232 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:233 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:280 -msgid "Toolbar Style:" -msgstr "Стиль панелі:" - -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:308 msgid "The style of the toolbar" msgstr "Стиль панелі" -#: ../midori/midori-websettings.c:290 -msgid "When Midori starts:" -msgstr "Коли Мідорі стартує:" - -#: ../midori/midori-websettings.c:327 -msgid "Open new pages in:" -msgstr "Відкривати нові сторінки в:" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:390 -msgid "Identify as" -msgstr "Ідентифікувати як" - -#: ../midori/midori-websettings.c:391 -msgid "What to identify as to web pages" -msgstr "Що ідентифікувати для веб-сторінок" - -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:510 msgid "Always use my font choices" msgstr "Завжди використовувати мій вибір шрифтів" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:511 msgid "Override fonts picked by websites with user preferences" msgstr "Перезаписати шрифти для веб-сторінок шрифтами вибраними користувачем" -#: ../midori/midori-websettings.c:1310 ../midori/midori-websettings.c:1316 +#: ../midori/midori-websettings.c:1375 ../midori/midori-websettings.c:1381 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Неможливо завантажити конфігурацію: %s\n" -#: ../midori/midori-websettings.c:1365 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "Значення '%s' є неправильним для %s" - -#: ../midori/midori-websettings.c:1370 ../midori/midori-websettings.c:1481 +#: ../midori/midori-websettings.c:1435 ../midori/midori-websettings.c:1546 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неправильне значення конфігурації '%s'" -#: ../midori/midori-tab.vala:118 +#: ../midori/midori-tab.vala:121 #, c-format msgid "Failed to inject stylesheet: %s" msgstr "Невдача при ініціалізації стилів: %s" -#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 +#: ../midori/midori-view.c:769 ../midori/midori-view.c:897 msgid "Trust this website" msgstr "Довіряти цій веб-сторінці" -#: ../midori/midori-view.c:870 +#: ../midori/midori-view.c:895 msgid "Security unknown" msgstr "Захист невідомий" -#: ../midori/midori-view.c:1173 +#: ../midori/midori-view.c:1196 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s бажає зберегти базу даних HTML5." -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Deny" msgstr "_Заборонити" -#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1232 msgid "_Allow" msgstr "_Дозволити" -#: ../midori/midori-view.c:1205 +#: ../midori/midori-view.c:1228 #, c-format msgid "%s wants to know your location." msgstr "%s бажає знати Ваше знаходження." -#: ../midori/midori-view.c:1336 +#: ../midori/midori-view.c:1362 #, c-format msgid "Error - %s" msgstr "Помилка - %s" -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1363 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Сторінку '%s' неможливо завантажити." -#: ../midori/midori-view.c:1339 +#: ../midori/midori-view.c:1365 ../midori/midori-view.c:1508 msgid "Try again" msgstr "Спробуйте знову" -#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 +#: ../midori/midori-view.c:1505 +#, c-format +msgid "Oops - %s" +msgstr "Ой - %s" + +#: ../midori/midori-view.c:1506 +#, c-format +msgid "Something went wrong with '%s'." +msgstr "Щось пішло не так з '%s'." + +#: ../midori/midori-view.c:1649 ../midori/midori-view.c:2741 #, c-format msgid "Send a message to %s" msgstr "Послати повідомлення до %s" -#: ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2526 msgid "Add _search engine..." msgstr "Додати _пошукову машину" -#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 +#: ../midori/midori-view.c:2569 ../midori/midori-view.c:2876 msgid "Inspect _Element" msgstr "Перевірити _елемент" -#: ../midori/midori-view.c:2510 +#: ../midori/midori-view.c:2621 msgid "Open Link in New _Tab" msgstr "Відкрити посилання у новій в_кладці" -#: ../midori/midori-view.c:2514 +#: ../midori/midori-view.c:2625 msgid "Open Link in _Foreground Tab" msgstr "Відкривати посилання у в_кладці переднього плану" -#: ../midori/midori-view.c:2515 +#: ../midori/midori-view.c:2626 msgid "Open Link in _Background Tab" msgstr "Відкрити посилання у фоновій в_кладці" -#: ../midori/midori-view.c:2518 +#: ../midori/midori-view.c:2629 msgid "Open Link in New _Window" msgstr "Відкрити посилання у новому _вікні" -#: ../midori/midori-view.c:2521 +#: ../midori/midori-view.c:2632 msgid "Open Link as Web A_pplication" msgstr "Відкрити посилання як веб-_додаток" -#: ../midori/midori-view.c:2526 +#: ../midori/midori-view.c:2637 msgid "Copy Link de_stination" msgstr "Копіювати поси_лання" -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2643 msgid "Save _As…" msgstr "_Зберегти як…" -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2653 +msgid "Open _Image in New Window" +msgstr "Відкрити малюнок у новому _вікні" + +#: ../midori/midori-view.c:2654 msgid "Open _Image in New Tab" msgstr "Відкрити зображення у новій _вкладці" -#: ../midori/midori-view.c:2544 +#: ../midori/midori-view.c:2658 msgid "Copy Im_age" msgstr "Копіювати _картинку" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2661 msgid "Save I_mage" msgstr "Зберегти з_ображення" -#: ../midori/midori-view.c:2550 +#: ../midori/midori-view.c:2664 msgid "Open in Image _Viewer" msgstr "Відкрити малюнок в _Переглядачі зображень" -#: ../midori/midori-view.c:2557 +#: ../midori/midori-view.c:2671 msgid "Copy Video _Address" msgstr "Скопіювати адресу _відео" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Save _Video" msgstr "Зберегти _відео" -#: ../midori/midori-view.c:2560 +#: ../midori/midori-view.c:2674 msgid "Download _Video" msgstr "Завантажити _відео" -#: ../midori/midori-view.c:2586 +#: ../midori/midori-view.c:2700 msgid "Search _with" msgstr "Шукати _з" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2729 msgid "_Search the Web" msgstr "_Шукати Веб" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2749 msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2682 +#: ../midori/midori-view.c:2796 msgid "Open _Frame in New Tab" msgstr "Відкрити _фрейм у новій _вкладці" -#: ../midori/midori-view.c:2899 +#: ../midori/midori-view.c:3013 #, c-format msgid "Open or download file from %s" msgstr "Відкрити або завантажити файл з %s" -#: ../midori/midori-view.c:2912 +#: ../midori/midori-view.c:3026 #, c-format msgid "File Name: %s" msgstr "Ім'я файлу: %s" -#: ../midori/midori-view.c:2917 +#: ../midori/midori-view.c:3031 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:2919 +#: ../midori/midori-view.c:3033 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файлу: %s ('%s')" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3070 #, c-format msgid "Size: %s" msgstr "Розмір: %s" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2967 +#: ../midori/midori-view.c:3081 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3610 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:4006 +#: ../midori/midori-view.c:4138 #, c-format msgid "No documentation installed" msgstr "Документація не встановлена" -#: ../midori/midori-view.c:4082 +#: ../midori/midori-view.c:4214 msgid "Midori doesn't store any personal data:" msgstr "Мідорі не зберігає жодні персональні дані:" -#: ../midori/midori-view.c:4083 +#: ../midori/midori-view.c:4215 msgid "No history or web cookies are being saved." msgstr "Історія і тістечка зберігаються." -#: ../midori/midori-view.c:4084 +#: ../midori/midori-view.c:4216 msgid "Extensions are disabled." msgstr "Додатки виключено." -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4217 msgid "HTML5 storage, local database and application caches are disabled." msgstr "Сховище HTML5, локальна база даних і кеш програм виключено." -#: ../midori/midori-view.c:4086 +#: ../midori/midori-view.c:4218 msgid "Midori prevents websites from tracking the user:" msgstr "Мідорі забороняє веб-сторінкам відслідковувати користувача:" -#: ../midori/midori-view.c:4087 +#: ../midori/midori-view.c:4219 msgid "Referrer URLs are stripped down to the hostname." msgstr "URL реферера обмежується до назви вузла." -#: ../midori/midori-view.c:4088 +#: ../midori/midori-view.c:4220 msgid "DNS prefetching is disabled." msgstr "Попереднє отримання DNS виключено." -#: ../midori/midori-view.c:4089 +#: ../midori/midori-view.c:4221 msgid "The language and timezone are not revealed to websites." msgstr "Мова і часовий пояс не показуються веб-сторінкам." -#: ../midori/midori-view.c:4090 +#: ../midori/midori-view.c:4222 msgid "Flash and other Netscape plugins cannot be listed by websites." msgstr "Flash та інші додатки Netscape не можуть бути показані веб-сторінкам." -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4262 msgid "Version numbers in brackets show the version used at runtime." msgstr "" "Номери версії в дужках показують версію, що використовується в робочому " "процесі." -#: ../midori/midori-view.c:4178 +#: ../midori/midori-view.c:4312 msgid "Page loading delayed" msgstr "Завантаження сторінки затримане" -#: ../midori/midori-view.c:4179 +#: ../midori/midori-view.c:4313 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" "Завантаження затримане або в зв'язку з останнім крахом або з налаштуваннями " "завантаження." -#: ../midori/midori-view.c:4180 +#: ../midori/midori-view.c:4314 msgid "Load Page" msgstr "Завантажити сторінку" -#: ../midori/midori-view.c:4346 +#: ../midori/midori-view.c:4481 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4695 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Label" msgstr "Показати мітку _вкладки" -#: ../midori/midori-view.c:4565 +#: ../midori/midori-view.c:4700 msgid "Show Tab _Icon Only" msgstr "Показати тільки _іконки вкладки" -#: ../midori/midori-view.c:4572 +#: ../midori/midori-view.c:4707 msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" msgstr[0] "Закрити _іншу вкладку" @@ -1356,24 +1361,24 @@ msgstr[2] "Закрити _інші вкладки" #. i18n: word stem of "previous page" type links, case is not important -#: ../midori/midori-view.c:5261 +#: ../midori/midori-view.c:5396 msgid "previous" msgstr "попереднє" #. i18n: word stem of "next page" type links, case is not important -#: ../midori/midori-view.c:5280 +#: ../midori/midori-view.c:5415 msgid "next" msgstr "наступне" -#: ../midori/midori-view.c:5293 +#: ../midori/midori-view.c:5428 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:5294 +#: ../midori/midori-view.c:5429 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:5319 +#: ../midori/midori-view.c:5454 msgid "Features" msgstr "Опції" @@ -1479,114 +1484,105 @@ msgid "Startup" msgstr "Початкові" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:301 +msgid "When Midori starts:" +msgstr "Коли Мідорі стартує:" + +#: ../midori/midori-preferences.c:306 msgid "Homepage:" msgstr "Домашня сторінка:" -#: ../midori/midori-preferences.c:313 +#: ../midori/midori-preferences.c:314 msgid "Use _current page" msgstr "Використати _поточну сторінку" -#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:318 msgid "Use current page as homepage" msgstr "Використати поточну сторінку як домашню" #. Page "Appearance" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:327 msgid "Fonts" msgstr "Шрифти" -#: ../midori/midori-preferences.c:328 +#: ../midori/midori-preferences.c:329 msgid "Proportional Font Family" msgstr "Пропорційне сімейство шрифтів" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:333 msgid "The default font family used to display text" msgstr "Шрифт по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:336 msgid "The default font size used to display text" msgstr "Розмір шрифту по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:338 msgid "Fixed-width Font Family" msgstr "Шрифти фіксованої ширини" -#: ../midori/midori-preferences.c:341 +#: ../midori/midori-preferences.c:342 msgid "The font family used to display fixed-width text" msgstr "Шрифт для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:344 +#: ../midori/midori-preferences.c:345 msgid "The font size used to display fixed-width text" msgstr "Розмір шрифту для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:347 msgid "Minimum Font Size" msgstr "Мінімальний розмір шрифту" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:351 msgid "The minimum font size used to display text" msgstr "Мінімальний розмір шрифту для відображення тексту" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Preferred Encoding" msgstr "Типове кодування" #. Page "Behavior" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Behavior" msgstr "Поведінка" -#: ../midori/midori-preferences.c:364 ../extensions/statusbar-features.c:155 +#: ../midori/midori-preferences.c:365 ../extensions/statusbar-features.c:155 msgid "Load images automatically" msgstr "Автоматично завантажити зображення" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:368 msgid "Enable Spell Checking" msgstr "Ввімкнути перевірку правопису" -#: ../midori/midori-preferences.c:381 ../extensions/statusbar-features.c:165 +#: ../midori/midori-preferences.c:382 ../extensions/statusbar-features.c:165 msgid "Enable scripts" msgstr "Ввімкнути скрипти" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:386 msgid "Enable WebGL support" msgstr "Ввімкнути підтримку WebGL" -#: ../midori/midori-preferences.c:388 ../extensions/statusbar-features.c:177 +#: ../midori/midori-preferences.c:403 ../extensions/statusbar-features.c:177 msgid "Enable Netscape plugins" msgstr "Ввімкнути розширення Netscape" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:408 msgid "Zoom Text and Images" msgstr "Збільшувати/зменшувати текст і зображення" -#: ../midori/midori-preferences.c:396 +#: ../midori/midori-preferences.c:411 msgid "Allow scripts to open popups" msgstr "Дозволити скриптам відкривати спливаючі вікна" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:412 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Чи дозволяти скриптам автоматично відкривати спливаючі вікна" -#: ../midori/midori-preferences.c:400 -msgid "Middle click opens Selection" -msgstr "Середня кнопка відкриває виділене" - -#: ../midori/midori-preferences.c:401 -msgid "Load an address from the selection via middle click" -msgstr "" -"Завантажувати посилання URL з виділеного через клацання середньої кнопки" - -#: ../midori/midori-preferences.c:405 -msgid "Flash window on background tabs" -msgstr "Відкрити вікно у фонових вкладках" - -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:416 msgid "Preferred languages" msgstr "Типові мови" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:420 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1594,96 +1590,117 @@ "Розділений комами список бажаних мов для відображання веб-сторінок, " "наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:422 msgid "Save downloaded files to:" msgstr "Зберігати завантажені файли до:" #. Page "Interface" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:429 msgid "Browsing" msgstr "Перегляд сторінок" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:433 +msgid "Toolbar Style:" +msgstr "Стиль панелі:" + +#: ../midori/midori-preferences.c:438 +msgid "Open new pages in:" +msgstr "Відкривати нові сторінки в:" + +#: ../midori/midori-preferences.c:442 +msgid "New tab behavior:" +msgstr "Поведінка нової вкладки:" + +#: ../midori/midori-preferences.c:447 msgid "Close Buttons on Tabs" msgstr "Кнопки закриття на вкладках" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:451 msgid "Always Show Tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:455 msgid "Open Tabs next to Current" msgstr "Відкривати вкладки у наступних після поточної" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:456 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:459 msgid "Open tabs in the background" msgstr "Відкривати вкладки в фоні" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:463 msgid "Text Editor" msgstr "Текстовий редактор" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:468 msgid "News Aggregator" msgstr "Читалка новин" #. Page "Network" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:475 msgid "Network" msgstr "Мережа" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:477 msgid "Proxy server" msgstr "Сервер проксі" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:482 msgid "Hostname" msgstr "Назва сервера" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:490 msgid "Port" msgstr "Порт" +#: ../midori/midori-preferences.c:503 +msgid "Supported proxy types:" +msgstr "Типи проксі, що підтримуються:" + #. TODO: Preserve page icons of search engines and merge privacy items -#: ../midori/midori-preferences.c:492 ../extensions/web-cache.c:461 -#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:308 +#: ../midori/midori-preferences.c:523 ../extensions/web-cache.c:461 +#: ../extensions/web-cache.c:470 ../midori/midori-privatedata.c:328 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-preferences.c:493 ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:527 msgid "The maximum size of cached pages on disk" msgstr "Максимальний розмір кешованих сторінок на диску" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:529 msgid "MB" msgstr "МБ" -#: ../midori/midori-preferences.c:518 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-preferences.c:536 +msgid "Identify as" +msgstr "Ідентифікувати як" + +#: ../midori/midori-preferences.c:551 msgid "Privacy" msgstr "Приватність" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:553 msgid "Delete old Cookies after:" msgstr "Вилучити старі тістечка через:" -#: ../midori/midori-preferences.c:522 ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:555 ../midori/midori-preferences.c:558 msgid "The maximum number of days to save cookies for" msgstr "Максимальне число днів зберігання тістечок для" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:562 msgid "Only accept Cookies from sites you visit" msgstr "Приймати тістечка тільки з сторінок які ви відвідуєте" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:563 msgid "Block cookies sent by third-party websites" msgstr "Блокувати тістечка що посилаються сторонніми сторінками" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:568 msgid "" "Cookies store login data, saved games, or user profiles for advertisement " "purposes." @@ -1691,74 +1708,74 @@ "Тістечка зберігають дані входу, зберігають ігри або профілі користувачів для " "рекламних цілей." -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:575 msgid "Enable offline web application cache" msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:578 msgid "Enable HTML5 local storage support" msgstr "Ввімкнути підтримку локального сховища HTML5" #. i18n: Reworded: Shorten details propagated when going to another page -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:582 msgid "Strip referrer details sent to websites" msgstr "Пропустити деталі referer'а, що вислані до зовнішніх сторінок" #. i18n: Referer here is not a typo but a technical term -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:584 msgid "Whether the \"Referer\" header should be shortened to the hostname" msgstr "Чи заголовок \"Referer'а\" повинен бути скорочений до назви сервера" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:587 msgid "Delete pages from history after:" msgstr "Видалити сторінку з історії через:" -#: ../midori/midori-preferences.c:556 ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:589 ../midori/midori-preferences.c:592 msgid "The maximum number of days to save the history for" msgstr "Максимальне число днів зберігання історії для" -#: ../midori/midori-preferences.c:596 ../panels/midori-extensions.c:90 +#: ../midori/midori-preferences.c:629 ../panels/midori-extensions.c:90 msgid "Extensions" msgstr "Розширення" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Add search engine" msgstr "Додати пошукову машину" -#: ../midori/midori-searchaction.c:1047 +#: ../midori/midori-searchaction.c:1049 msgid "Edit search engine" msgstr "Редагувати пошукову машину" -#: ../midori/midori-searchaction.c:1075 +#: ../midori/midori-searchaction.c:1077 msgid "_Name:" msgstr "_Назва:" -#: ../midori/midori-searchaction.c:1090 +#: ../midori/midori-searchaction.c:1092 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-searchaction.c:1103 ../extensions/feed-panel/main.c:368 +#: ../midori/midori-searchaction.c:1105 ../extensions/feed-panel/main.c:368 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-searchaction.c:1122 +#: ../midori/midori-searchaction.c:1124 msgid "_Token:" msgstr "_Ознака:" -#: ../midori/midori-searchaction.c:1412 +#: ../midori/midori-searchaction.c:1414 msgid "Manage Search Engines" msgstr "Налаштувати пошукові машини" -#: ../midori/midori-searchaction.c:1512 +#: ../midori/midori-searchaction.c:1514 msgid "Use as _default" msgstr "Використовувати по _замовчуванню" -#: ../midori/midori-searchaction.c:1623 +#: ../midori/midori-searchaction.c:1625 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Неможливо завантажити пошукову машину. %s\n" -#: ../midori/midori-searchaction.c:1678 +#: ../midori/midori-searchaction.c:1680 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Неможливо зберегти пошукові машини. %s" @@ -1803,9 +1820,14 @@ msgstr "Виберіть програму або команду для відкриття \"%s\":" #: ../midori/sokoke.c:368 ../midori/sokoke.c:388 +#: ../midori/midori-frontend.c:309 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." +#: ../midori/sokoke.c:576 +msgid "Invalid URI" +msgstr "Неправильна адреса" + #. i18n: A panel at the bottom, to search text in pages #: ../toolbars/midori-findbar.c:233 msgid "_Inline Find:" @@ -1827,28 +1849,28 @@ msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../toolbars/midori-transferbar.c:110 +#: ../toolbars/midori-transferbar.c:109 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл '%s' завантажено." -#: ../toolbars/midori-transferbar.c:115 +#: ../toolbars/midori-transferbar.c:114 msgid "Transfer completed" msgstr "Передачу завершено" -#: ../toolbars/midori-transferbar.c:245 ../panels/midori-transfers.c:139 +#: ../toolbars/midori-transferbar.c:244 ../panels/midori-transfers.c:139 msgid "Clear All" msgstr "Очистити все" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:277 ../toolbars/midori-transferbar.c:279 msgid "Some files are being downloaded" msgstr "Деякі файли завантажено" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:283 msgid "_Quit Midori" msgstr "_Вийти з Мідорі" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:285 msgid "The transfers will be cancelled if Midori quits." msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі." @@ -1979,47 +2001,47 @@ msgid "Animation frames are broken" msgstr "Кадри анімації пошкоджені" -#: ../katze/katze-utils.c:422 ../katze/katze-utils.c:811 +#: ../katze/katze-utils.c:442 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Властивості '%s' неправильні для %s" -#: ../katze/katze-utils.c:459 ../katze/katze-utils.c:488 +#: ../katze/katze-utils.c:479 ../katze/katze-utils.c:508 #: ../extensions/addons.c:309 msgid "Choose file" msgstr "Вибрати файл" -#: ../katze/katze-utils.c:474 +#: ../katze/katze-utils.c:494 msgid "Choose folder" msgstr "Вибрати теку" -#: ../katze/katze-utils.c:572 +#: ../katze/katze-utils.c:603 msgid "None" msgstr "Нічого" -#: ../katze/katze-utils.c:687 +#: ../katze/katze-utils.c:719 msgid "1 hour" msgstr "1 година" -#: ../katze/katze-utils.c:688 +#: ../katze/katze-utils.c:720 msgid "1 day" msgstr "1 день" -#: ../katze/katze-utils.c:689 +#: ../katze/katze-utils.c:721 msgid "1 week" msgstr "1 тиждень" -#: ../katze/katze-utils.c:690 +#: ../katze/katze-utils.c:722 msgid "1 month" msgstr "1 місяць" -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:723 msgid "1 year" msgstr "1 рік" #: ../katze/katze-preferences.c:72 ../extensions/delayed-load.vala:24 #: ../extensions/external-download-manager.vala:224 -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "Preferences for %s" msgstr "Налаштування для %s" @@ -2036,7 +2058,7 @@ msgid "Configure Advertisement filters" msgstr "Конфігурувати фільтр реклам" -#: ../extensions/adblock.c:514 +#: ../extensions/adblock.c:512 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2046,27 +2068,27 @@ "натисніть кнопку \"Додати\", щоб додати його до списку. Ви можете знайти " "більше списків на %s." -#: ../extensions/adblock.c:928 +#: ../extensions/adblock.c:926 msgid "Edit rule" msgstr "Додати правило" -#: ../extensions/adblock.c:942 +#: ../extensions/adblock.c:940 msgid "_Rule:" msgstr "_Правило:" -#: ../extensions/adblock.c:996 +#: ../extensions/adblock.c:994 msgid "Bl_ock image" msgstr "Блокувати зображення" -#: ../extensions/adblock.c:1001 +#: ../extensions/adblock.c:999 msgid "Bl_ock link" msgstr "Блокувати посилання" -#: ../extensions/adblock.c:1927 +#: ../extensions/adblock.c:1925 msgid "Advertisement blocker" msgstr "Блокіратор реклами" -#: ../extensions/adblock.c:1928 +#: ../extensions/adblock.c:1926 msgid "Block advertisements according to a filter list" msgstr "Блокувати рекламу використовуючи список фільтрів" @@ -2156,11 +2178,11 @@ msgid "Support for userscripts and userstyles" msgstr "Підтримка користувацьких скриптів і стилів" -#: ../extensions/colorful-tabs.c:203 +#: ../extensions/colorful-tabs.c:168 msgid "Colorful Tabs" msgstr "Кольорові вкладки" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:169 msgid "Tint each tab distinctly" msgstr "Забарвити кожну вкладку окремо" @@ -2241,7 +2263,7 @@ "Тістечка: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1028 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:503 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:570 msgid "Name" msgstr "Назва" @@ -2475,70 +2497,74 @@ msgid "Failed to select suggestions\n" msgstr "Невдача при виборі пропозиції\n" -#: ../extensions/history-list.vala:197 +#: ../extensions/history-list.vala:205 msgid "There are no unvisited tabs" msgstr "Немає непроглянутих вкладок" -#: ../extensions/history-list.vala:235 +#: ../extensions/history-list.vala:243 #, c-format msgid "History-List" msgstr "Історія-Список" -#: ../extensions/history-list.vala:275 +#: ../extensions/history-list.vala:283 msgid "Tab closing behavior" msgstr "Поведінка замикання вкладки" -#: ../extensions/history-list.vala:283 +#: ../extensions/history-list.vala:291 msgid "Do nothing" msgstr "Не робити нічого" -#: ../extensions/history-list.vala:289 +#: ../extensions/history-list.vala:297 msgid "Switch to last viewed tab" msgstr "Перейти до останньої переглянутої вкладки" -#: ../extensions/history-list.vala:295 +#: ../extensions/history-list.vala:303 msgid "Switch to newest tab" msgstr "Перейти до найновішої вкладки" -#: ../extensions/history-list.vala:423 +#: ../extensions/history-list.vala:317 +msgid "Flash window on background tabs" +msgstr "Відкрити вікно у фонових вкладках" + +#: ../extensions/history-list.vala:449 msgid "Next new Tab (History List)" msgstr "Наступна нова вкладка (список історії)" -#: ../extensions/history-list.vala:424 +#: ../extensions/history-list.vala:450 msgid "Next new tab from history" msgstr "Наступна нова вкладка з історії" -#: ../extensions/history-list.vala:433 +#: ../extensions/history-list.vala:459 msgid "Previous new Tab (History List)" msgstr "Попередня нова вкладка (список історії)" -#: ../extensions/history-list.vala:434 +#: ../extensions/history-list.vala:460 msgid "Previous new tab from history" msgstr "Попередня нова вкладка з історії" -#: ../extensions/history-list.vala:443 +#: ../extensions/history-list.vala:469 msgid "Display tab in background (History List)" msgstr "Показувати вкладку в тлі (Список історії)" -#: ../extensions/history-list.vala:444 +#: ../extensions/history-list.vala:470 msgid "Display the current selected tab in background" msgstr "Показати поточну вибрану вкладку в тлі" -#: ../extensions/history-list.vala:571 +#: ../extensions/history-list.vala:597 msgid "History List" msgstr "Історія вкладок" -#: ../extensions/history-list.vala:572 +#: ../extensions/history-list.vala:598 msgid "Move to the last used tab when switching or closing tabs" msgstr "" "Перейти до останньої використаної вкладки при переключанні або закривання " "вкладок" -#: ../extensions/mouse-gestures.c:297 +#: ../extensions/mouse-gestures.c:513 msgid "Mouse Gestures" msgstr "Жести миші" -#: ../extensions/mouse-gestures.c:298 +#: ../extensions/mouse-gestures.c:514 msgid "Control Midori by moving the mouse" msgstr "Керувати Мідорі за допомогою жестів миші" @@ -2551,7 +2577,7 @@ msgstr "Редагувати скорочення клавіатури" #: ../extensions/shortcuts.c:275 -msgid "Customize Sh_ortcuts..." +msgid "Customize Sh_ortcuts…" msgstr "Змінити скоро_чення…" #: ../extensions/shortcuts.c:312 @@ -2590,15 +2616,15 @@ msgid "Easily toggle features on web pages on and off" msgstr "Просте включання і виключання перемикання функцій на веб-сторінках" -#: ../extensions/tab-panel.c:584 ../extensions/tab-panel.c:673 +#: ../extensions/tab-panel.c:591 ../extensions/tab-panel.c:680 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:656 +#: ../extensions/tab-panel.c:663 msgid "T_ab Panel" msgstr "Панель в_кладок" -#: ../extensions/tab-panel.c:674 +#: ../extensions/tab-panel.c:681 msgid "Show tabs in a vertical panel" msgstr "Показати вкладки у вертикальній панелі" @@ -2610,11 +2636,11 @@ msgid "New tabs have no label by default" msgstr "Нові вкладки по замовчуванню не будуть мати міток" -#: ../extensions/toolbar-editor.c:395 +#: ../extensions/toolbar-editor.c:393 msgid "Customize Toolbar" msgstr "Змінити панель інструментів" -#: ../extensions/toolbar-editor.c:411 +#: ../extensions/toolbar-editor.c:409 msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." @@ -2622,23 +2648,23 @@ "Вибрати елементи, які будуть показані на панелі інструментів. Елементи можна " "перевпорядкувати, пересуваючи їх мишою (drag'n'drop)." -#: ../extensions/toolbar-editor.c:427 +#: ../extensions/toolbar-editor.c:425 msgid "Available Items" msgstr "Доступні елементи" -#: ../extensions/toolbar-editor.c:448 +#: ../extensions/toolbar-editor.c:446 msgid "Displayed Items" msgstr "Елементи для показу" -#: ../extensions/toolbar-editor.c:588 +#: ../extensions/toolbar-editor.c:586 msgid "_Customize Toolbar…" msgstr "Змінити панель _інструментів…" -#: ../extensions/toolbar-editor.c:617 +#: ../extensions/toolbar-editor.c:615 msgid "Toolbar Editor" msgstr "Редактор панелі інструментів" -#: ../extensions/toolbar-editor.c:618 +#: ../extensions/toolbar-editor.c:616 msgid "Easily edit the toolbar layout" msgstr "Легко редагувати формат панелі інструментів" @@ -2651,37 +2677,38 @@ msgid "Failed to load cookies\n" msgstr "Не вдалося завантажити коржики\n" +#. FIXME: granite: should return GtkWidget* like GTK+ #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-privatedata.c:120 +#: ../midori/midori-privatedata.c:129 ../midori/midori-privatedata.c:140 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-privatedata.c:124 +#: ../midori/midori-privatedata.c:134 ../midori/midori-privatedata.c:144 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-privatedata.c:137 +#: ../midori/midori-privatedata.c:161 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-privatedata.c:147 +#: ../midori/midori-privatedata.c:171 msgid "Last open _tabs" msgstr "Останні відкриті _вкладки" -#: ../midori/midori-privatedata.c:173 +#: ../midori/midori-privatedata.c:197 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" #. i18n: Logins and passwords in websites and web forms -#: ../midori/midori-privatedata.c:302 +#: ../midori/midori-privatedata.c:322 msgid "Saved logins and _passwords" msgstr "Збережені логіни і _паролі" -#: ../midori/midori-privatedata.c:304 +#: ../midori/midori-privatedata.c:324 msgid "Cookies and Website data" msgstr "Дані коржиків і веб-сторінки" -#: ../midori/midori-privatedata.c:311 +#: ../midori/midori-privatedata.c:331 msgid "Website icons" msgstr "Значки веб-сторінок" @@ -2689,7 +2716,7 @@ msgid "Open tabs" msgstr "Відкрити вкладки" -#: ../midori/midori-viewcompletion.vala:67 +#: ../midori/midori-viewcompletion.vala:75 msgid "More open tabs…" msgstr "Більше відкритих вкладок..." @@ -2735,34 +2762,34 @@ msgid "The bookmarks couldn't be saved. %s" msgstr "Неможливо зберегти закладки. %s" -#: ../midori/midori-session.c:188 +#: ../midori/midori-session.c:192 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити." -#: ../midori/midori-session.c:357 +#: ../midori/midori-session.c:361 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Неможливо зберегти конфігурацію. %s" -#: ../midori/midori-session.c:378 ../midori/midori-frontend.c:452 +#: ../midori/midori-session.c:383 ../midori/midori-frontend.c:505 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/midori-session.c:408 +#: ../midori/midori-session.c:412 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесія не може бути збережена. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/midori-frontend.c:127 +#: ../midori/midori-frontend.c:129 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Неможливо зберегти смітник. %s" -#: ../midori/midori-frontend.c:312 +#: ../midori/midori-frontend.c:337 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -2770,101 +2797,109 @@ "Схоже, що Мідорі зазнало краху останнього разу. Якщо це трапилося не вперше, " "то можливо якась з наступних опцій зможе посприяти вирішенню цієї проблеми." -#: ../midori/midori-frontend.c:322 +#: ../midori/midori-frontend.c:347 msgid "Modify _preferences" msgstr "Змінити _налаштування" -#: ../midori/midori-frontend.c:326 +#: ../midori/midori-frontend.c:351 msgid "Disable all _extensions" msgstr "Заборонити всі розширення" -#: ../midori/midori-frontend.c:335 +#: ../midori/midori-frontend.c:360 msgid "Show a dialog after Midori crashed" msgstr "Показати діалог, коли Мідорі зазнає краху" -#: ../midori/midori-frontend.c:340 +#: ../midori/midori-frontend.c:365 msgid "Discard old tabs" msgstr "Видалити старі вкладки" -#: ../midori/midori-frontend.c:404 +#: ../midori/midori-frontend.c:373 +msgid "Show last crash _log" +msgstr "Показати журнал останнього _краху" + +#: ../midori/midori-frontend.c:386 +msgid "Run in _debugger" +msgstr "Запустити в _відладнику програм" + +#: ../midori/midori-frontend.c:457 msgid "An instance of Midori is already running but not responding.\n" msgstr "" "Один із екземплярів програми Midori вже працює, але не відповідає на " "запити.\n" -#: ../midori/midori-frontend.c:437 +#: ../midori/midori-frontend.c:490 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/midori-frontend.c:468 +#: ../midori/midori-frontend.c:521 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/midori-frontend.c:476 +#: ../midori/midori-frontend.c:529 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/midori-frontend.c:487 +#: ../midori/midori-frontend.c:540 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/midori-frontend.c:492 +#: ../midori/midori-frontend.c:545 msgid "_Ignore" msgstr "_Ігнорувати" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:127 #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:273 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:235 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:279 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:584 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:247 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:292 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:662 #, c-format msgid "SQL fails: %s" msgstr "SQL видало помилку: %s" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:246 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:672 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:984 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:707 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1116 msgid "Accept" msgstr "Прийняти" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:250 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:674 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:985 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:709 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1117 msgid "Accept for session" msgstr "Приймати для сесії" #: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:254 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:676 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:986 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:711 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1118 msgid "Block" msgstr "Блок" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:302 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:145 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:151 #, c-format msgid "Could not open database of extenstion: %s" msgstr "Не вдалось відкрити базу даних: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:405 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:408 -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:459 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:187 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:403 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:406 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:457 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:196 #, c-format msgid "Failed to execute database statement: %s" msgstr "Не вдалось виконати запит бази даних: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:432 msgid "Do you really want to delete all cookie permissions?" msgstr "Ви впевнені, що бажаєте видалити всі дозволи тістечок?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:436 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:434 msgid "Delete all cookie permissions?" msgstr "Вилучити дозволи тістечок?" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:440 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:438 msgid "" "This action will delete all cookie permissions. You will be asked for " "permissions again for each web site visited." @@ -2872,20 +2907,20 @@ "Ця дія вилучить всі дозволи тістечок. Вас будуть запитувати про дозволи " "знову для кожної сторінки, яку Ви відвідаєте. " -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:608 msgid "Cookie permission manager" msgstr "Менеджер дозволів тістечок" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:588 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:609 msgid "Instance of current cookie permission manager" msgstr "Екземпляр поточного менеджера дозволів тістечок" #. Set up dialog -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:628 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:650 msgid "Configure cookie permission" msgstr "Налаштувати дозволи тістечок" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:643 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:665 #, c-format msgid "" "Below is a list of all web sites and the policy set for them. You can delete " @@ -2898,25 +2933,25 @@ "можете додавати поведінку для домену нижче, вибираючи поведінку і клацаючи " "на Додати." -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705 -#: ../extensions/cookie-permissions/cookie-permission-manager.c:489 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:556 msgid "Domain" msgstr "Домен" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:712 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:748 msgid "Policy" msgstr "Поведінка" -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:740 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:777 msgid "Delete _all" msgstr "Видалити _все" #. Add "ask-for-unknown-policy" checkbox -#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:749 +#: ../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:786 msgid "A_sk for policy if unknown for a domain" msgstr "_Запитати про поведінку, якщо її не визначено для домену" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:83 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:91 msgid "" "A fatal error occurred which prevents the cookie permission manager " "extension to continue. You should disable it." @@ -2924,124 +2959,123 @@ "Сталася жахлива помилка ;-), через яку розширення менеджера дозволів " "тістечок не може продовжувати роботу. Вам потрібно відключити його." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:87 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:95 msgid "Error in cookie permission manager extension" msgstr "Помилка розширення менеджера дозволів тістечок" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:92 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:100 msgid "Reason" msgstr "Причина" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:125 -msgid "Could not get path to configuration of extension: path is NULL" -msgstr "Неможливо отримати шлях для налаштування розширення: шлях є NULL" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:127 -msgid "Could not get path to configuration of extension." -msgstr "Неможливо отримати шлях для налаштування розширення." - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:133 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:140 #, c-format msgid "Could not create configuration folder for extension: %s" msgstr "Неможливо створити теку налаштування для розширення: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:135 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:142 msgid "Could not create configuration folder for extension." msgstr "Неможливо створити теку налаштування для розширення." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:150 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:159 msgid "Could not open database of extension." msgstr "Не вдалось відкрити базу даних." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:183 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:192 msgid "Could not set up database structure of extension." msgstr "не вдалося налаштувати структуру бази даних для розширення." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:300 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:313 #, c-format msgid "Could not determine global cookie policy to set for domain: %s" msgstr "" "Неможливо визначити налаштування глобальної поведінки тістечок для домену: %s" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:430 -msgid "Confirm storing cookie" -msgstr "Підтвердження збереження тістечка" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:488 +msgid "Till session end" +msgstr "Аж до кінця сеансу" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:461 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:512 #, c-format msgid "The website %s wants to store %d cookies." msgstr "Вебсторінка %s бажає зберегти %d тістечка." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:463 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:514 #, c-format msgid "The website %s wants to store a cookie." msgstr "Вебсторінка %s бажає зберегти тістечко." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:467 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:518 #, c-format msgid "Multiple websites want to store %d cookies in total." msgstr "Багато вебсторінок бажають зберегти %d тістечка повністю." -#. Create expander for details -#: ../extensions/cookie-permissions/cookie-permission-manager.c:479 -msgid "_Details" -msgstr "_Деталі" +#: ../extensions/cookie-permissions/cookie-permission-manager.c:527 +msgid "_Accept" +msgstr "_Прийняти" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:528 +msgid "Accept for this _session" +msgstr "Прийняти для цієї _сесіЇ" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:529 +msgid "De_ny" +msgstr "_Заборонити" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:496 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:530 +msgid "Deny _this time" +msgstr "Відмовити _цим разом" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:563 msgid "Path" msgstr "Шлях" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:510 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:577 msgid "Value" msgstr "Значення" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:521 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:588 msgid "Expire date" msgstr "Закінчення терміну дії" -#. Create buttons for dialog -#: ../extensions/cookie-permissions/cookie-permission-manager.c:545 -msgid "_Accept" -msgstr "_Прийняти" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:548 -msgid "Accept for this _session" -msgstr "Прийняти для цієї _сесіЇ" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:550 -msgid "De_ny" -msgstr "_Заборонити" - -#: ../extensions/cookie-permissions/cookie-permission-manager.c:881 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1011 msgid "Extension instance" msgstr "Екземпляр розширення" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:882 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1012 msgid "The Midori extension instance for this extension" msgstr "Екземпляр розширення Мідорі для цього розширення" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:888 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1018 msgid "Application instance" msgstr "Екземпляр програми" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:889 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1019 msgid "The Midori application instance this extension belongs to" msgstr "Екземпляр програми Мідорі, до якої належить це розширення" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:895 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1025 msgid "Database instance" msgstr "Екземпляр бази даних" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:896 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1026 msgid "Pointer to sqlite database instance used by this extension" msgstr "" "Звертання до екземпляру бази даних sqlite, яке використовує це розширення" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:901 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1031 +msgid "Database path" +msgstr "Шлях до бази даних" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1032 +msgid "Path to sqlite database instance used by this extension" +msgstr "" +"Звертання до екземпляру бази даних sqlite, яке використовує це розширення" + +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1038 msgid "Ask for unknown policy" msgstr "Запитати про невідому поведінку" -#: ../extensions/cookie-permissions/cookie-permission-manager.c:902 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1039 msgid "" "If true this extension ask for policy for every unknown domain.If false this " "extension uses the global cookie policy set in Midori settings." @@ -3050,7 +3084,7 @@ "домену. Якщо ні, тоді це розширення використає глобальні налаштування " "поведінки тістечок в налаштуваннях Мідорі." -#: ../extensions/cookie-permissions/cookie-permission-manager.c:983 +#: ../extensions/cookie-permissions/cookie-permission-manager.c:1115 msgid "Undetermined" msgstr "Невизначено" @@ -3062,6 +3096,31 @@ msgid "Manage cookie permission per site" msgstr "Керування дозволами тістечок для кожної сторінки" +#~ msgid "Middle click opens Selection" +#~ msgstr "Середня кнопка відкриває виділене" + +#~ msgid "Load an address from the selection via middle click" +#~ msgstr "" +#~ "Завантажувати посилання URL з виділеного через клацання середньої кнопки" + +#~ msgid "Could not get path to configuration of extension: path is NULL" +#~ msgstr "Неможливо отримати шлях для налаштування розширення: шлях є NULL" + +#~ msgid "Could not get path to configuration of extension." +#~ msgstr "Неможливо отримати шлях для налаштування розширення." + +#~ msgid "Custom..." +#~ msgstr "Інше…" + +#~ msgid "Confirm storing cookie" +#~ msgstr "Підтвердження збереження тістечка" + +#~ msgid "_Details" +#~ msgstr "_Деталі" + +#~ msgid "What to identify as to web pages" +#~ msgstr "Що ідентифікувати для веб-сторінок" + #~ msgid "Writing failed." #~ msgstr "Невдача запису." @@ -3182,9 +3241,6 @@ #~ msgid "The homepage" #~ msgstr "Домашня сторінка" -#~ msgid "Show crash dialog" -#~ msgstr "Показати діалог краху" - #~ msgid "The folder downloaded files are saved to" #~ msgstr "Завантажені файли зберігати в теку" @@ -3652,9 +3708,6 @@ #~ msgid "Quit the application" #~ msgstr "Вийти з програми" -#~ msgid "Show Blank page" -#~ msgstr "Показати пусту сторінку" - #~ msgid "_Contents" #~ msgstr "_Зміст" @@ -3798,9 +3851,6 @@ #~ msgid "Open _Link" #~ msgstr "Відкрити _посилання" -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "Відкрити зображення у новому _вікні" - #~ msgid "REGEX" #~ msgstr "REGEX" diff -Nru midori-0.4.9/tests/browser.c midori-0.5.0/tests/browser.c --- midori-0.4.9/tests/browser.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tests/browser.c 2013-04-04 20:31:20.000000000 +0000 @@ -165,8 +165,10 @@ midori_app_setup (&argc, &argv, NULL); midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL); + #ifndef HAVE_WEBKIT2 g_object_set_data (G_OBJECT (webkit_get_default_session ()), "midori-session-initialized", (void*)1); + #endif g_test_add_func ("/browser/create", browser_create); g_test_add_func ("/browser/tooltips", browser_tooltips); diff -Nru midori-0.4.9/tests/desktop.sh midori-0.5.0/tests/desktop.sh --- midori-0.4.9/tests/desktop.sh 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.5.0/tests/desktop.sh 2013-04-04 20:31:20.000000000 +0000 @@ -0,0 +1,21 @@ +#! /usr/bin/env sh +# Copyright 2013 Christian Dywan +# +# This script 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. +echo Validating .desktop files +test -z $(which desktop-file-validate) && echo ...SKIPPED: not installed && return 0 +test -z "$SRCDIR" && SRCDIR=$PWD +test -z "$BLDDIR" && BLDDIR=_build +cd "$SRCDIR/$BLDDIR/default/data" +ERRORS=0 +for i in $(ls | GREP_OPTIONS= grep .desktop); do + for j in $(desktop-file-validate $i | grep -v 'unregistered value "Pantheon"' | tr ' ' '_'); do + ERRORS=1 + echo $j | tr '_' ' ' + done +done +test "$ERRORS" = 1 && echo ...FAILED && exit 1 +echo ...OK diff -Nru midori-0.4.9/tests/download.vala midori-0.5.0/tests/download.vala --- midori-0.4.9/tests/download.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tests/download.vala 2013-04-04 20:31:20.000000000 +0000 @@ -69,7 +69,11 @@ } void download_properties () { +#if HAVE_WEBKIT2 + var download = WebKit.WebContext.get_default ().download_uri ("file:///klaatu/barada/nikto.ogg"); +#else var download = new WebKit.Download (new WebKit.NetworkRequest ("file:///klaatu/barada/nikto.ogg")); +#endif assert (Midori.Download.get_type (download) == 0); Midori.Download.set_type (download, Midori.DownloadType.OPEN); assert (Midori.Download.get_type (download) == Midori.DownloadType.OPEN); @@ -78,16 +82,22 @@ try { string filename; FileUtils.close (FileUtils.open_tmp ("XXXXXX", out filename)); +#if HAVE_WEBKIT2 + download.set_destination (Filename.to_uri (filename, null)); +#else download.destination_uri = Filename.to_uri (filename, null); - string tee = Midori.Download.get_tooltip (download); download.start (); +#endif + string tee = Midori.Download.get_tooltip (download); assert (Midori.Download.get_progress (download) == 0.0); var loop = MainContext.default (); do { loop.iteration (true); } while (loop.pending ()); string tee2 = Midori.Download.get_tooltip (download); assert (tee2.contains (tee)); do { loop.iteration (true); } while (!Midori.Download.is_finished (download)); +#if !HAVE_WEBKIT2 assert (download.status == WebKit.DownloadStatus.ERROR); +#endif } catch (Error error) { GLib.error (error.message); diff -Nru midori-0.4.9/tests/extensions.c midori-0.5.0/tests/extensions.c --- midori-0.4.9/tests/extensions.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tests/extensions.c 2013-04-04 20:31:20.000000000 +0000 @@ -182,7 +182,20 @@ while ((filename = g_dir_read_name (extension_dir))) { GObject* extension = midori_extension_load_from_file (extension_path, filename, FALSE, TRUE); - if (extension != NULL) + if (KATZE_IS_ARRAY (extension)) + { + MidoriExtension* extension_item; + KATZE_ARRAY_FOREACH_ITEM (extension_item, KATZE_ARRAY (extension)) + if (MIDORI_IS_EXTENSION (extension_item)) + { + gchar* key = katze_object_get_object (extension_item, "key"); + gchar* path = g_strdup_printf ("/extensions/%s/%s", filename, key); + g_test_add_data_func (path, extension_item, extension_activate); + g_free (path); + g_free (key); + } + } + else if (extension != NULL) { gchar* path = g_strconcat ("/extensions/", filename, NULL); g_test_add_data_func (path, extension, extension_activate); @@ -205,8 +218,10 @@ g_test_init (&argc, &argv, NULL); midori_app_setup (&argc, &argv, NULL); midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL); + #ifndef HAVE_WEBKIT2 soup_session_add_feature_by_type (webkit_get_default_session (), SOUP_TYPE_COOKIE_JAR); + #endif g_test_add_func ("/extensions/create", extension_create); g_test_add_func ("/extensions/settings", extension_settings); diff -Nru midori-0.4.9/tests/magic-uri.c midori-0.5.0/tests/magic-uri.c --- midori-0.4.9/tests/magic-uri.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tests/magic-uri.c 2013-04-04 20:31:20.000000000 +0000 @@ -50,7 +50,7 @@ g_object_unref (item); } - uri = sokoke_magic_uri (input); + uri = sokoke_magic_uri (input, TRUE, FALSE); if (!uri) { const gchar* keywords = NULL; diff -Nru midori-0.4.9/tests/properties.c midori-0.5.0/tests/properties.c --- midori-0.4.9/tests/properties.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tests/properties.c 2013-04-04 20:31:20.000000000 +0000 @@ -87,8 +87,10 @@ midori_app_setup (&argc, &argv, NULL); midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL); + #ifndef HAVE_WEBKIT2 g_object_set_data (G_OBJECT (webkit_get_default_session ()), "midori-session-initialized", (void*)1); + #endif g_test_add_data_func ("/properties/app", (gconstpointer)MIDORI_TYPE_APP, properties_type_test); diff -Nru midori-0.4.9/tests/tab.vala midori-0.5.0/tests/tab.vala --- midori-0.4.9/tests/tab.vala 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tests/tab.vala 2013-04-04 20:31:20.000000000 +0000 @@ -119,6 +119,56 @@ Midori.Test.release_max_timeout (); } +void tab_alias () { + Midori.Test.log_set_fatal_handler_for_icons (); + var browser = new Midori.Browser (); + var settings = new Midori.WebSettings (); + browser.set ("settings", settings); + var tab = new Midori.View.with_title (); + tab.settings = new Midori.WebSettings (); + tab.settings.set ("enable-plugins", false); + browser.add_tab (tab); + var loop = MainContext.default (); + + tab.settings.tabhome = "http://.invalid/"; + tab.set_uri ("about:new"); + do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED); + assert (tab.uri == tab.settings.tabhome); +#if !HAVE_WEBKIT2 + // Check that this is the real page, not white page with a URL + assert (!tab.web_view.search_text ("about:", true, false, false)); +#endif + + tab.settings.tabhome = "about:blank"; + tab.set_uri ("about:new"); + do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED); + assert (tab.uri == tab.settings.tabhome); +#if !HAVE_WEBKIT2 + // Check that this is the real page, not white page with a URL + assert (!tab.web_view.search_text ("about:", true, false, false)); +#endif + + tab.settings.tabhome = "about:search"; + tab.settings.location_entry_search = "http://.invalid/"; + tab.set_uri ("about:new"); + do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED); + assert (tab.uri == tab.settings.location_entry_search); +#if !HAVE_WEBKIT2 + // Check that this is the real page, not white page with a URL + assert (!tab.web_view.search_text ("about:", true, false, false)); +#endif + + tab.settings.tabhome = "about:home"; + tab.settings.homepage = "http://.invalid/"; + tab.set_uri ("about:new"); + do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED); + assert (tab.uri == tab.settings.homepage); +#if !HAVE_WEBKIT2 + // Check that this is the real page, not white page with a URL + assert (!tab.web_view.search_text ("about:", true, false, false)); +#endif +} + void tab_http () { Midori.Test.grab_max_timeout (); @@ -159,14 +209,20 @@ var source = new Midori.View.with_title (null, tab.settings); browser.add_tab (source); +#if HAVE_WEBKIT2 +#else source.web_view.set_view_source_mode (true); +#endif source.web_view.load_uri (test_url); do { loop.iteration (true); } while (source.load_status != Midori.LoadStatus.FINISHED); assert (!source.is_blank ()); assert (!source.can_view_source ()); assert (!source.special); /* FIXME assert (source.can_save ()); */ +#if HAVE_WEBKIT2 +#else assert (source.web_view.get_view_source_mode ()); +#endif source.set_uri ("http://.invalid"); do { loop.iteration (true); } while (source.load_status != Midori.LoadStatus.FINISHED); @@ -174,7 +230,10 @@ assert (!source.can_view_source ()); assert (source.special); assert (!source.can_save ()); +#if HAVE_WEBKIT2 +#else assert (!source.web_view.get_view_source_mode ()); +#endif Midori.Test.release_max_timeout (); } @@ -220,11 +279,14 @@ Test.init (ref args); Midori.App.setup (ref args, null); Midori.Paths.init (Midori.RuntimeMode.NORMAL, null); +#if !HAVE_WEBKIT2 WebKit.get_default_session ().set_data ("midori-session-initialized", true); +#endif Test.add_func ("/tab/load-title", tab_load_title); Test.add_func ("/tab/display-title", tab_display_title); Test.add_func ("/tab/ellipsize", tab_display_ellipsize); Test.add_func ("/tab/special", tab_special); + Test.add_func ("/tab/alias", tab_alias); Test.add_func ("/tab/http", tab_http); Test.add_func ("/tab/movement", tab_movement); Test.add_func ("/tab/download", tab_download_dialog); diff -Nru midori-0.4.9/tests/wscript_build midori-0.5.0/tests/wscript_build --- midori-0.4.9/tests/wscript_build 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tests/wscript_build 2013-04-04 20:31:20.000000000 +0000 @@ -55,5 +55,5 @@ else: obj.packages += ' webkitgtk-3.0' obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE ZEITGEIST' - obj.uselib_local = 'midori-core' + obj.uselib_local = 'midori-c' obj.unit_test = 1 diff -Nru midori-0.4.9/toolbars/midori-transferbar.c midori-0.5.0/toolbars/midori-transferbar.c --- midori-0.4.9/toolbars/midori-transferbar.c 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/toolbars/midori-transferbar.c 2013-04-04 20:31:20.000000000 +0000 @@ -47,27 +47,26 @@ } TransferInfo; static gboolean -midori_transferbar_info_free (gpointer data) +midori_transferbar_info_free (TransferInfo* info) { - TransferInfo* info = data; MidoriTransferbar* transferbar = info->transferbar; transferbar->infos = g_list_remove (transferbar->infos, info); g_object_unref (info->download); - gtk_widget_destroy (info->toolitem); g_slice_free (TransferInfo, info); - if (!transferbar->infos || !g_list_nth_data (transferbar->infos, 0)) - gtk_widget_hide (GTK_WIDGET (transferbar->clear)); - return FALSE; } static void -midori_transferbar_button_destroy_cb (GtkWidget* button, - TransferInfo* info) +midori_transferbar_info_destroy (TransferInfo* info) { - g_idle_add (midori_transferbar_info_free, info); + MidoriTransferbar* transferbar = info->transferbar; + + gtk_widget_destroy (info->toolitem); + + if (!transferbar->infos || !g_list_nth_data (transferbar->infos, 0)) + gtk_widget_hide (GTK_WIDGET (transferbar->clear)); } static void @@ -133,7 +132,7 @@ { WebKitDownload* download = info->download; if (midori_download_action_clear (download, button, NULL)) - gtk_widget_destroy (button); + midori_transferbar_info_destroy (info); } void @@ -157,7 +156,7 @@ TransferInfo* info = list->data; if (midori_download_is_finished (info->download) || webkit_download_get_status (info->download) == WEBKIT_DOWNLOAD_STATUS_STARTED) - gtk_widget_destroy (info->button); + midori_transferbar_info_destroy (info); } } #endif @@ -208,8 +207,8 @@ info->button = button; info->toolitem = GTK_WIDGET (toolitem); info->transferbar = transferbar; - g_signal_connect (button, "destroy", - G_CALLBACK (midori_transferbar_button_destroy_cb), info); + g_signal_connect_swapped (button, "destroy", + G_CALLBACK (midori_transferbar_info_free), info); transferbar->infos = g_list_prepend (transferbar->infos, info); g_signal_connect (download, "notify::progress", @@ -231,7 +230,7 @@ { TransferInfo* info = list->data; if (midori_download_is_finished (info->download)) - gtk_widget_destroy (info->button); + midori_transferbar_info_destroy (info); } } diff -Nru midori-0.4.9/tools/release midori-0.5.0/tools/release --- midori-0.4.9/tools/release 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/tools/release 2013-04-04 20:31:20.000000000 +0000 @@ -14,9 +14,9 @@ echo Bumping from $OLDVER to $NEWVER echo https://releases.xfce.org/ echo http://git.xfce.org/apps/midori/snapshot/midori-$NEWVER.tar.bz2 -echo git tag -a $NEWVER -m "Bump version to $NEWVER"';' git commit -m "Bump version to $NEWVER" -sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori-0.3.3.nsi -echo; git log --pretty=format:%s $OLDVER..HEAD | grep -v l10n; echo +echo git commit -m "'Bump version to $NEWVER'"';' git tag -a $NEWVER -m "'Bump version to $NEWVER'" +sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori.nsi +echo; git log --pretty='format: %s' $OLDVER..HEAD | grep -v l10n | grep -v makedist | grep -v tools/release | grep -v nsi; echo curl http://wiki.xfce.org/_export/xhtml/midori/faq | \ sed 's@This is a list of frequently asked questions@This is a snapshot of the online FAQ@g' | \ sed 's@@g' > data/faq.html diff -Nru midori-0.4.9/tools/screenshot midori-0.5.0/tools/screenshot --- midori-0.4.9/tools/screenshot 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.5.0/tools/screenshot 2013-04-04 20:31:20.000000000 +0000 @@ -0,0 +1,83 @@ +#! /bin/sh +# Copyright (C) 2013 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. + +xvfbonce() { + xvfb-run --server-args='-fbdir /tmp -screen 0 1024x768x16' \ + env LANGUAGE= UBUNTU_MENUPROXY= MOZ_PLUGIN_PATH=/ SCREENCHILD=42 $0 $1 "$2" 2>&1 | grep -v RANDR +} + +if test "$SCREENCHILD" = "42"; then + (xfwm4 || metacity) 2>&1 | grep -v XRandr | grep -v 'Fatal IO error' & + sleep 2; kill -0 $! || exit $? + if test "$1" = "midori"; then + echo Processing case $2 + CFG=/tmp/midori-scrn/$2 + PNG=$CFG.png + test -d $CFG && rm -R $CFG; mkdir -p $CFG + mkdir -p $CFG/midori + mkdir -p $CFG/gtk-3.0 + echo '[Settings]' > $CFG/gtk-3.0/settings.ini + test -n "$GTK_THEME" && echo "gtk-theme-name=$GTK_THEME" >> $CFG/gtk-3.0/settings.ini + test -n "$ICON_THEME" && echo "gtk-icon-theme-name=$ICON_THEME" >> $CFG/gtk-3.0/settings.ini + export XDG_CONFIG_HOME; XDG_CONFIG_HOME=$CFG + echo '[settings]' > $CFG/midori/config + echo 'last-window-state=MIDORI_WINDOW_MAXIMIZED' >> $CFG/midori/config + EXE="-e toolbar-style=MIDORI_TOOLBAR_ICONS" + URLS="http://.invalid about:version http://en.wikipedia.org/wiki/Cat" + if test "$2" = "1"; then + EXE="$EXE -e BookmarkAdd" + elif test "$2" = "2"; then + EXE="$EXE $URLS -e Panel -e libtab-panel.so=true" + echo 'last-panel-page=3' >> $CFG/config + elif test "$2" = "3"; then + EXE="$EXE -e Preferences" + elif test "$2" = "4"; then + EXE="$EXE -e ClearPrivateData" + elif test "$2" = "5"; then + EXE="$EXE -e Find" + elif test "$2" = "6"; then + EXE="$EXE -e ManageSearchEngines" + fi + _build/default/midori/midori $EXE 2>&1 \ + | grep -v 'Theme parsing error' \ + | grep -E -v '\[[0-9]{3}:[0-9]{3}\]' \ + | grep -v 'Fatal IO error' \ + | uniq & + elif test "$1" = "custom"; then + if test "$2" = ""; then + echo 'Argument required' + exit 1 + fi + PNG=/tmp/screenshot-custom.png + $2 & + else + echo Unknown scenario "$2" + exit 1 + fi + sleep 2; kill -0 $! || exit $? + sleep 14 + # test ! -f /tmp/Xvfb_screen0 && echo Xvfb produced no memory image && exit 1 + # convert /tmp/Xvfb_screen0 $PNG + WINDOW=$(xprop -root | grep --color=never '_NET_ACTIVE_WINDOW(WINDOW)' | sed 's@_NET_ACTIVE_WINDOW(WINDOW): window id # @@g') + import -frame -window "$WINDOW" $PNG || exit 1 + echo Screenshot $PNG saved + exit 0 +elif test "$1" = "midori"; then + for i in 1 2 3 4 5 6; do + xvfbonce $1 $i + done +elif test "$1" = "custom"; then + xvfbonce $1 "$2" +else + echo Usage: + echo " $0 midori" + echo " $0 custom 'commandline --with -a rguments'" +fi + diff -Nru midori-0.4.9/win32/makedist/makedist.midori midori-0.5.0/win32/makedist/makedist.midori --- midori-0.4.9/win32/makedist/makedist.midori 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/win32/makedist/makedist.midori 2013-04-04 20:31:20.000000000 +0000 @@ -24,6 +24,10 @@ # a bit of configuration root_dir=$MINGW_PREFIX +if [ "$GSTREAMER_API_VERSION" == "" ]; then + GSTREAMER_API_VERSION=0.10 +fi + if [ "$MINGW_PREFIX" == "" ]; then echo "Error: MINGW_PREFIX variable is empty!" exit @@ -39,24 +43,32 @@ version=`grep PACKAGE_VERSION _build/default/config.h | awk '{ print $3 $4; }' | sed 's@(debug)@-debug@g'|sed 's@"@@g'` if [ "$1" != "" ]; then - if [ "$1" == "debug" ]; then - DEBUG_BUILD=1 - shift - fi version_tag="$1" fi if [ "$version_tag" != "" ]; then - version_tag=$version_tag-$version + version_tag=$version-$version_tag else version_tag=$version fi -# generate unique filename +if [ "$RELEASE" == "" ]; then + ARCHIVE_FILENAME=midori-$version_tag-`date +%Y%m%d%H%M` +else + ARCHIVE_FILENAME=midori-$version_tag +fi + +# generate archive filename if [ "$have_7zip" != "" ]; then - ARCHIVE=midori-$version_tag-`date +%Y%m%d%H%M`.7z + ARCHIVE=$ARCHIVE_FILENAME.7z else - ARCHIVE=midori-$version_tag-`date +%Y%m%d%H%M`.zip + ARCHIVE=$ARCHIVE_FILENAME.zip +fi + +if [ "NSIS" != "" ];then + where_am_i=$PWD + cp -a $where_am_i/win32/makedist/midori.nsi $temp_dir + cp -a $where_am_i/win32/makedist/midori.ico $temp_dir fi # function: dll-recursive @@ -105,7 +117,7 @@ echo "Creating $ARCHIVE" # create destination folder -workdir=$temp_dir/midori-$version_tag +workdir=$temp_dir/midori-$version mkdir $workdir echo "<*> Generating dll list..." @@ -115,10 +127,12 @@ dll_recursive midori*.exe gspawn-*-helper*.exe libhunspell*.dll > $temp_dir/midori.exe.lst dll_recursive ../lib/gio/modules/*.dll >> $temp_dir/midori.exe.lst dll_recursive iconv.dll >> $temp_dir/midori.exe.lst -dll_recursive ../lib/gstreamer-0.10/*.dll >> $temp_dir/midori.exe.lst +dll_recursive ../lib/gstreamer-$GSTREAMER_API_VERSION/*.dll >> $temp_dir/midori.exe.lst +# we ship gdb now for -g and diagnostic button +dll_recursive gdb.exe >> $temp_dir/midori.exe.lst if [ "$DEBUG_BUILD" != "" ]; then - dll_recursive gdb.exe GtkLauncher.exe >> $temp_dir/midori.exe.lst + dll_recursive GtkLauncher.exe >> $temp_dir/midori.exe.lst fi files=`ls | cat - $temp_dir/midori.exe.lst | sort | uniq -d` @@ -164,7 +178,6 @@ fi grab_files lib midori -grab_files lib/engines "*" grab_files lib gdk-pixbuf-2.0 grab_files lib enchant @@ -173,7 +186,7 @@ # Fedora ships on-demand pango modules, check just in case grab_files lib pango -grab_files lib gstreamer-0.10 +grab_files lib gstreamer-$GSTREAMER_API_VERSION echo "<*> Copying resources and translations..." @@ -200,17 +213,6 @@ pushd $workdir > /dev/null find -iname *.debug -exec rm {} \; popd > /dev/null -else - #add some gdb helper scripts - cat > $workdir/bin/backtrace.gdb << _EOF -set logging on debug.log -run -thread apply all bt -quit -_EOF - -echo 'gdb.exe --command=backtrace.gdb midori.exe' > $workdir/bin/debug.bat - fi # copy locales for gtk @@ -236,10 +238,8 @@ fi mkdir -p $gtk_etc_dir -rm $gtk_rc_file - -# Use small icons by default and Tango theme +# Use small icons by default and Faenza icon theme if [ "$GTK3_BUILD" == "1" ]; then cat > $gtk_rc_file << _EOF @@ -281,9 +281,28 @@ else zip -rq $ARCHIVE midori-$version_tag fi + +if [ "$NSIS" != "" ];then + nsis_file=Midori-${version}_setup.exe + echo "Creating $nsis_file" + makensis -NOCD -V2 ./midori.nsi + mv $nsis_file $where_am_i +fi popd > /dev/null echo "<*> Cleaning up..." # remove working directory rm -r $temp_dir + + +echo "<*> Computing checksums..." + +sum_file=midori-$version.sha1 +sha1sum $ARCHIVE >> $sum_file + +if [ "$NSIS" != "" ]; then + sha1sum $nsis_file >> $sum_file +fi + +cat $sum_file diff -Nru midori-0.4.9/win32/makedist/midori-0.3.3.nsi midori-0.5.0/win32/makedist/midori-0.3.3.nsi --- midori-0.4.9/win32/makedist/midori-0.3.3.nsi 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/win32/makedist/midori-0.3.3.nsi 1970-01-01 00:00:00.000000000 +0000 @@ -1,632 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Copyright (C) 2009 Enrico Tröger -; 2010-2011 Peter de Ridder -; -; 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. -; -; Installer script for Midori (Windows Installer) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - -; Do a Cyclic Redundancy Check to make sure the installer was not corrupted by the download -CRCCheck force -RequestExecutionLevel user ; set execution level for Windows Vista - -;;;;;;;;;;;;;;;;;;; -; helper defines ; -;;;;;;;;;;;;;;;;;;; -!define PRODUCT_NAME "Midori" -!define PRODUCT_VERSION "0.4.9" -!define PRODUCT_BUILD "0" -!define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}" -!define PRODUCT_PUBLISHER "Christian Dywan" -!define PRODUCT_WEB_SITE "http://www.midori-browser.org" -!define PRODUCT_DIR_REGKEY "Software\${PRODUCT_NAME}" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_BROWER_KEY "Software\Clients\StartMenuInternet" -!define PRODUCT_EXE "$INSTDIR\bin\midori.exe" -!define UNINSTALL_EXE "$INSTDIR\uninst.exe" -!define RESOURCEDIR "midori-${PRODUCT_VERSION}" -!define ICON_THEME "Faenza" - -;;;;;;;;;;;;;;;;;;;;; -; Version resource ; -;;;;;;;;;;;;;;;;;;;;; -VIProductVersion "${PRODUCT_VERSION_ID}" -VIAddVersionKey "ProductName" "${PRODUCT_NAME}" -VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" -VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" -VIAddVersionKey "LegalCopyright" "Copyright 2009-2012 by Christian Dywan" -VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" - -BrandingText "$(^NAME) installer (NSIS ${NSIS_VERSION})" -InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -SetCompressor /SOLID lzma -ShowInstDetails hide -ShowUnInstDetails hide -XPStyle on -OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}_setup.exe" - -Var Answer -Var UserName -Var StartmenuFolder -Var UNINSTDIR -Var DefaultBrowser - -;;;;;;;;;;;;;;;; -; MUI Settings ; -;;;;;;;;;;;;;;;; -!include "MUI2.nsh" - -!define MUI_ABORTWARNING -!define MUI_ICON "midori.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall-full.ico" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -;!define MUI_LICENSEPAGE_RADIOBUTTONS -!insertmacro MUI_PAGE_LICENSE "${RESOURCEDIR}\COPYING" -; Components page -!insertmacro MUI_PAGE_COMPONENTS -; Directory page -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirLeave -!insertmacro MUI_PAGE_DIRECTORY -; Start menu page -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Midori" -!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" -!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} "$StartmenuFolder" -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -!define MUI_FINISHPAGE_RUN "${PRODUCT_EXE}" -!define MUI_FINISHPAGE_RUN_NOTCHECKED -!define MUI_FINISHPAGE_NOREBOOTSUPPORT -!insertmacro MUI_PAGE_FINISH - -; Uninstaller page -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -; Language file -!insertmacro MUI_LANGUAGE "English" - -;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Sections and InstTypes ; -;;;;;;;;;;;;;;;;;;;;;;;;;;; -InstType "Full" -InstType "Minimal" - -Section "!Program Files" SEC01 - SectionIn RO 1 2 - SetOverwrite ifnewer - - SetOutPath "$INSTDIR" - File "${RESOURCEDIR}\*" - - SetOutPath "$INSTDIR\bin" - File /r "${RESOURCEDIR}\bin\*" - - SetOutPath "$INSTDIR\etc" - File /r "${RESOURCEDIR}\etc\*" - - SetOutPath "$INSTDIR\lib" - File /r /x "midori" "${RESOURCEDIR}\lib\*" - - SetOutPath "$INSTDIR\share" - File /r /x "locale" /x "user" /x "${ICON_THEME}" "${RESOURCEDIR}\share\*" - - SetOutPath "$INSTDIR\share\icons\${ICON_THEME}" - File "${RESOURCEDIR}\share\icons\${ICON_THEME}\index.theme" - - SetOutPath "$INSTDIR" - CreateShortCut "$INSTDIR\Midori.lnk" "${PRODUCT_EXE}" - - !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME} - CreateDirectory "$SMPROGRAMS\$StartmenuFolder" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Midori.lnk" "${PRODUCT_EXE}" - !insertmacro MUI_STARTMENU_WRITE_END - -!macro InstallIconThemeRenameSmall OPath IPath - File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\16x16\${IPath}.png" - File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\22x22\${IPath}.png" - File "/oname=24x24\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\24x24\${IPath}.png" - File /nonfatal "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png" -!macroend - -!macro InstallIconThemeRename OPath IPath - !insertmacro InstallIconThemeRenameSmall ${OPath} ${IPath} - File /nonfatal "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png" - File /nonfatal "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\scalable\${IPath}.svg" -!macroend - -!macro InstallIconThemeSmall IconPath - !insertmacro InstallIconThemeRenameSmall ${IconPath} ${IconPath} -!macroend - -!macro InstallIconTheme IconPath - !insertmacro InstallIconThemeRename ${IconPath} ${IconPath} -!macroend - -!macro CreateIconThemeSectionsSmall SectionPath - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\16x16\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\22x22\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\24x24\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\32x32\${SectionPath}" -!macroend - -!macro CreateIconThemeSections SectionPath - !insertmacro CreateIconThemeSectionsSmall ${SectionPath} - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\48x48\${SectionPath}" - CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\scalable\${SectionPath}" -!macroend - - SetOutPath "$INSTDIR\share\icons\${ICON_THEME}" - - !insertmacro CreateIconThemeSections "actions" - #!insertmacro CreateIconThemeSectionsSmall "animations" - !insertmacro CreateIconThemeSections "apps" - !insertmacro CreateIconThemeSections "categories" - !insertmacro CreateIconThemeSections "devices" - !insertmacro CreateIconThemeSections "mimetypes" - !insertmacro CreateIconThemeSections "places" - !insertmacro CreateIconThemeSections "status" - - !insertmacro InstallIconTheme "actions\bookmark-new" - !insertmacro InstallIconTheme "actions\document-open" - !insertmacro InstallIconTheme "actions\document-open-recent" - !insertmacro InstallIconTheme "actions\document-print" - !insertmacro InstallIconTheme "actions\document-properties" - !insertmacro InstallIconTheme "actions\document-save-as" - !insertmacro InstallIconTheme "actions\document-save" - !insertmacro InstallIconTheme "actions\edit-clear" - !insertmacro InstallIconTheme "actions\edit-copy" - !insertmacro InstallIconTheme "actions\edit-cut" - !insertmacro InstallIconTheme "actions\edit-delete" - !insertmacro InstallIconTheme "actions\edit-find" - !insertmacro InstallIconTheme "actions\edit-paste" - !insertmacro InstallIconTheme "actions\edit-redo" - !insertmacro InstallIconTheme "actions\edit-select-all" - !insertmacro InstallIconTheme "actions\edit-undo" - !insertmacro InstallIconTheme "actions\folder-new" - !insertmacro InstallIconTheme "actions\format-indent-more" - !insertmacro InstallIconTheme "actions\go-down" - !insertmacro InstallIconTheme "actions\go-home" - !insertmacro InstallIconTheme "actions\go-jump" - !insertmacro InstallIconTheme "actions\go-next" - !insertmacro InstallIconTheme "actions\go-previous" - !insertmacro InstallIconTheme "actions\go-up" - !insertmacro InstallIconTheme "actions\gtk-cancel" - !insertmacro InstallIconTheme "actions\gtk-edit" - !insertmacro InstallIconTheme "actions\gtk-no" - !insertmacro InstallIconTheme "actions\gtk-ok" - !insertmacro InstallIconTheme "actions\gtk-save" - !insertmacro InstallIconTheme "actions\gtk-yes" - !insertmacro InstallIconTheme "actions\help-about" - !insertmacro InstallIconTheme "actions\help-contents" - !insertmacro InstallIconTheme "actions\list-add" - !insertmacro InstallIconTheme "actions\list-remove" - !insertmacro InstallIconTheme "actions\media-skip-backward" - !insertmacro InstallIconTheme "actions\media-skip-forward" - !insertmacro InstallIconTheme "actions\process-stop" - !insertmacro InstallIconTheme "actions\stop" - !insertmacro InstallIconTheme "actions\tab-new" - !insertmacro InstallIconTheme "actions\tools-check-spelling" - !insertmacro InstallIconTheme "actions\view-fullscreen" - !insertmacro InstallIconTheme "actions\view-refresh" - !insertmacro InstallIconTheme "actions\window-close" - !insertmacro InstallIconTheme "actions\window-new" - !insertmacro InstallIconTheme "actions\zoom-in" - !insertmacro InstallIconTheme "actions\zoom-out" - - #!insertmacro InstallIconThemeSmall "animations\process-working" - - !insertmacro InstallIconTheme "apps\internet-news-reader" - !insertmacro InstallIconTheme "apps\midori" - !insertmacro InstallIconTheme "apps\preferences-desktop-theme" - !insertmacro InstallIconTheme "apps\web-browser" - - !insertmacro InstallIconTheme "categories\gtk-preferences" - - !insertmacro InstallIconTheme "devices\drive-harddisk" - !insertmacro InstallIconTheme "devices\media-optical-dvd-rom" - - !insertmacro InstallIconTheme "mimetypes\application-x-shockwave-flash" - !insertmacro InstallIconTheme "mimetypes\extension" - !insertmacro InstallIconTheme "mimetypes\gtk-file" - !insertmacro InstallIconTheme "mimetypes\image-x-generic" - !insertmacro InstallIconTheme "mimetypes\package" - !insertmacro InstallIconTheme "mimetypes\text-html" - !insertmacro InstallIconTheme "mimetypes\text-x-generic" - !insertmacro InstallIconTheme "mimetypes\text-x-javascript" - - !insertmacro InstallIconTheme "places\folder-documents" - !insertmacro InstallIconTheme "places\folder-downloads" - !insertmacro InstallIconTheme "places\folder-music" - !insertmacro InstallIconTheme "places\folder-pictures" - !insertmacro InstallIconTheme "places\folder" - !insertmacro InstallIconTheme "places\folder-videos" - !insertmacro InstallIconTheme "places\inode-directory" - !insertmacro InstallIconTheme "places\user-bookmarks" - !insertmacro InstallIconTheme "places\user-desktop" - !insertmacro InstallIconTheme "places\user-home" - !insertmacro InstallIconTheme "places\user-trash" - - !insertmacro InstallIconTheme "status\dialog-password" - !insertmacro InstallIconTheme "status\locked" - -SectionEnd - -Section "Extensions" SEC04 - SectionIn 1 - SetOverwrite ifnewer - SetOutPath "$INSTDIR\lib" - File /r "${RESOURCEDIR}\lib\midori" -SectionEnd - -Section "Language Files" SEC02 - SectionIn 1 - SetOutPath "$INSTDIR\share" - File /r "${RESOURCEDIR}\share\locale" -SectionEnd - - -Section "Desktop Shortcuts" SEC03 - SectionIn 1 - CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}" - CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}" -SectionEnd - -Section "Default Browser" SEC05 - SectionIn 1 - StrCpy $DefaultBrowser "yes" -SectionEnd - -Section -AdditionalIcons - SetOutPath $INSTDIR - !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME} - WriteIniStr "$INSTDIR\Website.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Website.lnk" "${PRODUCT_EXE}" \ - "${PRODUCT_WEB_SITE}" "${PRODUCT_EXE}" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Uninstall.lnk" "${UNINSTALL_EXE}" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Make Default.lnk" "${UNINSTALL_EXE}" \ - "/S /MAKEDEFAULT" "${PRODUCT_EXE}" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section -Post - WriteUninstaller "${UNINSTALL_EXE}" - WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" Path "$INSTDIR" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" "$SMPROGRAMS\$StartmenuFolder" - ${if} $Answer == "yes" ; if user is admin - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "${UNINSTALL_EXE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "${PRODUCT_EXE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "${PRODUCT_WEB_SITE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" - WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoModify" 0x00000001 - WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001 - - WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE" "" "${PRODUCT_NAME}" - WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\DefaultIcon" "" "${PRODUCT_EXE},0" - WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\shell\open\command" "" "${PRODUCT_EXE}" - WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "HideIconsCommand" '"${UNINSTALL_EXE}" /S /HIDE' - WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000000 - WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "ReinstallCommand" '"${UNINSTALL_EXE}" /S /MAKEDEFAULT' - WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "ShowIconsCommand" '"${UNINSTALL_EXE}" /S /SHOW' - ${endif} - - ${if} $DefaultBrowser == "yes" - ${if} $Answer == "yes" ; if user is admin - WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000001 - ${endif} - WriteRegStr HKCU "${PRODUCT_BROWER_KEY}" "" "MIDORI.EXE" - WriteRegStr HKCR "http\DefaultIcon" "" "${PRODUCT_EXE},0" - WriteRegStr HKCR "http\shell\open\command" "" '${PRODUCT_EXE} "%1"' - WriteRegStr HKCR "https\DefaultIcon" "" "${PRODUCT_EXE},0" - WriteRegStr HKCR "https\shell\open\command" "" '${PRODUCT_EXE} "%1"' - ${endif} -SectionEnd - -Section Uninstall - Delete "$INSTDIR\Website.url" - Delete "${UNINSTALL_EXE}" - Delete "$INSTDIR\COPYING" - Delete "$INSTDIR\AUTHORS" - Delete "$INSTDIR\Midori.lnk" - - ; delete start menu entry - ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" - RMDir /r "$0" - - Delete "$QUICKLAUNCH\Midori.lnk" - Delete "$DESKTOP\Midori.lnk" - - RMDir /r "$INSTDIR\bin" - RMDir /r "$INSTDIR\etc" - RMDir /r "$INSTDIR\lib" - RMDir /r "$INSTDIR\share" - RMDir "$INSTDIR" - - DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}" - DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}" - DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" - DeleteRegKey HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE" - - SetAutoClose true -SectionEnd - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Section descriptions ; -;;;;;;;;;;;;;;;;;;;;;;;;; -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Required program files. You cannot skip these files." -!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Various translations of Midori's interface." -!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Create shortcuts for Midori on the desktop and in the Quicklaunch Bar" -!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Available plugins like 'Advertisement Blocker', 'Form history filler' and 'Mouse Gestures'." -!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Make Midori the default browser." -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -;;;;;;;;;;;;;;;;;;;;; -; helper functions ; -;;;;;;;;;;;;;;;;;;;;; - -; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsis/setup.nsi) -!macro IsUserAdmin Result UName - ClearErrors - UserInfo::GetName - IfErrors Win9x - Pop $0 - StrCpy ${UName} $0 - UserInfo::GetAccountType - Pop $1 - ${if} $1 == "Admin" - StrCpy ${Result} "yes" - ${else} - StrCpy ${Result} "no" - ${endif} - Goto done - -Win9x: - StrCpy ${Result} "yes" -done: -!macroend - -; (from http://nsis.sourceforge.net/GetOptions) -Function un.GetOptions - !define GetOptions `!insertmacro GetOptionsCall` - - !macro GetOptionsCall _PARAMETERS _OPTION _RESULT - Push `${_PARAMETERS}` - Push `${_OPTION}` - Call un.GetOptions - Pop ${_RESULT} - !macroend - - Exch $1 - Exch - Exch $0 - Exch - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - Push $7 - ClearErrors - - StrCpy $2 $1 '' 1 - StrCpy $1 $1 1 - StrLen $3 $2 - StrCpy $7 0 - - begin: - StrCpy $4 -1 - StrCpy $6 '' - - quote: - IntOp $4 $4 + 1 - StrCpy $5 $0 1 $4 - StrCmp $5$7 '0' notfound - StrCmp $5 '' trimright - StrCmp $5 '"' 0 +7 - StrCmp $6 '' 0 +3 - StrCpy $6 '"' - goto quote - StrCmp $6 '"' 0 +3 - StrCpy $6 '' - goto quote - StrCmp $5 `'` 0 +7 - StrCmp $6 `` 0 +3 - StrCpy $6 `'` - goto quote - StrCmp $6 `'` 0 +3 - StrCpy $6 `` - goto quote - StrCmp $5 '`' 0 +7 - StrCmp $6 '' 0 +3 - StrCpy $6 '`' - goto quote - StrCmp $6 '`' 0 +3 - StrCpy $6 '' - goto quote - StrCmp $6 '"' quote - StrCmp $6 `'` quote - StrCmp $6 '`' quote - StrCmp $5 $1 0 quote - StrCmp $7 0 trimleft trimright - - trimleft: - IntOp $4 $4 + 1 - StrCpy $5 $0 $3 $4 - StrCmp $5 '' notfound - StrCmp $5 $2 0 quote - IntOp $4 $4 + $3 - StrCpy $0 $0 '' $4 - StrCpy $4 $0 1 - StrCmp $4 ' ' 0 +3 - StrCpy $0 $0 '' 1 - goto -3 - StrCpy $7 1 - goto begin - - trimright: - StrCpy $0 $0 $4 - StrCpy $4 $0 1 -1 - StrCmp $4 ' ' 0 +3 - StrCpy $0 $0 -1 - goto -3 - StrCpy $3 $0 1 - StrCpy $4 $0 1 -1 - StrCmp $3 $4 0 end - StrCmp $3 '"' +3 - StrCmp $3 `'` +2 - StrCmp $3 '`' 0 end - StrCpy $0 $0 -1 1 - goto end - - notfound: - SetErrors - StrCpy $0 '' - - end: - Pop $7 - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Exch $0 -FunctionEnd - -Function .onInit - StrCpy "$StartmenuFolder" "Midori" - - ; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsis/setup.nsi) - ; If the user does *not* have administrator privileges, abort - StrCpy $Answer "" - StrCpy $UserName "" - !insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh - ${if} $Answer == "yes" - SetShellVarContext all ; set that e.g. shortcuts will be created for all users - ${else} - SetShellVarContext current - ; TODO is this really what we want? $PROGRAMFILES is not much better because - ; probably the unprivileged user can't write it anyways - StrCpy $INSTDIR "$PROFILE\$(^Name)" - ${endif} - - ; prevent running multiple instances of the installer - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "midori_installer") i .r1 ?e' - Pop $R0 - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK - Abort - ; warn about a new install over an existing installation - ReadRegStr $R0 SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" - StrCmp $R0 "" finish - - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "Midori has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?" \ - /SD IDYES IDYES remove IDNO finish - -remove: - ; run the uninstaller - ClearErrors - ; we read the installation path of the old installation from the Registry - ReadRegStr $UNINSTDIR SHCTX "${PRODUCT_DIR_REGKEY}" "Path" - IfSilent dosilent nonsilent -dosilent: - ExecWait '$R0 /S _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file - Goto finish -nonsilent: - ExecWait '$R0 _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file -finish: -FunctionEnd - -Function un.onInit - StrCpy $Answer "" - !insertmacro IsUserAdmin $Answer $UserName - ${if} $Answer == "yes" - SetShellVarContext all - ${else} - SetShellVarContext current - ${endif} - - ${GetOptions} "$CMDLINE" "/MAKEDEFAULT" $0 - IfErrors 0 +2 - goto makedefault_next - - WriteRegStr HKCU "${PRODUCT_BROWER_KEY}" "" "MIDORI.EXE" - WriteRegStr HKCR "http\DefaultIcon" "" "${PRODUCT_EXE},0" - WriteRegStr HKCR "http\shell\open\command" "" '${PRODUCT_EXE} "%1"' - WriteRegStr HKCR "https\DefaultIcon" "" "${PRODUCT_EXE},0" - WriteRegStr HKCR "https\shell\open\command" "" '${PRODUCT_EXE} "%1"' - Abort -makedefault_next: - - ${GetOptions} "$CMDLINE" "/SHOW" $0 - IfErrors 0 +2 - goto show_next - - ${if} $Answer == "yes" ; if user is admin - WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000001 - ${endif} - CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}" - CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}" - Abort -show_next: - - ${GetOptions} "$CMDLINE" "/HIDE" $0 - IfErrors 0 +2 - goto hide_next - - ${if} $Answer == "yes" ; if user is admin - WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000000 - ${endif} - Delete "$QUICKLAUNCH\Midori.lnk" - Delete "$DESKTOP\Midori.lnk" - Abort -hide_next: - - ; If the user does *not* have administrator privileges, abort - ${if} $Answer != "yes" - ; check if the Midori has been installed with admin permisions - ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher" - ${if} $0 != "" - MessageBox MB_OK|MB_ICONSTOP "You need administrator privileges to uninstall Midori!" \ - /SD IDOK - Abort - ${endif} - ${endif} -FunctionEnd - -Function OnDirLeave - ClearErrors - SetOutPath "$INSTDIR" ; what about IfError creating $INSTDIR? - GetTempFileName $1 "$INSTDIR" ; creates tmp file (or fails) - FileOpen $0 "$1" "w" ; error to open? - FileWriteByte $0 "0" - IfErrors notPossible possible - -notPossible: - RMDir "$INSTDIR" ; removes folder if empty - MessageBox MB_OK "The given directory is not writeable. Please choose another one!" /SD IDOK - Abort -possible: - FileClose $0 - Delete "$1" -FunctionEnd diff -Nru midori-0.4.9/win32/makedist/midori.nsi midori-0.5.0/win32/makedist/midori.nsi --- midori-0.4.9/win32/makedist/midori.nsi 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.5.0/win32/makedist/midori.nsi 2013-04-04 20:31:20.000000000 +0000 @@ -0,0 +1,631 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Copyright (C) 2009 Enrico Tröger +; 2010-2011 Peter de Ridder +; +; 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. +; +; Installer script for Midori (Windows Installer) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + +; Do a Cyclic Redundancy Check to make sure the installer was not corrupted by the download +CRCCheck force +RequestExecutionLevel admin ; set execution level for Windows Vista + +;;;;;;;;;;;;;;;;;;; +; helper defines ; +;;;;;;;;;;;;;;;;;;; +!define PRODUCT_NAME "Midori" +!define PRODUCT_VERSION "0.5.0" +!define PRODUCT_BUILD "0" +!define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}" +!define PRODUCT_PUBLISHER "Christian Dywan" +!define PRODUCT_WEB_SITE "http://www.midori-browser.org" +!define PRODUCT_DIR_REGKEY "Software\${PRODUCT_NAME}" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_BROWER_KEY "Software\Clients\StartMenuInternet" +!define PRODUCT_EXE "$INSTDIR\bin\midori.exe" +!define UNINSTALL_EXE "$INSTDIR\uninst.exe" +!define RESOURCEDIR "midori-${PRODUCT_VERSION}" +!define ICON_THEME "Faenza" + +;;;;;;;;;;;;;;;;;;;;; +; Version resource ; +;;;;;;;;;;;;;;;;;;;;; +VIProductVersion "${PRODUCT_VERSION_ID}" +VIAddVersionKey "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" +VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" +VIAddVersionKey "LegalCopyright" "Copyright 2009-2012 by Christian Dywan" +VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer" + +BrandingText "$(^NAME) installer (NSIS ${NSIS_VERSION})" +InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +SetCompressor /SOLID lzma +ShowInstDetails hide +ShowUnInstDetails hide +XPStyle on +OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}_setup.exe" + +Var Answer +Var UserName +Var StartmenuFolder +Var UNINSTDIR +Var DefaultBrowser + +;;;;;;;;;;;;;;;; +; MUI Settings ; +;;;;;;;;;;;;;;;; +!include "MUI2.nsh" + +!define MUI_ABORTWARNING +!define MUI_ICON "midori.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall-full.ico" + +; Welcome page +!insertmacro MUI_PAGE_WELCOME +; License page +;!define MUI_LICENSEPAGE_RADIOBUTTONS +!insertmacro MUI_PAGE_LICENSE "${RESOURCEDIR}\COPYING" +; Components page +!insertmacro MUI_PAGE_COMPONENTS +; Directory page +!define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirLeave +!insertmacro MUI_PAGE_DIRECTORY +; Start menu page +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Midori" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM +!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" +!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} "$StartmenuFolder" +; Instfiles page +!insertmacro MUI_PAGE_INSTFILES +; Finish page +!define MUI_FINISHPAGE_RUN "${PRODUCT_EXE}" +!define MUI_FINISHPAGE_RUN_NOTCHECKED +!define MUI_FINISHPAGE_NOREBOOTSUPPORT +!insertmacro MUI_PAGE_FINISH + +; Uninstaller page +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +; Language file +!insertmacro MUI_LANGUAGE "English" + +;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Sections and InstTypes ; +;;;;;;;;;;;;;;;;;;;;;;;;;;; +InstType "Full" +InstType "Minimal" + +Section "!Program Files" SEC01 + SectionIn RO 1 2 + SetOverwrite ifnewer + + SetOutPath "$INSTDIR" + File "${RESOURCEDIR}\*" + + SetOutPath "$INSTDIR\bin" + File /r "${RESOURCEDIR}\bin\*" + + SetOutPath "$INSTDIR\etc" + File /r "${RESOURCEDIR}\etc\*" + + SetOutPath "$INSTDIR\lib" + File /r /x "midori" "${RESOURCEDIR}\lib\*" + + SetOutPath "$INSTDIR\share" + File /r /x "locale" /x "user" /x "${ICON_THEME}" "${RESOURCEDIR}\share\*" + + SetOutPath "$INSTDIR\share\icons\${ICON_THEME}" + File "${RESOURCEDIR}\share\icons\${ICON_THEME}\index.theme" + + SetOutPath "$INSTDIR" + CreateShortCut "$INSTDIR\Midori.lnk" "${PRODUCT_EXE}" + + !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME} + CreateDirectory "$SMPROGRAMS\$StartmenuFolder" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Midori.lnk" "${PRODUCT_EXE}" + !insertmacro MUI_STARTMENU_WRITE_END + +!macro InstallIconThemeRenameSmall OPath IPath + File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\16x16\${IPath}.png" + File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\22x22\${IPath}.png" + File "/oname=24x24\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\24x24\${IPath}.png" + File /nonfatal "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png" +!macroend + +!macro InstallIconThemeRename OPath IPath + !insertmacro InstallIconThemeRenameSmall ${OPath} ${IPath} + File /nonfatal "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png" + File /nonfatal "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\scalable\${IPath}.svg" +!macroend + +!macro InstallIconThemeSmall IconPath + !insertmacro InstallIconThemeRenameSmall ${IconPath} ${IconPath} +!macroend + +!macro InstallIconTheme IconPath + !insertmacro InstallIconThemeRename ${IconPath} ${IconPath} +!macroend + +!macro CreateIconThemeSectionsSmall SectionPath + CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\16x16\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\22x22\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\24x24\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\32x32\${SectionPath}" +!macroend + +!macro CreateIconThemeSections SectionPath + !insertmacro CreateIconThemeSectionsSmall ${SectionPath} + CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\48x48\${SectionPath}" + CreateDirectory "$INSTDIR\share\icons\${ICON_THEME}\scalable\${SectionPath}" +!macroend + + SetOutPath "$INSTDIR\share\icons\${ICON_THEME}" + + !insertmacro CreateIconThemeSections "actions" + #!insertmacro CreateIconThemeSectionsSmall "animations" + !insertmacro CreateIconThemeSections "apps" + !insertmacro CreateIconThemeSections "categories" + !insertmacro CreateIconThemeSections "devices" + !insertmacro CreateIconThemeSections "mimetypes" + !insertmacro CreateIconThemeSections "places" + !insertmacro CreateIconThemeSections "status" + + !insertmacro InstallIconTheme "actions\bookmark-new" + !insertmacro InstallIconTheme "actions\document-open" + !insertmacro InstallIconTheme "actions\document-open-recent" + !insertmacro InstallIconTheme "actions\document-print" + !insertmacro InstallIconTheme "actions\document-properties" + !insertmacro InstallIconTheme "actions\document-save-as" + !insertmacro InstallIconTheme "actions\document-save" + !insertmacro InstallIconTheme "actions\edit-clear" + !insertmacro InstallIconTheme "actions\edit-copy" + !insertmacro InstallIconTheme "actions\edit-cut" + !insertmacro InstallIconTheme "actions\edit-delete" + !insertmacro InstallIconTheme "actions\edit-find" + !insertmacro InstallIconTheme "actions\edit-paste" + !insertmacro InstallIconTheme "actions\edit-redo" + !insertmacro InstallIconTheme "actions\edit-select-all" + !insertmacro InstallIconTheme "actions\edit-undo" + !insertmacro InstallIconTheme "actions\folder-new" + !insertmacro InstallIconTheme "actions\format-indent-more" + !insertmacro InstallIconTheme "actions\go-down" + !insertmacro InstallIconTheme "actions\go-home" + !insertmacro InstallIconTheme "actions\go-jump" + !insertmacro InstallIconTheme "actions\go-next" + !insertmacro InstallIconTheme "actions\go-previous" + !insertmacro InstallIconTheme "actions\go-up" + !insertmacro InstallIconTheme "actions\gtk-cancel" + !insertmacro InstallIconTheme "actions\gtk-edit" + !insertmacro InstallIconTheme "actions\gtk-no" + !insertmacro InstallIconTheme "actions\gtk-ok" + !insertmacro InstallIconTheme "actions\gtk-save" + !insertmacro InstallIconTheme "actions\gtk-yes" + !insertmacro InstallIconTheme "actions\help-about" + !insertmacro InstallIconTheme "actions\help-contents" + !insertmacro InstallIconTheme "actions\list-add" + !insertmacro InstallIconTheme "actions\list-remove" + !insertmacro InstallIconTheme "actions\media-skip-backward" + !insertmacro InstallIconTheme "actions\media-skip-forward" + !insertmacro InstallIconTheme "actions\process-stop" + !insertmacro InstallIconTheme "actions\stop" + !insertmacro InstallIconTheme "actions\tab-new" + !insertmacro InstallIconTheme "actions\tools-check-spelling" + !insertmacro InstallIconTheme "actions\view-fullscreen" + !insertmacro InstallIconTheme "actions\view-refresh" + !insertmacro InstallIconTheme "actions\window-close" + !insertmacro InstallIconTheme "actions\window-new" + !insertmacro InstallIconTheme "actions\zoom-in" + !insertmacro InstallIconTheme "actions\zoom-out" + + #!insertmacro InstallIconThemeSmall "animations\process-working" + + !insertmacro InstallIconTheme "apps\internet-news-reader" + !insertmacro InstallIconTheme "apps\midori" + !insertmacro InstallIconTheme "apps\preferences-desktop-theme" + !insertmacro InstallIconTheme "apps\web-browser" + + !insertmacro InstallIconTheme "categories\gtk-preferences" + + !insertmacro InstallIconTheme "devices\drive-harddisk" + !insertmacro InstallIconTheme "devices\media-optical-dvd-rom" + + !insertmacro InstallIconTheme "mimetypes\application-x-shockwave-flash" + !insertmacro InstallIconTheme "mimetypes\extension" + !insertmacro InstallIconTheme "mimetypes\gtk-file" + !insertmacro InstallIconTheme "mimetypes\image-x-generic" + !insertmacro InstallIconTheme "mimetypes\package" + !insertmacro InstallIconTheme "mimetypes\text-html" + !insertmacro InstallIconTheme "mimetypes\text-x-generic" + !insertmacro InstallIconTheme "mimetypes\text-x-javascript" + + !insertmacro InstallIconTheme "places\folder-documents" + !insertmacro InstallIconTheme "places\folder-downloads" + !insertmacro InstallIconTheme "places\folder-music" + !insertmacro InstallIconTheme "places\folder-pictures" + !insertmacro InstallIconTheme "places\folder" + !insertmacro InstallIconTheme "places\folder-videos" + !insertmacro InstallIconTheme "places\inode-directory" + !insertmacro InstallIconTheme "places\user-bookmarks" + !insertmacro InstallIconTheme "places\user-desktop" + !insertmacro InstallIconTheme "places\user-home" + !insertmacro InstallIconTheme "places\user-trash" + + !insertmacro InstallIconTheme "status\dialog-password" + !insertmacro InstallIconTheme "status\locked" + +SectionEnd + +Section "Extensions" SEC04 + SectionIn 1 + SetOverwrite ifnewer + SetOutPath "$INSTDIR\lib" + File /r "${RESOURCEDIR}\lib\midori" +SectionEnd + +Section "Language Files" SEC02 + SectionIn 1 + SetOutPath "$INSTDIR\share" + File /r "${RESOURCEDIR}\share\locale" +SectionEnd + + +Section "Desktop Shortcuts" SEC03 + SectionIn 1 + CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}" + CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}" +SectionEnd + +Section "Default Browser" SEC05 + SectionIn 1 + StrCpy $DefaultBrowser "yes" +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + !insertmacro MUI_STARTMENU_WRITE_BEGIN ${PRODUCT_NAME} + WriteIniStr "$INSTDIR\Website.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Website.lnk" "${PRODUCT_EXE}" \ + "${PRODUCT_WEB_SITE}" "${PRODUCT_EXE}" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Uninstall.lnk" "${UNINSTALL_EXE}" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Make Default.lnk" "${UNINSTALL_EXE}" \ + "/S /MAKEDEFAULT" "${PRODUCT_EXE}" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + +Section -Post + WriteUninstaller "${UNINSTALL_EXE}" + WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" Path "$INSTDIR" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" "$SMPROGRAMS\$StartmenuFolder" + ${if} $Answer == "yes" ; if user is admin + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "${UNINSTALL_EXE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "${PRODUCT_EXE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "${PRODUCT_WEB_SITE}" + WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" + WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoModify" 0x00000001 + WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001 + + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE" "" "${PRODUCT_NAME}" + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\shell\open\command" "" "${PRODUCT_EXE}" + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "HideIconsCommand" '"${UNINSTALL_EXE}" /S /HIDE' + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000000 + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "ReinstallCommand" '"${UNINSTALL_EXE}" /S /MAKEDEFAULT' + WriteRegStr HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "ShowIconsCommand" '"${UNINSTALL_EXE}" /S /SHOW' + ${endif} + + ${if} $DefaultBrowser == "yes" + ${if} $Answer == "yes" ; if user is admin + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000001 + ${endif} + WriteRegStr HKCU "${PRODUCT_BROWER_KEY}" "" "MIDORI.EXE" + WriteRegStr HKCR "http\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "http\shell\open\command" "" '${PRODUCT_EXE} "%1"' + WriteRegStr HKCR "https\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "https\shell\open\command" "" '${PRODUCT_EXE} "%1"' + ${endif} +SectionEnd + +Section Uninstall + Delete "$INSTDIR\Website.url" + Delete "${UNINSTALL_EXE}" + Delete "$INSTDIR\COPYING" + Delete "$INSTDIR\AUTHORS" + Delete "$INSTDIR\Midori.lnk" + + ; delete start menu entry + ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" + RMDir /r "$0" + + Delete "$QUICKLAUNCH\Midori.lnk" + Delete "$DESKTOP\Midori.lnk" + + RMDir /r "$INSTDIR\bin" + RMDir /r "$INSTDIR\etc" + RMDir /r "$INSTDIR\lib" + RMDir /r "$INSTDIR\share" + RMDir "$INSTDIR" + + DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}" + DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE" + + SetAutoClose true +SectionEnd + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Section descriptions ; +;;;;;;;;;;;;;;;;;;;;;;;;; +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN +!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Required program files. You cannot skip these files." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Various translations of Midori's interface." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Create shortcuts for Midori on the desktop and in the Quicklaunch Bar" +!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Available plugins like 'Advertisement Blocker', 'Form history filler' and 'Mouse Gestures'." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Make Midori the default browser." +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +;;;;;;;;;;;;;;;;;;;;; +; helper functions ; +;;;;;;;;;;;;;;;;;;;;; + +; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsis/setup.nsi) +!macro IsUserAdmin Result UName + ClearErrors + UserInfo::GetName + IfErrors Win9x + Pop $0 + StrCpy ${UName} $0 + UserInfo::GetAccountType + Pop $1 + ${if} $1 == "Admin" + StrCpy ${Result} "yes" + ${else} + StrCpy ${Result} "no" + ${endif} + Goto done + +Win9x: + StrCpy ${Result} "yes" +done: +!macroend + +; (from http://nsis.sourceforge.net/GetOptions) +Function un.GetOptions + !define GetOptions `!insertmacro GetOptionsCall` + + !macro GetOptionsCall _PARAMETERS _OPTION _RESULT + Push `${_PARAMETERS}` + Push `${_OPTION}` + Call un.GetOptions + Pop ${_RESULT} + !macroend + + Exch $1 + Exch + Exch $0 + Exch + Push $2 + Push $3 + Push $4 + Push $5 + Push $6 + Push $7 + ClearErrors + + StrCpy $2 $1 '' 1 + StrCpy $1 $1 1 + StrLen $3 $2 + StrCpy $7 0 + + begin: + StrCpy $4 -1 + StrCpy $6 '' + + quote: + IntOp $4 $4 + 1 + StrCpy $5 $0 1 $4 + StrCmp $5$7 '0' notfound + StrCmp $5 '' trimright + StrCmp $5 '"' 0 +7 + StrCmp $6 '' 0 +3 + StrCpy $6 '"' + goto quote + StrCmp $6 '"' 0 +3 + StrCpy $6 '' + goto quote + StrCmp $5 `'` 0 +7 + StrCmp $6 `` 0 +3 + StrCpy $6 `'` + goto quote + StrCmp $6 `'` 0 +3 + StrCpy $6 `` + goto quote + StrCmp $5 '`' 0 +7 + StrCmp $6 '' 0 +3 + StrCpy $6 '`' + goto quote + StrCmp $6 '`' 0 +3 + StrCpy $6 '' + goto quote + StrCmp $6 '"' quote + StrCmp $6 `'` quote + StrCmp $6 '`' quote + StrCmp $5 $1 0 quote + StrCmp $7 0 trimleft trimright + + trimleft: + IntOp $4 $4 + 1 + StrCpy $5 $0 $3 $4 + StrCmp $5 '' notfound + StrCmp $5 $2 0 quote + IntOp $4 $4 + $3 + StrCpy $0 $0 '' $4 + StrCpy $4 $0 1 + StrCmp $4 ' ' 0 +3 + StrCpy $0 $0 '' 1 + goto -3 + StrCpy $7 1 + goto begin + + trimright: + StrCpy $0 $0 $4 + StrCpy $4 $0 1 -1 + StrCmp $4 ' ' 0 +3 + StrCpy $0 $0 -1 + goto -3 + StrCpy $3 $0 1 + StrCpy $4 $0 1 -1 + StrCmp $3 $4 0 end + StrCmp $3 '"' +3 + StrCmp $3 `'` +2 + StrCmp $3 '`' 0 end + StrCpy $0 $0 -1 1 + goto end + + notfound: + SetErrors + StrCpy $0 '' + + end: + Pop $7 + Pop $6 + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Exch $0 +FunctionEnd + +Function .onInit + StrCpy "$StartmenuFolder" "Midori" + + ; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsis/setup.nsi) + ; If the user does *not* have administrator privileges, abort + StrCpy $Answer "" + StrCpy $UserName "" + !insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh + ${if} $Answer == "yes" + SetShellVarContext all ; set that e.g. shortcuts will be created for all users + ${else} + MessageBox mb_iconstop "Administrator rights required - use the portable release if that's not possible" + SetErrorLevel 740 ;ERROR_ELEVATION_REQUIRED + Quit + ${endif} + + ; prevent running multiple instances of the installer + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "midori_installer") i .r1 ?e' + Pop $R0 + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK + Abort + ; warn about a new install over an existing installation + ReadRegStr $R0 SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" + StrCmp $R0 "" finish + + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "Midori has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?" \ + /SD IDYES IDYES remove IDNO finish + +remove: + ; run the uninstaller + ClearErrors + ; we read the installation path of the old installation from the Registry + ReadRegStr $UNINSTDIR SHCTX "${PRODUCT_DIR_REGKEY}" "Path" + IfSilent dosilent nonsilent +dosilent: + ExecWait '$R0 /S _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file + Goto finish +nonsilent: + ExecWait '$R0 _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file +finish: +FunctionEnd + +Function un.onInit + StrCpy $Answer "" + !insertmacro IsUserAdmin $Answer $UserName + ${if} $Answer == "yes" + SetShellVarContext all + ${else} + SetShellVarContext current + ${endif} + + ${GetOptions} "$CMDLINE" "/MAKEDEFAULT" $0 + IfErrors 0 +2 + goto makedefault_next + + WriteRegStr HKCU "${PRODUCT_BROWER_KEY}" "" "MIDORI.EXE" + WriteRegStr HKCR "http\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "http\shell\open\command" "" '${PRODUCT_EXE} "%1"' + WriteRegStr HKCR "https\DefaultIcon" "" "${PRODUCT_EXE},0" + WriteRegStr HKCR "https\shell\open\command" "" '${PRODUCT_EXE} "%1"' + Abort +makedefault_next: + + ${GetOptions} "$CMDLINE" "/SHOW" $0 + IfErrors 0 +2 + goto show_next + + ${if} $Answer == "yes" ; if user is admin + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000001 + ${endif} + CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}" + CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}" + Abort +show_next: + + ${GetOptions} "$CMDLINE" "/HIDE" $0 + IfErrors 0 +2 + goto hide_next + + ${if} $Answer == "yes" ; if user is admin + WriteRegDWORD HKLM "${PRODUCT_BROWER_KEY}\MIDORI.EXE\InstallInfo" "IconsVisible" 0x00000000 + ${endif} + Delete "$QUICKLAUNCH\Midori.lnk" + Delete "$DESKTOP\Midori.lnk" + Abort +hide_next: + + ; If the user does *not* have administrator privileges, abort + ${if} $Answer != "yes" + ; check if the Midori has been installed with admin permisions + ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher" + ${if} $0 != "" + MessageBox MB_OK|MB_ICONSTOP "You need administrator privileges to uninstall Midori!" \ + /SD IDOK + Abort + ${endif} + ${endif} +FunctionEnd + +Function OnDirLeave + ClearErrors + SetOutPath "$INSTDIR" ; what about IfError creating $INSTDIR? + GetTempFileName $1 "$INSTDIR" ; creates tmp file (or fails) + FileOpen $0 "$1" "w" ; error to open? + FileWriteByte $0 "0" + IfErrors notPossible possible + +notPossible: + RMDir "$INSTDIR" ; removes folder if empty + MessageBox MB_OK "The given directory is not writeable. Please choose another one!" /SD IDOK + Abort +possible: + FileClose $0 + Delete "$1" +FunctionEnd diff -Nru midori-0.4.9/win32/makedist/win32-release midori-0.5.0/win32/makedist/win32-release --- midori-0.4.9/win32/makedist/win32-release 1970-01-01 00:00:00.000000000 +0000 +++ midori-0.5.0/win32/makedist/win32-release 2013-04-04 20:31:20.000000000 +0000 @@ -0,0 +1,59 @@ +#!/bin/bash + +# Copyright (C) 2013 Paweł Forysiuk +# +# 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. + + +version=$(git describe --abbrev=0) +dropbox_dir=$HOME/Dropbox/Public + +# 32-bit build +#mingw32-env +export MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw" +eval `rpm --eval %{mingw32_env}` + +./configure --prefix=$MINGW_PREFIX --enable-gtk3 +make clean +make install + +rpmquery -qa mingw32* > midori-${version}-deps-i686.txt +rm -f midori-$version.sha1 + +MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 NSIS=1 ./win32/makedist/makedist.midori +mv -v midori-${version}.7z $dropbox_dir +mv -v Midori-${version}_setup.exe $dropbox_dir + +dropbox puburl $dropbox_dir/midori-${version}.7z > release_links.txt +dropbox puburl $dropbox_dir/Midori-${version}_setup.exe >> release_links.txt + +if [ "$NO_64BIT" != "" ]; then + # 64-bit build + #mingw64-env + export MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw" + eval `rpm --eval %{mingw64_env}` + + ./configure --prefix=$MINGW_PREFIX --enable-gtk3 + make clean + make install + + rpmquery -qa mingw64* > midori-${version}-deps-x86_64.txt + MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 sh ./win32/makedist/makedist.midori x86_64-portable + mv -v midori-${version}-x86_64-portable.7z $dropbox_dir + dropbox puburl $dropbox_dir/midori-${version}-x86_64-portable.7z >> release_links.txt +fi + +echo +echo "=============================" +echo "Midori win32 release details:" +echo "Download links:" +cat release_links.txt +echo "Checksums:" +cat midori-$version.sha1 +echo "=============================" +echo diff -Nru midori-0.4.9/wscript midori-0.5.0/wscript --- midori-0.4.9/wscript 2013-03-07 17:44:14.000000000 +0000 +++ midori-0.5.0/wscript 2013-04-04 20:31:20.000000000 +0000 @@ -28,7 +28,7 @@ from Configure import find_program_impl APPNAME = 'midori' -VERSION = VERSION_FULL = '0.4.9' +VERSION = VERSION_FULL = '0.5.0' VERSION_SUFFIX = ' (%s)' % VERSION try: @@ -338,9 +338,9 @@ conf.define ('MIDORI_VERSION', VERSION) major, minor, micro = VERSION.split ('.', 2) - conf.define ('MIDORI_MAJOR_VERSION', major) - conf.define ('MIDORI_MINOR_VERSION', minor) - conf.define ('MIDORI_MICRO_VERSION', micro) + conf.define ('MIDORI_MAJOR_VERSION', int (major)) + conf.define ('MIDORI_MINOR_VERSION', int (minor)) + conf.define ('MIDORI_MICRO_VERSION', int (micro)) conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H -include config.h'.split ()) debug_level = Options.options.debug_level @@ -576,7 +576,7 @@ base = os.path.join (tempfile.gettempdir (), 'midori-test', '%s') if os.path.exists (base % ''): shutil.rmtree (base % '') - for x in ['XDG_CONFIG_HOME', 'XDG_CACHE_HOME', 'XDG_DATA_HOME', 'TMPDIR']: + for x in ['XDG_CONFIG_HOME', 'XDG_CACHE_HOME', 'XDG_DATA_HOME', 'XDG_RUNTIME_DIR', 'TMPDIR']: os.environ[x] = (base % x).lower () Utils.check_dir (os.environ[x]) @@ -585,7 +585,7 @@ def t_kill (): Utils.pprint ('RED', 'timed out') os.kill (pp.pid, signal.SIGABRT) - t = threading.Timer (42, t_kill) + t = threading.Timer (int(os.environ.get ('MIDORI_TIMEOUT', '42')), t_kill) t.start () if is_mingw (Build.bld.env): args.insert (0, 'wine') @@ -687,6 +687,8 @@ Utils.pprint ('BLUE', 'Set MIDORI_UNITS to select a subset of test cases') if not 'MIDORI_TEST' in os.environ: Utils.pprint ('BLUE', 'Set MIDORI_TEST to "valgrind" or "callgrind" to perform memory checks') + if not 'MIDORI_TIMEOUT' in os.environ: + Utils.pprint ('BLUE', 'Set MIDORI_TIMEOUT to set the maximum test runtime (default: 42)') # if test.num_tests_failed > 0 or test.num_tests_err > 0: # sys.exit (1)