diff -Nru webbrowser-app-0.23+16.04.20151124/click-hooks/hook-utils.cpp webbrowser-app-0.23+16.04.20160413/click-hooks/hook-utils.cpp --- webbrowser-app-0.23+16.04.20151124/click-hooks/hook-utils.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/click-hooks/hook-utils.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -36,6 +36,61 @@ return components.join('_'); } +QString stringFromClickLifeCyclePhase( + HookUtils::WebappHookParser::ClickLifeCyclePhase phase) +{ + using namespace HookUtils; + switch(phase) { + case WebappHookParser::CLICK_LIFECYCLE_PHASE_INSTALL: + return "install"; + break; + case WebappHookParser::CLICK_LIFECYCLE_PHASE_UNINSTALL: + return "uninstall"; + break; + case WebappHookParser::CLICK_LIFECYCLE_PHASE_UPDATE: + return "update"; + break; + } + return QString(); +} + +void executeHookDirectives(const QString& hookFilename, + HookUtils::WebappHookParser::ClickLifeCyclePhase phase) { + QFileInfo fileInfo(hookFilename); + if (!fileInfo.exists() || !fileInfo.isFile()) + { + qDebug() << "Cannot execute directives for" << hookFilename; + return; + } + + qDebug() << "Handling" << hookFilename; + + HookUtils::WebappHookParser webappHookParser; + HookUtils::WebappHookParser::Data data = + webappHookParser.parseContent( + hookFilename, + phase); + + QString appIdNoVersion = fileInfo.fileName(); + + if (data.shouldDeleteCache) + { + QDir dir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + + "/" + shortAppIdFromUnversionedAppId(appIdNoVersion)); + dir.removeRecursively(); + + qDebug() << "Removing cache from" << dir.absolutePath(); + } + if (data.shouldDeleteCookies) + { + QDir dir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + + "/" + shortAppIdFromUnversionedAppId(appIdNoVersion)); + dir.removeRecursively(); + + qDebug() << "Removing cookies from" << dir.absolutePath(); + } +} + } @@ -43,7 +98,8 @@ WebappHookParser::Data -WebappHookParser::parseContent(const QString& filename) +WebappHookParser::parseContent(const QString& filename, + ClickLifeCyclePhase clickLifeCyclePhase) { QFileInfo info(filename); if (!info.exists() || !info.isFile() || !info.isReadable()) @@ -63,11 +119,14 @@ return Data(); } - return parseDocument(document.array()); + return parseDocument( + document.array(), + clickLifeCyclePhase); } WebappHookParser::Data -WebappHookParser::parseDocument(const QJsonArray& array) +WebappHookParser::parseDocument(const QJsonArray& array, + ClickLifeCyclePhase clickLifeCyclePhase) { Data result; if (array.count() == 0 @@ -81,24 +140,24 @@ #define JSON_OBJECT_VALIDATE(o,key,predicate) \ o.contains(key) && o.value(key).predicate() - const QString UNINSTALL_KEY = "uninstall"; - if (JSON_OBJECT_VALIDATE(rootObject,UNINSTALL_KEY,isObject)) + QString phase = stringFromClickLifeCyclePhase(clickLifeCyclePhase); + if (JSON_OBJECT_VALIDATE(rootObject,phase,isObject)) { - const QString UNINSTALL_DELETE_COOKIES = "delete-cookies"; - const QString UNINSTALL_DELETE_CACHE = "delete-cache"; + const QString DELETE_COOKIES = "delete-cookies"; + const QString DELETE_CACHE = "delete-cache"; - QJsonObject uninstallObject = - rootObject.value(UNINSTALL_KEY).toObject(); - if (JSON_OBJECT_VALIDATE(uninstallObject,UNINSTALL_DELETE_COOKIES,isBool)) + QJsonObject directiveObject = + rootObject.value(phase).toObject(); + if (JSON_OBJECT_VALIDATE(directiveObject,DELETE_COOKIES,isBool)) { - result.shouldDeleteCookiesOnUninstall = - uninstallObject.value(UNINSTALL_DELETE_COOKIES).toBool(); + result.shouldDeleteCookies = + directiveObject.value(DELETE_COOKIES).toBool(); } - if (JSON_OBJECT_VALIDATE(uninstallObject,UNINSTALL_DELETE_CACHE,isBool)) + if (JSON_OBJECT_VALIDATE(directiveObject,DELETE_CACHE,isBool)) { - result.shouldDeleteCacheOnUninstall = - uninstallObject.value(UNINSTALL_DELETE_CACHE).toBool(); + result.shouldDeleteCache = + directiveObject.value(DELETE_CACHE).toBool(); } } #undef JSON_OBJECT_VALIDATE @@ -195,6 +254,9 @@ installedClickHooks.parentFolder + "/" + installedClickHooks.hookFiles[webappClickHook]; + executeHookDirectives(hookFilename, + WebappHookParser::CLICK_LIFECYCLE_PHASE_INSTALL); + QFileInfo hookFileInfo(hookFilename); QString appIdNoVersion = removeVersionFrom(hookFileInfo.completeBaseName()); @@ -211,7 +273,6 @@ void handleUninstall(const WebappClickHookInstallDescription& alreadyProcessedClickHooks , const WebappClickHookInstallDescription& currentClickHooks) { - WebappHookParser webappHookParser; QStringList deletedClickPackages = alreadyProcessedClickHooks.hookFiles.keys().toSet().subtract( currentClickHooks.hookFiles.keys().toSet()).toList(); @@ -227,24 +288,8 @@ QString hookFilename = alreadyProcessedClickHooks.parentFolder + "/" + webappClickHook; - WebappHookParser::Data data = - webappHookParser.parseContent(hookFilename); - - QFileInfo fileInfo(hookFilename); - QString appIdNoVersion = fileInfo.fileName(); - - if (data.shouldDeleteCacheOnUninstall) - { - QDir dir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) - + "/" + shortAppIdFromUnversionedAppId(appIdNoVersion)); - dir.removeRecursively(); - } - if (data.shouldDeleteCookiesOnUninstall) - { - QDir dir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) - + "/" + shortAppIdFromUnversionedAppId(appIdNoVersion)); - dir.removeRecursively(); - } + executeHookDirectives(hookFilename, + WebappHookParser::CLICK_LIFECYCLE_PHASE_UNINSTALL); qDebug() << "Uninstalling: " << hookFilename; @@ -282,6 +327,9 @@ continue; } + executeHookDirectives(hookFilename, + WebappHookParser::CLICK_LIFECYCLE_PHASE_UPDATE); + qDebug() << "Updating " << destination; if (QFile::exists(destination)) diff -Nru webbrowser-app-0.23+16.04.20151124/click-hooks/hook-utils.h webbrowser-app-0.23+16.04.20160413/click-hooks/hook-utils.h --- webbrowser-app-0.23+16.04.20151124/click-hooks/hook-utils.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/click-hooks/hook-utils.h 2016-04-13 15:22:01.000000000 +0000 @@ -39,16 +39,24 @@ struct Data { Data () - : shouldDeleteCacheOnUninstall(false) - , shouldDeleteCookiesOnUninstall(false) {} - bool shouldDeleteCacheOnUninstall; - bool shouldDeleteCookiesOnUninstall; + : shouldDeleteCache(false) + , shouldDeleteCookies(false) {} + bool shouldDeleteCache; + bool shouldDeleteCookies; + }; + + enum ClickLifeCyclePhase { + CLICK_LIFECYCLE_PHASE_INSTALL, + CLICK_LIFECYCLE_PHASE_UNINSTALL, + CLICK_LIFECYCLE_PHASE_UPDATE }; public: - Data parseContent(const QString& filename); + Data parseContent(const QString& filename, + ClickLifeCyclePhase clickLifeCyclePhase); private: - Data parseDocument(const QJsonArray& array); + Data parseDocument(const QJsonArray& array, + ClickLifeCyclePhase clickLifeCyclePhase); }; /** @@ -101,7 +109,7 @@ QString removeVersionFrom(const QString& appId); /** - * @brief handleInstalls Detects click package uninstalls and handled what's needed + * @brief handleInstalls Detects click package installs and handled what's needed * @param alreadyProcessedClickHooks * @param currentClickHooks */ diff -Nru webbrowser-app-0.23+16.04.20151124/debian/changelog webbrowser-app-0.23+16.04.20160413/debian/changelog --- webbrowser-app-0.23+16.04.20151124/debian/changelog 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/changelog 2016-04-15 10:57:19.000000000 +0000 @@ -1,8 +1,347 @@ -webbrowser-app (0.23+16.04.20151124-0ubuntu2~xenial1~qt551~1) xenial; urgency=medium +webbrowser-app (0.23+16.04.20160413-0ubuntu2~xenial1~qt560~1) xenial; urgency=medium + * Rebuild against Qt 5.6. + + -- Timo Jyrinki Fri, 15 Apr 2016 13:55:26 +0300 + +webbrowser-app (0.23+16.04.20160413-0ubuntu1) xenial; urgency=medium + + * Do not handle backspace as a window-level shortcut, as it would take + precedence over backspace events in HTML text fields. (LP: #1569938) + * Update translation template. + + -- Olivier Tilloy Wed, 13 Apr 2016 15:22:11 +0000 + +webbrowser-app (0.23+16.04.20160408.1-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Resync trunk. + + [ Loïc Molinari ] + * Made AddressBar height scalable with regards to the grid units + system. + + [ Olivier Tilloy ] + * Add dep8 tests and instructions to run them in qemu or on a phone. + Original work by Leo Arias and Vincent Ladeuil. added: debian/tests/ + debian/tests/control debian/tests/touch-session-autopilot + * Catch ESC key event one level up to ensure that it’s not incorrectly + bubbled up to the outer component. (LP: #1557016) + * Customize the contents of the media permission dialog to avoid + truncated text. (LP: #1554220) + * Do not write the session to a temporary file when no target file is + defined. + * Fix a failing unit test with Qt 5.6. (LP: #1565507) + * Fix broken webapp container autopilot tests. (LP: #1557019) + * Fix issues with item selection in the downloads page: do not allow + selecting multiple files when only one is expected do not allow + entering delete mode (with a long press on an item) while in picker + mode (LP: #1534112, #1561575) + * Fix unit tests when run under an sbuild chroot. (LP: #1567294) + * Import QQuickShortcut from Qt 5.5 to properly handle window-level + keyboard shortcuts. We cannot bump the dependency on Qt to 5.5 as + the stable overlay PPA for devices currently has Qt 5.4.1. (LP: + #1542224, #1545802, #1537782) + * Make the autopilot tests more reliable when dragging the bottom + edge. (LP: #1560109) + * Remove workaround for bug #1526940 that was fixed in the latest + release of the UITK. (LP: #1526940) + * Rename debian packages to follow new QML module naming convention. + (LP: #1342031) + * Simplify the implementation of HistoryViewWide quite a bit, and as a + side effect fix a unit test failure when run against the staging + branch of the UITK. (LP: #1567337) + + -- Olivier Tilloy Fri, 08 Apr 2016 17:07:04 +0000 + +webbrowser-app (0.23+16.04.20160405-0ubuntu1) xenial; urgency=medium + + * Add --open-external-url-in-overlay option to allow externals urls + (not part of patterns) are opened in overlays instead of external + browser (LP: #1548575) + * Handle live updates to theme color meta tag and reflect them in the + top bar background color (LP: #1550754) + * Set address bar text color to a darker version of the theme color if + one is defined in a webapp (LP: #1548573) + + -- Alexandre Abreu Tue, 05 Apr 2016 15:42:59 +0000 + +webbrowser-app (0.23+16.04.20160322-0ubuntu1) xenial; urgency=medium + + * Make google maps work in complete mode on tablets. (LP: #1560079) + * Tentative fix for a bug where the session state stored on disk is + apparently corrupted, thus discarding the current browsing session. + (LP: #1531583) + + -- Olivier Tilloy Tue, 22 Mar 2016 06:46:57 +0000 + +webbrowser-app (0.23+16.04.20160318-0ubuntu1) xenial; urgency=medium + + [ Alexandre Abreu ] + * Handle media access request from webcontainer main view and overlay + views (LP: #1554202) + + [ CI Train Bot ] + * Resync trunk. + + -- Alexandre Abreu Fri, 18 Mar 2016 15:08:11 +0000 + +webbrowser-app (0.23+16.04.20160311-0ubuntu1) xenial; urgency=medium + + [ Alberto Mardegan ] + * Activate the Webapp only when we are ready to navigate to the webapp + URL (LP: #1507995) + + -- David Barth Fri, 11 Mar 2016 12:57:01 +0000 + +webbrowser-app (0.23+16.04.20160310-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Resync trunk. + + [ Olivier Tilloy ] + * Add a touch selection controller. (LP: #1376268, #1551494) + + -- Olivier Tilloy Thu, 10 Mar 2016 05:59:53 +0000 + +webbrowser-app (0.23+16.04.20160307-0ubuntu1) xenial; urgency=medium + + * Handle context menu in overlay webviews. (LP: #1533727) + + -- Alexandre Abreu Mon, 07 Mar 2016 18:44:37 +0000 + +webbrowser-app (0.23+16.04.20160303-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Resync trunk. + + [ Olivier Tilloy ] + * Refer to @{XDG_DOWNLOAD_DIR} in the browser’s apparmor profile + instead of hardcoding "Downloads" in English. (LP: #1535666) + * Store entries in the history database on load committed, not load + succeeded. This ensures that content-initiated navigations are also + stored. (LP: #1455858, #1549780) + * Update translation template. + * Visual tweaks per designers’ review. + + -- Olivier Tilloy Thu, 03 Mar 2016 19:01:40 +0000 + +webbrowser-app (0.23+16.04.20160223-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Resync trunk. + + [ Olivier Tilloy ] + * Remove the 'formFactor' context property, and replace all its uses + by more meaningful conditions. (LP: #1446904, #1542375) + * Update translation template. + * Work around a bug in the UITK that prevents touch scrolling to the + left of the address bar by ensuring that the x coordinate of the + text field is an integer. (LP: #1546346) + * Work around bug #1546677 (UITK), by destroying the bookmark options + popover instead of hiding it. (LP: #1546627, #1546677) + + -- Olivier Tilloy Tue, 23 Feb 2016 11:24:49 +0000 + +webbrowser-app (0.23+16.04.20160215.1-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Resync trunk. + + [ Olivier Tilloy ] + * Add keyboard navigation support to narrow views (new tab view, + history view, bookmarks view, downloads view). (LP: #1539221) + * Add video-specific contextual actions. (LP: #1539676) + * Take a capture of the current page shortly after it has finished + loading to give rendering an opportunity to complete. (LP: #1540129) + * Use the new bottom edge bar to open the tabs view in autopilot + tests. + + -- Olivier Tilloy Mon, 15 Feb 2016 13:33:21 +0000 + +webbrowser-app (0.23+16.04.20160202-0ubuntu1) xenial; urgency=medium + + [ Alexandre Abreu ] + * Enhance google.com specific patterns to enable co.* & com.* patterns + (LP: #1517527) + * Make sure that the overlay views closed by the user are not part of + the list of recovered overlays opened after the oom closed the app. + (LP: #1535154) + + [ CI Train Bot ] + * Resync trunk. added: po/sco.po + + -- Alexandre Abreu Tue, 02 Feb 2016 15:33:33 +0000 + +webbrowser-app (0.23+16.04.20160129.1-0ubuntu1) xenial; urgency=medium + + * Add a UA override for desktop gmail to get rid of a misleading + warning about using a deprecated version of safari. (LP: #1452616) + * Do not connect to the loadingChanged signal, which has been + deprecated for a good while. (LP: #1538190) + * In narrow mode, when a mouse is connected, turn the bottom edge hint + into a clickable bottom edge bar. (LP: #1534239) + * Update focus highlight to match the upcoming UITK implementation. + (LP: #1539176) + * Update tab visuals to higher-contrast assets. (LP: #1534760) + + -- Olivier Tilloy Fri, 29 Jan 2016 09:41:15 +0000 + +webbrowser-app (0.23+16.04.20160122-0ubuntu1) xenial; urgency=medium + + * Automatically focus the address bar when opening a new tab in wide + mode (instead of inferring a "desktop" form factor). This is not + exactly the correct fix (which would require the QInputInfo API), + but is better than the current situation anyway. (LP: #1533317) + * Ensure that only one instance of the app is running. (LP: #1535199) + * Fix failing autopilot test. With recent changes in the UITK, swiping + a non-swipeable item to the right activates it. (LP: #1534139) + * Fix undefined reference when dragging a bookmark from one folder to + another one. + * Show the share action if Ubuntu.Content is available, regardless of + the form factor. + + -- Olivier Tilloy Fri, 22 Jan 2016 10:23:33 +0000 + +webbrowser-app (0.23+16.04.20160112.1-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Resync trunk. added: po/et.po + + [ Michael Sheldon ] + * Dynamically load the thumbnailer image provider if it's available, + otherwise fallback to mimetype images (LP: #1531179) + + [ Olivier Tilloy ] + * Address a number of minor functional and code issues in the new + downloads-in-browser functionality. (LP: #1528651) + * Restore active focus on the webview after closing the context menu. + (LP: #1526884) + + -- Olivier Tilloy Tue, 12 Jan 2016 17:44:22 +0000 + +webbrowser-app (0.23+16.04.20160108.1-0ubuntu1) xenial; urgency=medium + + * Handle theme_color page metainformation. (LP: #1477674) + + -- Alexandre Abreu Fri, 08 Jan 2016 19:33:34 +0000 + +webbrowser-app (0.23+16.04.20160106.4-0ubuntu1) xenial; urgency=medium + + [ Alexandre Abreu ] + * Handle application crashes or OOM interventions & save opened + overlays (LP: #1508969) + * Handle empty url pattern in configuration file and invalid url + pattern being specified. (LP: #1522585) + * Limited handling of custom context menu for the container + * Make the webapp-container click hook more flexible. Instead of being + able to delete cache & resource folders as the click is being + uninstalled, one can also act on them as the click is being upgraded + & installed. (LP: #1522562) + + [ CI Train Bot ] + * Resync trunk. + + -- Alexandre Abreu Wed, 06 Jan 2016 19:43:28 +0000 + +webbrowser-app (0.23+16.04.20151222.1-0ubuntu1) xenial; urgency=medium + + * Add keyboard shorcuts for 'next' (Ctrl+G) and 'previous' + (Ctrl+Shift+G) while in find-in-page mode. (LP: #1522152) + * Do not allow interacting with tabs and the chrome while the settings + page is shown. (LP: #1524353) + * Fix a crash when clearing the navigation history while the new tab + view is open. (LP: #1525937) + * Fix deleting multiple domains from the history view. Add unit tests + for the HistoryView component. (LP: #1527144) + * Fix some obvious issues in PreviewManager. (LP: #1519019) + * Fix the tab preview sometimes covering the tab chrome, in the tabs + view. Offset tab previews by 1px to cover the semi-transparent + horizontal line at the bottom of the tab chrome asset. (LP: + #1520624) + * Recognize openoffice and MS-office file formats as documents, now + that the document viewer app knows how to render them. (LP: + #1523452) + * Update translation template. + * Use the screen size (diagonal in millimeters) to determine which + default UA string and which UA overrides to use. An empirical + threshold of 19cm is being used, it is subject to further + adjustments. (LP: #1504084) + + -- Olivier Tilloy Tue, 22 Dec 2015 18:15:54 +0000 + +webbrowser-app (0.23+16.04.20151221-0ubuntu1) xenial; urgency=medium + + [ Michael Sheldon ] + * Add support for handling downloads internally within the browser. + (LP: #1354391) + + -- CI Train Bot Mon, 21 Dec 2015 20:39:36 +0000 + +webbrowser-app (0.23+16.04.20151218-0ubuntu1) xenial; urgency=medium + + [ Olivier Tilloy ] + * Work around what appears to be a regression in the UITK by + specifying a non-null delay when swiping a list item to delete it in + unit tests. (LP: #1526940) + + [ Zsombor Egri ] + * Fix local Toolbar collision with UITK 1.3 Toolbar. + + -- Zoltan Balogh Fri, 18 Dec 2015 04:08:15 +0000 + +webbrowser-app (0.23+16.04.20151204-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * New rebuild forced. + * Resync trunk. + + [ Olivier Tilloy ] + * Fix 3 autopilot test failures on desktop in narrow mode. (LP: + #1522344) + * Fix multiple keyboard focus/shortcut issues. (LP: #1522776, + #1522783, #1522757, #1522767) + * Replace custom models (HistoryDomainListChronologicalModel, + HistoryLastVisitDateModel and TopSitesModel) with simple, pure QML + SortFilterModel instances. Remove entirely HistoryTimeframeModel + which was not needed any longer. (LP: #1480947) + * Skip a test that requires HTTPS support in the test suite, which is + lacking for now. + * Update translation template. + + -- Olivier Tilloy Fri, 04 Dec 2015 11:06:50 +0000 + +webbrowser-app (0.23+16.04.20151130-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] * Rebuild against Qt 5.5.1. + * Resync trunk. + + [ Olivier Tilloy ] + * Update translation template. + + -- CI Train Bot Mon, 30 Nov 2015 14:50:57 +0000 + +webbrowser-app (0.23+16.04.20151126-0ubuntu1) xenial; urgency=medium + + [ CI Train Bot ] + * Resync trunk. + + [ Olivier Tilloy ] + * Add missing import statements, and add missing unit tests for + BookmarksView.qml and BookmarksViewWide.qml. (LP: #1515631) + * Code cleanup: remove unused include statements and forward + declarations, and convert unnecessary include statements to forward + declarations. + * Make the drawer menu flickable so that all its actions can be + accessed even on a small mobile screen in landscape orientation. + (LP: #1513348) + * Prevent click events from propagating through the expanded history + view to the view below. (LP: #1518904) + * Use the capture device display names instead of their unique ID. + (LP: #1518931) - -- Timo Jyrinki Thu, 26 Nov 2015 09:25:15 +0200 + -- Olivier Tilloy Thu, 26 Nov 2015 13:42:25 +0000 webbrowser-app (0.23+16.04.20151124-0ubuntu1) xenial; urgency=medium diff -Nru webbrowser-app-0.23+16.04.20151124/debian/control webbrowser-app-0.23+16.04.20160413/debian/control --- webbrowser-app-0.23+16.04.20151124/debian/control 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/control 2016-04-15 10:57:19.000000000 +0000 @@ -10,13 +10,18 @@ dh-apparmor, dh-translations, hardening-wrapper, - liboxideqt-qmlplugin (>= 1.9), + libapparmor-dev, + libevdev-dev, + liboxideqt-qmlplugin (>= 1.12), libqt5sql5-sqlite, + libudev-dev, + pkg-config, python3-all, python3-flake8, qml-module-qt-labs-folderlistmodel, qml-module-qt-labs-settings, qml-module-qtquick2 (>= 5.4), + qml-module-qtquick-layouts, qml-module-qttest, qt5-default, qt5-qmake, @@ -27,7 +32,7 @@ qtdeclarative5-private-dev, qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3), xvfb, -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://launchpad.net/webbrowser-app # If you aren't a member of ~phablet-team but need to upload packaging changes, # just go ahead. ~phablet-team will notice and sync up the code again. @@ -44,10 +49,10 @@ qml-module-qt-labs-folderlistmodel, qml-module-qt-labs-settings, qml-module-qtquick2 (>= 5.4), - qml-module-qtquick-dialogs, + qml-module-qtquick-layouts, qml-module-qtquick-window2 (>= 5.3), + qml-module-ubuntu-web (= ${binary:Version}), qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3), - qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}), qtdeclarative5-unity-action-plugin, Replaces: webbrowser-app-assets, qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22), @@ -68,18 +73,18 @@ libqt5sql5-sqlite, qml-module-qtquick2 (>= 5.4), qml-module-qtquick-window2 (>= 5.3), - qtdeclarative5-accounts-plugin, + qml-module-ubuntu-onlineaccounts, + qml-module-ubuntu-web (= ${binary:Version}), qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3), - qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}), qtdeclarative5-unity-action-plugin, unity-webapps-qml, webbrowser-app (= ${binary:Version}), -Suggests: qtdeclarative5-online-accounts-client0.1 (>= 0.3), +Suggests: qml-module-ubuntu-onlineaccounts-client (>= 0.3), Description: Ubuntu web applications container A lightweight webapp container tailored for Ubuntu, based on the Oxide browser engine and using the Ubuntu UI components. -Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin +Package: qml-module-ubuntu-ui-extras-browser Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -88,35 +93,67 @@ qml-module-qtquick2 (>= 5.4), qml-module-qtquick-window2 (>= 5.3), qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3), - qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}), -Replaces: webbrowser-app (<< 0.21) -Breaks: webbrowser-app (<< 0.21) -Description: Ubuntu web QML plugin - A standalone QML plugin that contains the UbuntuWebView component - , in the Ubuntu.Components.Extras.Browser module. + qml-module-ubuntu-web (= ${binary:Version}), +Replaces: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version}) +Breaks: webbrowser-app (<< 0.21), qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< ${source:Version}) +Description: Ubuntu web QML module + A standalone QML module that contains the UbuntuWebView component + , in the Ubuntu.Components.Extras.Browser namespace. -Package: qtdeclarative5-ubuntu-web-plugin +Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin +Architecture: any +Multi-Arch: same +Section: oldlibs +Depends: qml-module-ubuntu-ui-extras-browser, ${misc:Depends} +Description: transitional dummy package for the Ubuntu web QML module + A standalone QML module that contains the UbuntuWebView component + , in the Ubuntu.Components.Extras.Browser namespace. + +Package: qml-module-ubuntu-web Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, - liboxideqt-qmlplugin (>= 1.9), + liboxideqt-qmlplugin (>= 1.12), qml-module-qtquick2 (>= 5.4), qml-module-qtquick-window2 (>= 5.3), qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3), -Description: Ubuntu web QML plugin - A standalone QML plugin that contains the WebView component, - in the Ubuntu.Web module. +Breaks: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version}) +Replaces: qtdeclarative5-ubuntu-web-plugin (<< ${source:Version}) +Description: Ubuntu web QML module + A standalone QML module that contains the WebView component, + in the Ubuntu.Web namespace. -Package: qtdeclarative5-ubuntu-web-plugin-doc +Package: qtdeclarative5-ubuntu-web-plugin +Architecture: any +Multi-Arch: same +Section: oldlibs +Depends: qml-module-ubuntu-web, ${misc:Depends} +Description: transitional dummy package for the Ubuntu web QML module + A standalone QML module that contains the WebView component, + in the Ubuntu.Web namespace. + +Package: qml-module-ubuntu-web-doc Section: doc Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, -Description: Ubuntu web QML plugin HTML documentation - A standalone QML plugin that contains the WebView component, - in the Ubuntu.Web module. This package contains the public +Depends: ${misc:Depends} +Breaks: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version}) +Replaces: qtdeclarative5-ubuntu-web-plugin-doc (<< ${source:Version}) +Description: Ubuntu web QML module HTML documentation + A standalone QML module that contains the WebView component, + in the Ubuntu.Web namespace. This package contains the public + HTML documentation. + +Package: qtdeclarative5-ubuntu-web-plugin-doc +Section: oldlibs +Architecture: all +Multi-Arch: foreign +Depends: qml-module-ubuntu-web-doc, ${misc:Depends} +Description: transitional dummy package for the Ubuntu web QML module HTML documentation + A standalone QML module that contains the WebView component, + in the Ubuntu.Web namespace. This package contains the public HTML documentation. Package: webbrowser-app-autopilot diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-ui-extras-browser.install webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-ui-extras-browser.install --- webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-ui-extras-browser.install 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-ui-extras-browser.install 2016-04-15 10:57:19.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/qt5/qml/Ubuntu/Components/Extras/Browser/* diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides --- webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-ui-extras-browser.lintian-overrides 2016-04-15 10:57:19.000000000 +0000 @@ -0,0 +1,3 @@ +qml-module-ubuntu-ui-extras-browser: pkg-has-shlibs-control-file-but-no-actual-shared-libs +qml-module-ubuntu-ui-extras-browser: postinst-has-useless-call-to-ldconfig +qml-module-ubuntu-ui-extras-browser: postrm-has-useless-call-to-ldconfig diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-web-doc.install webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-web-doc.install --- webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-web-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-web-doc.install 2016-04-15 10:57:19.000000000 +0000 @@ -0,0 +1 @@ +usr/share/doc/ubuntu-web diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-web.install webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-web.install --- webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-web.install 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-web.install 2016-04-15 10:57:19.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/qt5/qml/Ubuntu/Web/* diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-web.lintian-overrides webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-web.lintian-overrides --- webbrowser-app-0.23+16.04.20151124/debian/qml-module-ubuntu-web.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qml-module-ubuntu-web.lintian-overrides 2016-04-15 10:57:19.000000000 +0000 @@ -0,0 +1,3 @@ +qml-module-ubuntu-web: pkg-has-shlibs-control-file-but-no-actual-shared-libs +qml-module-ubuntu-web: postinst-has-useless-call-to-ldconfig +qml-module-ubuntu-web: postrm-has-useless-call-to-ldconfig diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install --- webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/qt5/qml/Ubuntu/Components/Extras/Browser/* diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides --- webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -qtdeclarative5-ubuntu-ui-extras-browser-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs -qtdeclarative5-ubuntu-ui-extras-browser-plugin: postinst-has-useless-call-to-ldconfig -qtdeclarative5-ubuntu-ui-extras-browser-plugin: postrm-has-useless-call-to-ldconfig diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-web-plugin-doc.install webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-web-plugin-doc.install --- webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-web-plugin-doc.install 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-web-plugin-doc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/doc/ubuntu-web diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-web-plugin.install webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-web-plugin.install --- webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-web-plugin.install 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-web-plugin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/qt5/qml/Ubuntu/Web/* diff -Nru webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides --- webbrowser-app-0.23+16.04.20151124/debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -qtdeclarative5-ubuntu-web-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs -qtdeclarative5-ubuntu-web-plugin: postinst-has-useless-call-to-ldconfig -qtdeclarative5-ubuntu-web-plugin: postrm-has-useless-call-to-ldconfig diff -Nru webbrowser-app-0.23+16.04.20151124/debian/rules webbrowser-app-0.23+16.04.20160413/debian/rules --- webbrowser-app-0.23+16.04.20151124/debian/rules 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/rules 2016-04-15 10:57:19.000000000 +0000 @@ -7,6 +7,8 @@ export DEB_BUILD_HARDENING=1 export DPKG_GENSYMBOLS_CHECK_LEVEL=4 +BUILDHOME=/tmp/home + %: dh $@ --parallel --with translations @@ -14,7 +16,9 @@ aa-easyprof -m ./debian/webbrowser-app-apparmor.manifest --no-verify | \ egrep -v '(# Click packages|CLICK_DIR)' | \ sed 's/@{APP_PKGNAME}_@{APP_APPNAME}_@{APP_VERSION}/@{APP_PKGNAME}/g' | \ - sed 's#/run/shm/\.org\.chromium\.Chromium\.\*#/{dev,run}/shm/.org.chromium.Chromium.*#g' \ + sed 's#/run/shm/\.org\.chromium\.Chromium\.\*#/{dev,run}/shm/.org.chromium.Chromium.*#g' | \ + egrep -v 'deny /run/udev/data/\*\* r,' | \ + sed 's#^}$$#\n /sys/class/ r,\n /sys/class/input/ r,\n /run/udev/data/** r,\n}#g' \ > ./debian/usr.bin.webbrowser-app apparmor_parser -QTK ./debian/usr.bin.webbrowser-app @@ -30,3 +34,12 @@ # Unfortunately, the default build directory is not exposed # (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774). $(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) webbrowser-app.pot + +override_dh_clean: + dh_clean + rm -rf $(BUILDHOME) + +override_dh_auto_test: + mkdir -p $(BUILDHOME) + HOME=$(BUILDHOME) dh_auto_test + diff -Nru webbrowser-app-0.23+16.04.20151124/debian/tests/control webbrowser-app-0.23+16.04.20160413/debian/tests/control --- webbrowser-app-0.23+16.04.20151124/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/tests/control 2016-04-15 10:57:19.000000000 +0000 @@ -0,0 +1,26 @@ +# Copyright 2015 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# autopkgtest is a test dependency so we don't need to copy +# ubuntu-touch-session to the testbed but can use it from autopkgtest instead + +Test-Command: debian/tests/touch-session-autopilot webbrowser_app +Restrictions: allow-stderr +Classes: ubuntu-touch +Depends: webbrowser-app-autopilot, autopkgtest, python3-evdev + +Test-Command: debian/tests/touch-session-autopilot webapp_container +Restrictions: allow-stderr +Classes: ubuntu-touch +Depends: webapp-container-autopilot, autopkgtest, python3-evdev diff -Nru webbrowser-app-0.23+16.04.20151124/debian/tests/touch-session-autopilot webbrowser-app-0.23+16.04.20160413/debian/tests/touch-session-autopilot --- webbrowser-app-0.23+16.04.20151124/debian/tests/touch-session-autopilot 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/tests/touch-session-autopilot 2016-04-15 10:57:19.000000000 +0000 @@ -0,0 +1,35 @@ +#!/bin/sh + +# Copyright 2015 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This runs the $1 autopilot suite ensuring that the testbed is configured +# properly + +SUITE=$1 + +set -e + +if ! pgrep -f unity-system-compositor ; then + # We're not using Mir, setup enough of an X stack + + # FIXME: We won't need an X stack once Mir provides mirvfb or any other + # mean to test consistently on all platforms -- vila 2015-04-22 + sudo -A ADT_NORMAL_USER=${USER} sh -e /usr/share/autopkgtest/setup-commands/ubuntu-touch-session + # Import the environment produced above in the current shell + set -a + . /etc/environment +fi + +autopilot3 run -v -f subunit -o ${ADT_ARTIFACTS} ${SUITE} diff -Nru webbrowser-app-0.23+16.04.20151124/debian/webbrowser-app-apparmor.manifest webbrowser-app-0.23+16.04.20160413/debian/webbrowser-app-apparmor.manifest --- webbrowser-app-0.23+16.04.20151124/debian/webbrowser-app-apparmor.manifest 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/webbrowser-app-apparmor.manifest 2016-04-15 10:57:19.000000000 +0000 @@ -3,7 +3,6 @@ "webbrowser-app": { "binary": "/usr/bin/webbrowser-app", "profile_name": "webbrowser-app", - "template": "ubuntu-webapp", "policy_vendor": "ubuntu", "policy_version": 1.3, "policy_groups": [ @@ -31,8 +30,12 @@ }, "read_path": [ "/usr/share/applications/", + "/custom/vendor/here/location-provider/consent/*.html", "@{HOME}/.local/share/applications/", - "/custom/vendor/here/location-provider/consent/*.html" + "/sys/devices/**/input*/" + ], + "write_path": [ + "@{HOME}/@{XDG_DOWNLOAD_DIR}/" ] } } diff -Nru webbrowser-app-0.23+16.04.20151124/debian/webbrowser-app.install webbrowser-app-0.23+16.04.20160413/debian/webbrowser-app.install --- webbrowser-app-0.23+16.04.20151124/debian/webbrowser-app.install 2016-04-15 10:57:18.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/debian/webbrowser-app.install 2016-04-15 10:57:19.000000000 +0000 @@ -7,4 +7,5 @@ usr/share/applications/webbrowser-app.desktop usr/share/locale/*/LC_MESSAGES/webbrowser-app.mo usr/share/url-dispatcher/ +usr/share/content-hub/peers/webbrowser-app debian/usr.bin.webbrowser-app etc/apparmor.d diff -Nru webbrowser-app-0.23+16.04.20151124/po/aa.po webbrowser-app-0.23+16.04.20160413/po/aa.po --- webbrowser-app-0.23+16.04.20151124/po/aa.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/aa.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-08-04 21:21+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-14 22:31+0000\n" "Last-Translator: Charif AYFARAH \n" "Language-Team: Afar \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Bayis" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript Diggoyso" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Rettâ soka" @@ -129,17 +119,13 @@ msgid "Refresh page" msgstr "Gali xabbocos" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Maganak kiba doorit" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" -msgstr "" +msgstr "Idini Esseri" #: src/app/GeolocationPermissionRequest.qml:29 msgid "This page wants to know your device’s location." -msgstr "" +msgstr "A gali ku aalat elle yan arac yaaxigem faxa" #: src/app/GeolocationPermissionRequest.qml:33 msgid "Deny" @@ -194,6 +180,8 @@ "Issuer:\n" "%1" msgstr "" +"Yayyaaqi:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's issuer's address #: src/app/InvalidCertificateErrorSheet.qml:121 @@ -202,6 +190,8 @@ "Issuer address:\n" "%1" msgstr "" +"Yayyaaqi sigma:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's start date #: src/app/InvalidCertificateErrorSheet.qml:132 @@ -210,6 +200,8 @@ "Valid from:\n" "%1" msgstr "" +"Nihir lem\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's expiry date #: src/app/InvalidCertificateErrorSheet.qml:139 @@ -218,6 +210,8 @@ "Valid until:\n" "%1" msgstr "" +"Nihir idya\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's SHA1 fingerprint #: src/app/InvalidCertificateErrorSheet.qml:146 @@ -226,6 +220,8 @@ "Fingerprint (SHA1):\n" "%1" msgstr "" +"Gili-raqsa(SH1):\n" +"%1" #: src/app/InvalidCertificateErrorSheet.qml:153 msgid "" @@ -298,6 +294,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Ku kaameeraa kee mikro cultuh a xikkah idini tacee?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Ku kaameera cultuh a xikkah idini tacee?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Ku mikro cultuh a xikkah idini tacee?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (edde gaaxeenim %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Yeey" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Maleey" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript Gulgulu" @@ -364,17 +390,17 @@ #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Imissic" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Gale gey" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Gale gonnis" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -396,8 +422,8 @@ msgid "Address;URL;www" msgstr "Sigma;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Qusba Xuko" @@ -419,16 +445,20 @@ msgid "Open link in new tab" msgstr "Cixu qusba xukol fak" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Xakab" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Eydeb" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Wadir-keel" @@ -444,32 +474,37 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" +msgstr "Cixu taagis" + +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Inkig meex" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Kurut" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Eybex" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "galil gey" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Sigma gorris hinnay culus" @@ -488,8 +523,8 @@ msgstr "Addat taagis" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Kitab-astooti inkih" @@ -503,100 +538,118 @@ msgstr "Qusba oli gin" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Taagis" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" -msgstr "" +msgstr "Arcibâ-gali" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Kitab-astooti" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Gaba kaleh" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Qusba xuko" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Aydaadu" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Xukooka fak" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Qulo" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "" +msgstr "Caglan Gurra cab" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" -msgstr "" +msgstr "Caglan Gurra" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Massosu" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "" +msgstr "Duddal yan alaalaqak tawquh dagâ fan uysuttuc" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" -msgstr "" +msgstr "Duddal yan alaalaqak tawquh ESC xukkut" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "A kiba faktu abnisso doorit hinnay kalah quloh olit tet osis." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Abnisso doorit" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Qulo" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Qulo makkinna" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Qagit" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "Meexo diggos" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Dug" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Quloh tanin matan" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 gali" msgstr[1] "%1 gali" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Addah" @@ -605,56 +658,30 @@ msgstr "Ellecaboh edde boosittem" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Kimaala" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Aydaadu inkih" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Asaaku" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "Aydaadu gonnis" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" +msgstr "Sadar gurral gactek caglan xukooka alfime le" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "" +msgstr "Ah caglan xuko" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" @@ -662,16 +689,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Ossotina" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Daga raaqta aractitte" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Ahah fan edde boositte aracta mattu" @@ -683,7 +710,7 @@ #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "%1 aybullak sugen waqdi makot tekkem tan." #: src/app/webbrowser/SadTab.qml:67 msgid "" @@ -693,11 +720,11 @@ #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Xuko alif" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" -msgstr "" +msgstr "A aracta digga sinni addattino le" #: src/app/webbrowser/SecurityCertificatePopover.qml:70 msgid "Identity Not Verified" @@ -747,84 +774,84 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Koyni" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" -msgstr "" +msgstr "Gorantô motooru" #: src/app/webbrowser/SettingsPage.qml:100 msgid "Restore previous session at startup" msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Cagla & idnissoosa" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kaameera & mikro" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" -msgstr "" +msgstr "Aydaadi fokkaaqo saytunis" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Aydaadi fokkaaqo saytunisoo?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" -msgstr "" +msgstr "Aqra saytunis" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Aqra saytunisoo?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" -msgstr "" +msgstr "Saytunis" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikro" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kaameera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" -msgstr "" +msgstr "Tablê gidih edde cas" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Xuko alif" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Kal" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 #: src/app/webcontainer/webapp-container.qml:67 #, qt-format msgid "%1 - Ubuntu Web Browser" -msgstr "" +msgstr "%1 - Ubuntu Web Fokkaaqe" #: src/app/webbrowser/webbrowser-app.qml:37 #: src/app/webcontainer/webapp-container.qml:69 msgid "Ubuntu Web Browser" -msgstr "" +msgstr "Ubuntu Web Fokkaaqe" #: src/app/webcontainer/AccountChooserDialog.qml:62 msgid "" @@ -834,19 +861,19 @@ #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" -msgstr "" +msgstr "Loowta edde osis" #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "Loowtat ma xoqoysimin" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "Loowti soka" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "Alif" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" @@ -870,38 +897,46 @@ msgid "" "Choose an account now, or skip this step and choose an online account later." msgstr "" +"Loowta awayaak doorit, hinnay ama exxak kaqitay Interneet loowta sarra " +"doorit." #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "Abnisso alif" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "Kaqit" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "Loowta doorit" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Aac, makot tekkem tan." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" -msgstr "" +msgstr "Fokkaaqe" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:2 msgid "Web Browser" -msgstr "" +msgstr "Web Fokkaaqe" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:3 msgid "Browse the World Wide Web" -msgstr "" +msgstr "World Wide Web fokkaq" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" -msgstr "" +msgstr "Interneeti;WWW;Fokkaaqe;Web;Explorer" + +#~ msgid "Please choose a file" +#~ msgstr "Maganak kiba doorit" #~ msgid "Share…" #~ msgstr "Kurut..." + +#~ msgid "Open tabs" +#~ msgstr "Xukooka fak" diff -Nru webbrowser-app-0.23+16.04.20151124/po/am.po webbrowser-app-0.23+16.04.20160413/po/am.po --- webbrowser-app-0.23+16.04.20151124/po/am.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/am.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-24 13:48+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-17 13:27+0000\n" "Last-Translator: samson \n" "Language-Team: Amharic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "መሰረዣ" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "የ JavaScript ማረጋገጫ" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "ይምረጡ መተግበሪያ ይህን ፋይል ለ መክፈት ወይንም ወደ የወረዱ ፎልደር ይጨምሩት" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "መተግበሪያ ይምረጡ" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "የወረዱ" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "የ ኔትዎርክ ስህተት" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "ገጽ ማነቃቂያ" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "እባክዎን ፋይል ይምረጡ" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "ፍቃድ መጠየቂያ" @@ -319,6 +305,36 @@ "ለመድረስ ያደረጉት ሙከራ %1 ነገር ግን ሰርቨሩ ያቀረበው የ ደህንነት ምስክር ወረቀት የ እኛን የምስክር ወረቀት ምርመራ " "ባልታወቀ ምክንያት አላለፈም" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "ይህ ግዛት የ እርስዎን ካሜራ እና ማይክሮፎን ጋር እንዲደርስ ይፈቅዳሉ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "ይህ ግዛት የ እርስዎ ካሜራ ጋር እንዲደርስ ይፈቅዳሉ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "ይህ ግዛት የ እርስዎ ማይክሮፎን ጋር እንዲደርስ ይፈቅዳሉ?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (ተጣብቋል በ %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "አዎ" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "አይ" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "የ JavaScript ሙከራ" @@ -387,7 +403,7 @@ msgid "Erase" msgstr "መሰረዣ" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "መፈለጊያ በ ገጽ" @@ -417,8 +433,8 @@ msgid "Address;URL;www" msgstr "አድራሻ;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "አዲስ ንዑስ መስኮት" @@ -440,6 +456,10 @@ msgid "Open link in new tab" msgstr "አገናኝ በ አዲስ ንዑስ መስኮት መክፈቻ" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "ቪዲዮ መክፈቻ በ አዲስ ንዑስ መስኮት" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "መለጠፊያ" @@ -449,7 +469,7 @@ msgstr "እንደገና መስሪያ" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "እንደገና መጫኛ" @@ -467,12 +487,17 @@ msgid "Save link" msgstr "አገናኝ ማስቀመጫ" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "ቪዲዮ ማስቀመጫ" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "ሁሉንም መምረጫ" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "ማካፈያ" @@ -481,16 +506,16 @@ msgstr "መተው" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "መፈለጊያ በ ገጽ" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "አድራሻ ያስገቡ ወይንም ይፈልጉ" @@ -509,8 +534,8 @@ msgstr "ማስቀመጫ በ" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "ሁሉንም ምልክት ማድረጊያዎች" @@ -524,100 +549,118 @@ msgstr "አዲስ ፎልደር መፍጠሪያ" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "ማስቀመጫ" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "የ ቤት ገጽ" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "ምልክት ማድረጊያዎች" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "ጨርሷል" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "አዲስ ንዑስ መስኮት መክፈቻ" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "ታሪክ" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "ንዑስ መስኮት መክፈቻ" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "የወረዱ" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "ከ ግል ዘዴ መውጫ" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "የ ግል ዘዴ" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "ማሰናጃዎች" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "ወደ ላይ ይጥረጉ ከ ሙሉ መመልከቻ ዘዴ ለመውጣት" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "ይጫኑ መዝለያውን ከ ሙሉ መመልከቻ ዘዴ ለመውጣት" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "ይምረጡ መተግበሪያ ይህን ፋይል ለ መክፈት ወይንም ወደ የወረዱ ፎልደር ይጨምሩት" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "መተግበሪያ ይምረጡ" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "የወረዱ" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "ማውረድ አልተቻለም" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "ይቀጥሉ" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "ምርጫውን ያረጋግጡ" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "ማጥፊያ" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "የወረዱ አልተገኙም" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 ገጽ" msgstr[1] "%1 ገጾች" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "ትንሽ" @@ -626,20 +669,20 @@ msgstr "መጨረሻ የጎበኙት" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "ትናንትና" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "ሁሉንም ታሪክ" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "ዛሬ" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "ታሪክ መፈለጊያ" @@ -647,32 +690,6 @@ msgid "Going to public mode will close all private tabs" msgstr "ወደ ሕዝብ ዘዴ ሲቀይሩ የ ግል ዘዴ በሙሉ ይዘጋል" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "ይህ ግዛት የ እርስዎን ካሜራ እና ማይክሮፎን ጋር እንዲደርስ ይፈቅዳሉ?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "ይህ ግዛት የ እርስዎ ካሜራ ጋር እንዲደርስ ይፈቅዳሉ?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "ይህ ግዛት የ እርስዎ ማይክሮፎን ጋር እንዲደርስ ይፈቅዳሉ?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (ተጣብቋል በ %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "አዎ" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "አይ" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "ይህ የ ግል ዘዴ ነው" @@ -685,16 +702,16 @@ "በዚህ መስኮት ውስጥ የተመለከቱት በ እርስዎ የ መቃኛ ታሪክ ውስጥ አይታይም\n" "ነገር ግን ያስቀመጡዋቸው እልባቶች በሙሉ ይታያሉ" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "ተጨማሪ" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "ከፍተኛ ድሕረ ገጾች" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "ምንም ድሕረ ገጽ አልጎበኙም" @@ -772,8 +789,12 @@ msgid "Which is run by" msgstr "እየሄደ ያለው በ" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "ነባር" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "መፈለጊያ ሞተር" @@ -782,60 +803,56 @@ msgstr "ያለፈውን ክፍለ ጊዜ በ ሚጀምር ጊዜ እንደ ነበር መመለሻ" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "አዲስ ንዑስ መስኮት ከ መደቡ ጀርባ መክፈት ማስቻያ" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "የ ግላዊነት መመሪያ & ፍቃዶች" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "የ መቃኛ ማሰናጃዎችን እንደ ነበር መመለሻ" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "ካሜራ እና ማይክሮፎን" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "የ መቃኛ ታሪክ ማጽጃ" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "የ መቃኛውን ታሪክ ላጽዳ?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "ካሽን ማጽጃ" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Cache ን ላጽዳ?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "ማጽጃ" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "ማይክሮፎን" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "ካሜራ" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "ለመመልከት መታ ያድርጉ" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "ንዑስ መስኮቱን መዝጊያ" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "ማስወገጃ" @@ -930,6 +947,9 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "ኢንተርኔት;WWW;መቃኛ;ዌብ;መቃኛ" +#~ msgid "Please choose a file" +#~ msgstr "እባክዎን ፋይል ይምረጡ" + #~ msgid "Share…" #~ msgstr "ማካፈያ…" @@ -954,9 +974,15 @@ #~ msgid "Skip account creation step" #~ msgstr "የ መግለጫ መጨመሪያ ደረጃውን መዝለያ" +#~ msgid "Open tabs" +#~ msgstr "ንዑስ መስኮት መክፈቻ" + #~ msgid "" #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "ኡቡንቱ የ ኔትዎርክ ማሰናጃዎን እንዲመረምሩ ይመክራል እና ገጹን እንደገና ያነቃቁ" #~ msgid "Privacy" #~ msgstr "የ ግል" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "አዲስ ንዑስ መስኮት ከ መደቡ ጀርባ መክፈት ማስቻያ" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ar.po webbrowser-app-0.23+16.04.20160413/po/ar.po --- webbrowser-app-0.23+16.04.20151124/po/ar.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ar.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-07-14 12:27+0000\n" "Last-Translator: Ibrahim Saed \n" "Language-Team: Arabic \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "إلغاء" @@ -101,19 +104,6 @@ msgid "JavaScript Confirmation" msgstr "تأكيد جافا سكريبت" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "خطأ في الشبكة" @@ -132,10 +122,6 @@ msgid "Refresh page" msgstr "حدّث الصفحة" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "برجاء اختيار ملف" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "الإذن مطلوب" @@ -319,6 +305,36 @@ "لقد حاولت الوصول إلى %1 لكن الخادم قدم شهادة أمان فشلت في فحوصنا الأمنية " "لأسباب غير معروفة." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "السماح لهذا النطاق بالوصول إلى الكاميرا والميكروفون؟" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "السماح لهذا النطاق بالوصول إلى الكاميرا؟" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "السماح لهذا النطاق بالوصول إلى الميكروفون؟" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (مضمنة في %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "نعم" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "لا" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "طلب جافا سكريبت" @@ -387,7 +403,7 @@ msgid "Erase" msgstr "مسح" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "بحث في الصفحة" @@ -417,8 +433,8 @@ msgid "Address;URL;www" msgstr "عنوان;رابط;انترنت;إنترنت;شبكة" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "لسان جديد" @@ -440,6 +456,10 @@ msgid "Open link in new tab" msgstr "افتح الرابط في لسان جديد" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "لصق" @@ -449,7 +469,7 @@ msgstr "إعادة" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "أعد التحميل" @@ -467,12 +487,17 @@ msgid "Save link" msgstr "حفظ الرابط" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "اختيار الكل" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "مشاركة" @@ -481,16 +506,16 @@ msgstr "تراجع" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "بحث في الصفحة" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "ابحث أو أدخِل عنوانا" @@ -509,8 +534,8 @@ msgstr "حفظ في" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "كل العلامات" @@ -524,92 +549,110 @@ msgstr "إنشاء مجلد جديد" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "حفظ" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "الصفحة الرئيسية" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "العلامات" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "تم" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "لسان جديد" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "التأريخ" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "فتح الألسنة" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "مغادرة وضع التصفح الخاص" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "وضع التصفح الخاص" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "الإعدادات" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "اسحب لأعلى لإنهاء وضع ملء الشاشة" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "اضغط مفتاح \"ESC\" لإنهاء وضع ملء الشاشة" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "حذف" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -620,8 +663,8 @@ msgstr[4] "%1 صفحة" msgstr[5] "%1 صفحة" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "أقل" @@ -630,20 +673,20 @@ msgstr "آخر زيارة" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "أمس" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "كل التأريخ" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "اليوم" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "البحث في التأريخ" @@ -651,32 +694,6 @@ msgid "Going to public mode will close all private tabs" msgstr "الانتقال للوضع العام سيؤدي لإغلاق جميع الألسنة الخاصة" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "السماح لهذا النطاق بالوصول إلى الكاميرا والميكروفون؟" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "السماح لهذا النطاق بالوصول إلى الكاميرا؟" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "السماح لهذا النطاق بالوصول إلى الميكروفون؟" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (مضمنة في %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "نعم" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "لا" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "هذا لسان خاص" @@ -689,16 +706,16 @@ "الصفحات التي ستعرضها على هذا اللسان لن تظهر في التأريخ.\n" "العلامات التي ستأخذها سيتم حفظها على كل حال." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "المزيد" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "المواقع الأكثر زيارة" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "أنت لم تقم بزيارة أي مواقع بعد" @@ -776,8 +793,12 @@ msgid "Which is run by" msgstr "الذي يعمل من" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "محرك البحث" @@ -786,60 +807,56 @@ msgstr "استعادة الجلسة السابقة عند البدء" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "السماح بفتح الألسنة الجديدة في الخلفية" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "الخصوصية والأذونات" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "إعادة تعيين إعدادات المتصفح" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "الكاميرا والميكروفون" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "مسح تأريخ التصفح" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "مسح تأريخ التصفح؟" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "مسح الذاكرة المخبئية" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "مسح المخبأية؟" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "مسح" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "الميكروفون" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "الكاميرا" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "انقر للعرض" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "إغلاق اللسان" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "إزالة" @@ -941,8 +958,17 @@ #~ msgid "Select an account" #~ msgstr "اختر حسابًا" +#~ msgid "Please choose a file" +#~ msgstr "برجاء اختيار ملف" + #~ msgid "Share…" #~ msgstr "مشاركة..." +#~ msgid "Open tabs" +#~ msgstr "فتح الألسنة" + #~ msgid "Privacy" #~ msgstr "الخصوصية" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "السماح بفتح الألسنة الجديدة في الخلفية" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ast.po webbrowser-app-0.23+16.04.20160413/po/ast.po --- webbrowser-app-0.23+16.04.20151124/po/ast.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ast.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-31 17:20+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-03-11 23:59+0000\n" "Last-Translator: enolp \n" "Language-Team: Asturian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Encaboxar" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmación JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Escueye una aplicación p'abrir esti ficheru o añádelu a la carpeta de " -"descargues." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Escueye una aplicación" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Descargar" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Fallu de rede" @@ -134,10 +122,6 @@ msgid "Refresh page" msgstr "Recargar páxina" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Por favor, escueyi un ficheru" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Solicitú de permisu" @@ -332,6 +316,36 @@ "Intentasti acceder a %1, pero'l sirvidor presentó un certificáu de seguridá " "que nun pasó los controles por una razón desconocida." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "¿Premití-y a esti dominiu acceder a la to cámara y micrófonu?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "¿Premití-y a esti dominiu acceder a la to cámara?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "¿Premití-y a esti dominiu acceder al to micrófonu?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (integráu en %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Sí" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Non" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript Prompt" @@ -400,7 +414,7 @@ msgid "Erase" msgstr "Esborrar" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Alcontrar na páxina" @@ -430,8 +444,8 @@ msgid "Address;URL;www" msgstr "Direición;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Llingüeta nueva" @@ -453,6 +467,10 @@ msgid "Open link in new tab" msgstr "Abrir enllaz en llingüeta nueva" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Abrir videu nuna ventana nueva" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Apegar" @@ -462,7 +480,7 @@ msgstr "Refacer" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Recargar" @@ -480,12 +498,17 @@ msgid "Save link" msgstr "Guardar enllaz" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Guardar videu" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Esbillalo too" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Compartir" @@ -494,16 +517,16 @@ msgstr "Desfacer" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "alcontrar na páxina" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "guetar o introduz una direición" @@ -522,8 +545,8 @@ msgstr "Guardar en" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Tolos marcadores" @@ -537,100 +560,120 @@ msgstr "Crear una carpeta nueva" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Guardar" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Sitiu web" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Marcadores" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Fecho" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Llingüeta nueva" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historial" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Abrir llingüetes" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Descargues" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Dexar el mou priváu" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Mou priváu" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Preferencies" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Esliza arriba pa salir de pantalla completa" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Calca ESC pa salir de pantalla completa" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Escueye una aplicación p'abrir esti ficheru o añádelu a la carpeta de " +"descargues." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Escueye una aplicación" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Descargar" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Falló la descarga" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Resumir" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirmar la esbilla" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Desaniciar" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Nun hai descargues disponibles" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 páxina" msgstr[1] "%1 páxines" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menor" @@ -639,20 +682,20 @@ msgstr "Caberu visitáu" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ayeri" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Tol historial" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Güei" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "historial de gueta" @@ -660,32 +703,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Dir al mou públicu zarrará toles llingüetes privaes" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "¿Premití-y a esti dominiu acceder a la to cámara y micrófonu?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "¿Premití-y a esti dominiu acceder a la to cámara?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "¿Premití-y a esti dominiu acceder al to micrófonu?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Sí" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Non" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Esta ye una llingüeta privada" @@ -699,16 +716,16 @@ "restolador.\n" "Sicasí, los marcadores que crees conservaránse." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Más" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Meyores sitios" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Inda nun visitasti nengún sitiu" @@ -788,8 +805,12 @@ msgid "Which is run by" msgstr "Que ta dirixíu por" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Por Defeutu" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de gueta" @@ -798,60 +819,56 @@ msgstr "Restaurar la sesión anterior nel aniciu" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permitir abrir llingüetes nueves nel fondu" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privacidá y permisos" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Reaniciar les preferencies del restolador" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Cáma y micrófonu" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Llimpiar l'historial de navegación" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "¿Llimpiar l'historial de navegación?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Llimpiar la caché" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "¿Llimpiar la caché?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Llimpiar" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Micrófonu" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Cámara" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Toca pa ver" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Zarrar llingüeta" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Desaniciar" @@ -959,6 +976,9 @@ #~ msgid "Share…" #~ msgstr "Compartir..." +#~ msgid "Please choose a file" +#~ msgstr "Por favor, escueyi un ficheru" + #~ msgid "No local account found for " #~ msgstr "Nun pudo atopase nenguna cuenta llocal pa " @@ -974,6 +994,9 @@ #~ msgid "see less" #~ msgstr "ver menos" +#~ msgid "Open tabs" +#~ msgstr "Abrir llingüetes" + #~ msgid "Add" #~ msgstr "Amestar" @@ -982,3 +1005,6 @@ #~ msgid "Privacy" #~ msgstr "Intimidá" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permitir abrir llingüetes nueves nel fondu" diff -Nru webbrowser-app-0.23+16.04.20151124/po/az.po webbrowser-app-0.23+16.04.20160413/po/az.po --- webbrowser-app-0.23+16.04.20151124/po/az.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/az.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-09-03 13:54+0000\n" "Last-Translator: Nicat Məmmədov \n" "Language-Team: Azerbaijani \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "İmtina" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript Təsdiqləməsi" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Şəbəkə Xətası" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "Səhifəni yenilə" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Xahiş edirik bir fayl seçin" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "İcazə İstəyi" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript Dəvəti" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Əlfəcinlər" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -896,3 +913,6 @@ #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" msgstr "" + +#~ msgid "Please choose a file" +#~ msgstr "Xahiş edirik bir fayl seçin" diff -Nru webbrowser-app-0.23+16.04.20151124/po/be.po webbrowser-app-0.23+16.04.20160413/po/be.po --- webbrowser-app-0.23+16.04.20151124/po/be.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/be.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-10-25 21:53+0000\n" "Last-Translator: XiveZ \n" "Language-Team: Belarusian \n" @@ -16,8 +16,8 @@ "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" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Скасаваць" @@ -101,21 +104,6 @@ msgid "JavaScript Confirmation" msgstr "Пацверджанне дзеянняў JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Абярыце праграму для адкрыцця гэтага файла або дадайце яго ў тэчку атрыманых " -"файлаў." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Абраць праграму" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Атрымаць" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Памылка сеткі" @@ -129,15 +117,13 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Праверце, ці правільна наладжаная сетка, і паспрабуйце перазагрузіць " +"старонку." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Абнавіць старонку" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Калі ласка, абярыце файл" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Запыт правоў доступу" @@ -330,6 +316,37 @@ "Вы паспрабавалі адчыніць %1, але сервер уявіў сертыфікат бяспекі, якому не " "атрымалася прайсці праверкі бяспекі, па невядомай прычыне." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Дазволіць гэтаму дамену доступ да відэакамеры і мікрафона гэтага камп'ютара?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Дазволіць гэтаму дамену доступ да відэакамеры камп'ютара?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Дазволіць гэтаму дамену доступ да мікрафону камп'ютара?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (убудавана да %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Так" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Не" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Падказка JavaScript" @@ -398,7 +415,7 @@ msgid "Erase" msgstr "Сцерці" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Знайсці на старонцы" @@ -428,8 +445,8 @@ msgid "Address;URL;www" msgstr "Адрас;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Новая картка" @@ -451,6 +468,10 @@ msgid "Open link in new tab" msgstr "Адчыніць ссылку ў новай картцы" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Уставіць" @@ -460,7 +481,7 @@ msgstr "Паўтарыць" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Перазагрузіць" @@ -478,12 +499,17 @@ msgid "Save link" msgstr "Захаваць спасылку" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Пазначыць усё" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Падзяліцца" @@ -492,16 +518,16 @@ msgstr "Скасаваць" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "Знайсці на старонцы" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Шукайце або ўвядзіце адрас" @@ -520,8 +546,8 @@ msgstr "Захаваць у" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Усе закладкі" @@ -535,92 +561,112 @@ msgstr "Стварыць новую тэчку" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Захаваць" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Хатняя старонка" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Закладкі" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Зроблена" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Новая картка" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Гісторыя" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Адчыненыя карткі" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Атрыманыя" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Выйсці з канфідэнцыйнага рэжыму" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Канфідэнцы рэжым" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Наладкі" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Правядзіце пальцам уверх, каб выйсці з поўнаэкраннага рэжыму" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Націсніце клавішу Esc, каб выйсці з поўнаэкраннага рэжыму" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Абярыце праграму для адкрыцця гэтага файла або дадайце яго ў тэчку атрыманых " +"файлаў." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Абраць праграму" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Атрымаць" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Збой запампоўкі" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Працягнуць" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Пацвердзіце выбар" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Выдаліць" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Няма даступных загрузак" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -628,8 +674,8 @@ msgstr[1] "%1 старонкі" msgstr[2] "%1 старонкаў" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Меней" @@ -638,20 +684,20 @@ msgstr "Апошняе наведванне" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Учора" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Уся гісторыя" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Сёння" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "пошук у гісторыі" @@ -660,32 +706,6 @@ msgstr "" "Пераход да адкрытага рэжыму прывядзе да закрыцця ўсіх канфідэнцыйных вакенцаў" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Так" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Не" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Гэта канфідэнцыйнае вакенца" @@ -699,16 +719,16 @@ "прагляду.\n" "Зрэшты, закладкі, якія вы створыце з яе дапамогай, будуць захаваны." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Болей" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Лепшыя сайты" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Вы яшчэ не наведалі аніводнага сайта" @@ -787,8 +807,12 @@ msgid "Which is run by" msgstr "Які знаходзіцца ў веданні" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Змоўчна" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Рухавік пошуку" @@ -797,62 +821,58 @@ msgstr "Аднаўляць папярэдні сеанс пры запуску" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Дазволіць адкрыццё новых укладак ў фоне" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Канфідэнцыйнасць і правы доступу" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Скінуць налады браўзэра" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Камера і мікрафон" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Спустошыць часопіс прагляду" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Спустошыць гісторыю назірання?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Спустоўшыць кэш" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Спустошыць кэш?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Ачысціць" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Мікрафон" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Камера" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Націсніце для прагляду" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Закрыць вакенца" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Прыбраць" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -932,7 +952,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "На жаль, адбылася памылка." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -950,6 +970,9 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "Інтэрнэт;WWW;Браўзер;Веб;Праваднік" +#~ msgid "Please choose a file" +#~ msgstr "Калі ласка, абярыце файл" + #~ msgid "see more" #~ msgstr "гл. больш" @@ -968,12 +991,18 @@ #~ msgid "Share…" #~ msgstr "Падзяліцца..." +#~ msgid "Open tabs" +#~ msgstr "Адчыненыя карткі" + #~ msgid "Select an account" #~ msgstr "Выберыце конт" #~ msgid "Privacy" #~ msgstr "Прыватнасць" +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Дазволіць адкрыццё новых укладак ў фоне" + #~ msgid "" #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/bg.po webbrowser-app-0.23+16.04.20160413/po/bg.po --- webbrowser-app-0.23+16.04.20151124/po/bg.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/bg.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-01-25 21:41+0000\n" "Last-Translator: Gangov \n" "Language-Team: Bulgarian \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Отмени" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Потвърждение за JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Мрежова грешка" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "Презареди страницата" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Необходимо е разрешение" @@ -294,6 +280,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Напомняне за JavaScript" @@ -362,7 +378,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -392,8 +408,8 @@ msgid "Address;URL;www" msgstr "Адрес;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Нов подпрозорец" @@ -415,6 +431,10 @@ msgid "Open link in new tab" msgstr "Отвори линка в нов подпрозорец" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -424,7 +444,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Презареди" @@ -442,12 +462,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -456,16 +481,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -484,8 +509,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -499,100 +524,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Отметки" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -601,20 +644,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Вчера" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -622,32 +665,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -658,16 +675,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -743,8 +760,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -753,60 +774,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/bn.po webbrowser-app-0.23+16.04.20160413/po/bn.po --- webbrowser-app-0.23+16.04.20151124/po/bn.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/bn.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,27 +7,27 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-05 14:35+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2015-12-11 17:03+0000\n" +"Last-Translator: Pavak Paul \n" "Language-Team: Bengali \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" -msgstr "" +msgstr "জাভাস্ক্রিপ্ট সতর্কতা" #: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 #: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 #: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101 #: src/app/webbrowser/LeavePrivateModeDialog.qml:39 msgid "OK" -msgstr "" +msgstr "ঠিক আছে" #: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 msgid "Authentication required." @@ -41,24 +41,27 @@ #: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 msgid "Username" -msgstr "" +msgstr "ব্যবহারকারীর নাম" #: src/app/AuthenticationDialog.qml:41 src/app/HttpAuthenticationDialog.qml:49 msgid "Password" -msgstr "" +msgstr "পাসওয়ার্ড" #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" -msgstr "" +msgstr "বাতিল" #: src/app/BeforeUnloadDialog.qml:23 msgid "Confirm Navigation" @@ -66,15 +69,15 @@ #: src/app/BeforeUnloadDialog.qml:26 msgid "Leave" -msgstr "" +msgstr "প্রস্থান করুন" #: src/app/BeforeUnloadDialog.qml:31 msgid "Stay" -msgstr "" +msgstr "থাকুন" #: src/app/CertificateVerificationDialog.qml:24 msgid "This connection is untrusted" -msgstr "" +msgstr "সংযোগটি নির্ভরযোগ্য নয়" #. TRANSLATORS: %1 refers to the hostname #: src/app/CertificateVerificationDialog.qml:26 @@ -83,43 +86,32 @@ "You are trying to securely reach %1, but the security certificate of this " "website is not trusted." msgstr "" +"আপনি নিরাপদে %1 এ সংযুক্ত হতে চাচ্ছেন, কিন্তু ওয়েবসাইটটির নিরাপত্তা " +"সার্টিফিকেট নির্ভরযোগ্য নয়" #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 msgid "Proceed anyway" -msgstr "" +msgstr "এগিয়ে যান" #: src/app/CertificateVerificationDialog.qml:35 #: src/app/InvalidCertificateErrorSheet.qml:173 msgid "Back to safety" -msgstr "" +msgstr "নিরাপদে ফিরুন" #: src/app/ConfirmDialog.qml:23 msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" -msgstr "" +msgstr "নেটওয়ার্কে সমস্যা" #. TRANSLATORS: %1 refers to the URL of the current page #: src/app/ErrorSheet.qml:42 #, qt-format msgid "It appears you are having trouble viewing: %1." -msgstr "" +msgstr "সম্ভবত %1 দেখতে আপনার সমস্যা হচ্ছে।" #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." @@ -127,35 +119,31 @@ #: src/app/ErrorSheet.qml:53 msgid "Refresh page" -msgstr "" - -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" +msgstr "পেজ রিফ্রেশ করুন" #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" -msgstr "" +msgstr "অনুমতির অনুরোধ" #: src/app/GeolocationPermissionRequest.qml:29 msgid "This page wants to know your device’s location." -msgstr "" +msgstr "পেজটি আপনার ডিভাইসের অবস্থান জানতে চাচ্ছে।" #: src/app/GeolocationPermissionRequest.qml:33 msgid "Deny" -msgstr "" +msgstr "জানাব না" #: src/app/GeolocationPermissionRequest.qml:43 msgid "Allow" -msgstr "" +msgstr "জানাবো" #: src/app/InvalidCertificateErrorSheet.qml:55 msgid "This site security certificate is not trusted.\n" -msgstr "" +msgstr "এই সাইটটির সিকিউরিটি সার্টিফিকেট নির্ভরযোগ্য নয়।\n" #: src/app/InvalidCertificateErrorSheet.qml:63 msgid "Learn more" -msgstr "" +msgstr "আরো জানুন" #. TRANSLATORS: %1 refers to the SSL certificate's serial number #: src/app/InvalidCertificateErrorSheet.qml:87 @@ -164,6 +152,8 @@ "Serial number:\n" "%1" msgstr "" +"সিরিয়াল নংঃ\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's subject display name #: src/app/InvalidCertificateErrorSheet.qml:94 @@ -292,6 +282,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +380,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +410,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +433,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +446,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +464,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +483,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +511,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +526,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +646,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +667,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +677,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +762,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +776,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -896,3 +917,10 @@ #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" msgstr "" + +#~ msgid "" +#~ "Ubuntu suggests you check your network settings and try refreshing the page." +#~ msgstr "অনুগ্রহ করে আপনাকে নেটওয়ার্ক সেটিংস পরীক্ষা করে পেজটি রিফ্রেশ করুন" + +#~ msgid "Please choose a file" +#~ msgstr "অনুগ্রহ করে একটি ফাইল পছন্দ করুন" diff -Nru webbrowser-app-0.23+16.04.20151124/po/br.po webbrowser-app-0.23+16.04.20160413/po/br.po --- webbrowser-app-0.23+16.04.20151124/po/br.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/br.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-11-03 07:08+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-22 12:37+0000\n" "Last-Translator: Fohanno Thierry \n" "Language-Team: Breton \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Nullañ" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Kadarnadur JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Choazit un arload da zigeriñ ar restr-mañ pe lakait anezhi er renkell " -"pellgargañ." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Choaz un arload" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Pellgargañ" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Fazi gant ar rouedad" @@ -134,10 +122,6 @@ msgid "Refresh page" msgstr "Freskaat ar bajenn" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Dibabit ur restr, mar plij" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Goulenn aotre" @@ -333,6 +317,36 @@ "testeni surentez ha n'en deus ket gallet tremen hor gwiriadennoù surentez " "evit un abeg dianav." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Aotren an domani-mañ da vont d'ho kamera ha d'ho mikro ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Aotren an domani-mañ da vont d'ho kamera ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Aotren an domani-mañ da vont d'ho mikro ?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (e-barzh %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ya" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Arabat" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Ped JavaScript" @@ -401,7 +415,7 @@ msgid "Erase" msgstr "Diverkañ" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Kavout er bajenn" @@ -431,8 +445,8 @@ msgid "Address;URL;www" msgstr "Chomlec'h;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Ivinell nevez" @@ -454,6 +468,10 @@ msgid "Open link in new tab" msgstr "Digeriñ al liamm en un ivinell nevez" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Digeriñ ar video en un ivinell nevez" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Pegañ" @@ -463,7 +481,7 @@ msgstr "Adober" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Adkargañ" @@ -481,12 +499,17 @@ msgid "Save link" msgstr "enrollañ al liamm" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Enrollañ ar video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Diuzañ pep tra" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Rannañ" @@ -495,16 +518,16 @@ msgstr "Dizober" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "kavout er bajenn" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "klask pe ebarzhiñ ur chomlec'h" @@ -523,8 +546,8 @@ msgstr "enrollañ dindan" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "an holl sinedoù" @@ -538,100 +561,120 @@ msgstr "Krouiñ ur renkell nevez" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Enrollañ" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Degemer" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Sinedoù" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Graet eo" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Ivinell nevez" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Istor" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Ivinelloù digor" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Pellgargadennoù" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Kuitaat ar mod prevez" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Mod prevez" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Arventennoù" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Riklañ d'an nec'h evit kuitaat ar skramm leun" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Pouezañ war ESC evit kuitatt ar skramm leun" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Choazit un arload da zigeriñ ar restr-mañ pe lakait anezhi er renkell " +"pellgargañ." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Choaz un arload" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Pellgargañ" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "C'hwitet eo ar pellgargañ" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Kenderc'hel" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Kadarnaat an diuzadenn" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Diverkañ" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "N'eus ket pellgargadennoù da gaout" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 bajenn" msgstr[1] "%1 a bajennoù" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Nebeutoc'h" @@ -640,20 +683,20 @@ msgstr "Gweladennet da ziwezhañ" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Dec'h" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "An holl istor" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Hiziv" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "furchal an istor" @@ -661,32 +704,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Ma'z it d'ar mod e vo serret an holl ivinelloù prevez" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Aotren an domani-mañ da vont d'ho kamera ha d'ho mikro ?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Aotren an domani-mañ da vont d'ho kamera ?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Aotren an domani-mañ da vont d'ho mikro ?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (e-barzh %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ya" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Arabat" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Un ivinell brevez eo homañ" @@ -700,16 +717,16 @@ "merdeer.\n" "Koulskoude e vo miret ar sinedoù ho po krouet." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Muioc'h" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Lec'hiennoù gwellañ" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "N'oc'h bet e lec'hienn ebet c'hoazh" @@ -791,8 +808,12 @@ msgid "Which is run by" msgstr "Hag a zo kaset en-dro gant" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Dre ziouer" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Keflusker enklask" @@ -801,60 +822,56 @@ msgstr "Assevel an dalc'h kent pa loc'her" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Aotren digeriñ ivinelloù nevez en drekleur" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Buhez prevez & aotreoù" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Adderaouekaat arventennoù ar merdeer" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Kamera & mikro" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Diverkañ istor ar merdeiñ" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Diverkañ istor ar merdeiñ ?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Goulloiñ ar grubuilh" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Diverkañ ar grubuilh ?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Naetaat" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Mikro" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Touch da welet" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Serriñ an ivinell" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Lemel" @@ -969,6 +986,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Mont dreist ar bazenn krouiñ ur gont" +#~ msgid "Please choose a file" +#~ msgstr "Dibabit ur restr, mar plij" + #~ msgid "Share…" #~ msgstr "Rannañ..." @@ -978,6 +998,9 @@ #~ msgid "see more" #~ msgstr "gwelet muioc'h" +#~ msgid "Open tabs" +#~ msgstr "Ivinelloù digor" + #~ msgid "Add" #~ msgstr "Ouzhpennañ" @@ -986,3 +1009,6 @@ #~ msgid "Privacy" #~ msgstr "Prevezded" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Aotren digeriñ ivinelloù nevez en drekleur" diff -Nru webbrowser-app-0.23+16.04.20151124/po/bs.po webbrowser-app-0.23+16.04.20160413/po/bs.po --- webbrowser-app-0.23+16.04.20151124/po/bs.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/bs.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-08-28 16:27+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bosnian \n" @@ -16,8 +16,8 @@ "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" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -32,7 +32,7 @@ #: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 msgid "Authentication required." -msgstr "Potrebna autentifikacija" +msgstr "Potrebna autentifikacija." #. TRANSLATORS: %1 refers to the URL of the current website #: src/app/AuthenticationDialog.qml:26 @@ -46,18 +46,21 @@ #: src/app/AuthenticationDialog.qml:41 src/app/HttpAuthenticationDialog.qml:49 msgid "Password" -msgstr "Šifra" +msgstr "Lozinka" #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Odustani" @@ -75,7 +78,7 @@ #: src/app/CertificateVerificationDialog.qml:24 msgid "This connection is untrusted" -msgstr "Ova konekcija nije povjerljiva" +msgstr "Ova konekcija je nepovjerljiva" #. TRANSLATORS: %1 refers to the hostname #: src/app/CertificateVerificationDialog.qml:26 @@ -101,19 +104,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript potvrda" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Greška na mreži" @@ -126,16 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "Provjerite mrežne postavke i pokušajte osvježiti stranicu." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Osvježi stranicu" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Molimo vas da odaberete datoteku" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Potrebna dozvola" @@ -150,7 +136,7 @@ #: src/app/GeolocationPermissionRequest.qml:43 msgid "Allow" -msgstr "Dozvoli" +msgstr "Dozvoliti" #: src/app/InvalidCertificateErrorSheet.qml:55 msgid "This site security certificate is not trusted.\n" @@ -330,6 +316,36 @@ "Pokušali ste pristupiti %1 ali server je poslao sigurnosni certifikat koji " "nije prošao naše sigurnosne provjere iz nepoznatih razloga." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Dozvoliti ovoj domeni pristup kameri i mikrofonu?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Dozvoliti ovoj domeni pristup kameri?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Dozvoliti ovoj domeni pristup mikrofonu?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (ugrađen u %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Da" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Ne" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript linija" @@ -392,21 +408,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Izreži" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Obriši" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Pronađi na stranici" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Pretraži na stranici" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -428,8 +444,8 @@ msgid "Address;URL;www" msgstr "Adresa;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Novi tab" @@ -451,16 +467,20 @@ msgid "Open link in new tab" msgstr "Otovori link u novom tabu" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Otvori video klip u novom tabu" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Zalijepi" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Poništi" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Osvježi" @@ -476,151 +496,176 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "Sačuvaj link" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Sačuvaj video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Izaberi sve" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Podijeli" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Poništi" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "pronađi na stranici" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "traži ili unesi adresu" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" -msgstr "" +msgstr "Dodana skraćenica" #. TRANSLATORS: Field where the title of bookmarked URL can be changed #: src/app/webbrowser/BookmarkOptions.qml:53 msgid "Name" -msgstr "" +msgstr "Ime" #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "Spasi" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" -msgstr "" +msgstr "Sve skraćenice" #: src/app/webbrowser/BookmarkOptions.qml:93 #: src/app/webbrowser/BookmarkOptions.qml:133 msgid "New Folder" -msgstr "" +msgstr "Novi direktorij" #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "" +msgstr "Kreiraj novi direktorij" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Snimi" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Početna stranica" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Zabilješke" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Gotovo" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Novi tab" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historija" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Otvoreni tabovi" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Preuzimanja" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "" +msgstr "Napustite privatni način pregledavanja" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" -msgstr "" +msgstr "Privatni način pregledavanja" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Postavke" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "" +msgstr "Povucite prema gore da biste izašli iz cijelog ekrana" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" +msgstr "Pritisnite ESC da biste izašli iz cijelog ekrana" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Odaberite aplikaciju da otvorite ovaj dokument ili ga dodajte u preuzimajući " +"direktorij." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Odaberite aplikaciju" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Preuzmi" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Preuzimanje nije uspjelo" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Nastaviti" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "Potvrdite izbor" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Izbriši" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Nema dostupnih preuzimanja" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -628,8 +673,8 @@ msgstr[1] "%1 stranice" msgstr[2] "%1 stranice" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Manje" @@ -638,75 +683,52 @@ msgstr "Zadnje posjećeno" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Jučer" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Sva historija" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Danas" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "Historija pretraživanja" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Da" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Ne" +msgstr "Prelazak u javni način rada će zatvoriti sve privatne tabove" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "" +msgstr "Ovo je privatni tab" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" +"Stranice koje pregledavate u ovom tabu se neće pojaviti u historiji " +"pretraživanja.\n" +"Skražćenice će međutim biti sačuvane." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "" +msgstr "Opširnije" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Omiljene stranice" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "" +msgstr "Još uvijek niste posjetili nijednu stranicu" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." @@ -716,17 +738,19 @@ #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Nešto je pošslo po zlu prilikom otvaranja %1." #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"Memorija sistema je niska i stranica se ne može prikazati. Pokušajte " +"zatvoriti nepotrebne tabove i osvježite stranicu." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Zatvori tab" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -782,8 +806,12 @@ msgid "Which is run by" msgstr "Koji pokreće" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Standardno" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Pogon za pretragu" @@ -792,62 +820,58 @@ msgstr "Vrati prethodnu sesiju na pokretanju sistema" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Dopusti otvaranje novih kartica u pozadini" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Privatnost i dozvole" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Resetuj postavke pregledača" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera i mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Očisti historijat pregledanja" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Očisti historiju pretraživanja?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Očisti keš" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Očisti keš memoriju?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Očistiti" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Klikni da vidiš" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Zatvori tab" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Ukloniti" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -866,6 +890,8 @@ "No accounts have been linked to this webapp; press the item below to add an " "account." msgstr "" +"Nijedan profil nije povezan sa ovom web aplikacijom; kliknite na ikonu ispod " +"da dodate profil." #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" @@ -873,54 +899,57 @@ #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "Nemoj koristiti profil" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "Greška sa profilom" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "Zatvori" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" +"Prozor za profil nije bilo moguće otvoriti. Trenutno možete kreirati samo " +"jedan profil; zatvorite sve prozore drugih profila i pokušajte ponovo." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 treba pristupiti vašem %2 profilu." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 želi pristupiti vašem %2 profilu." #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" "Choose an account now, or skip this step and choose an online account later." msgstr "" +"Izaberite profil sada, ili preskočite ovaj korak i izaberite profil kasnije." #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "Zatvori aplikaciju" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "Preskoči" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "Odaberite profil" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Ups, nešto je pošlo po zlu." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -944,9 +973,15 @@ #~ "Ubuntu sugerira da provjerite vaše mrežne postavke i pokušate osvježiti " #~ "stranicu." +#~ msgid "Please choose a file" +#~ msgstr "Molimo vas da odaberete datoteku" + #~ msgid "Share…" #~ msgstr "Podijeli..." +#~ msgid "Open tabs" +#~ msgstr "Otvoreni tabovi" + #~ msgid "see more" #~ msgstr "vidi više" @@ -970,3 +1005,6 @@ #~ msgid "Privacy" #~ msgstr "Privatnost" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Dopusti otvaranje novih kartica u pozadini" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ca.po webbrowser-app-0.23+16.04.20160413/po/ca.po --- webbrowser-app-0.23+16.04.20151124/po/ca.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ca.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-07-04 09:58+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-23 07:57+0000\n" "Last-Translator: David Planella \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancel·la" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmació del JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Error de xarxa" @@ -126,15 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Verifiqueu els paràmetres de la xarxa i intenteu actualitzar la pàgina." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Actualitza la pàgina" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Trieu un fitxer" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Sol·licitud de permís" @@ -244,8 +231,8 @@ "You should not proceed, especially if you have never seen this warning " "before for this site." msgstr "" -"No hauríeu de continuar, especialment si no heu vist mai abans aquest avís " -"en aquest lloc." +"No hauríeu de continuar, especialment si mai heu vist aquest avís en aquest " +"lloc abans." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:187 @@ -330,6 +317,36 @@ "seguretat que ha fallat les comprovacions de seguretat per raons " "desconegudes." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Voleu permetre a aquest domini accedir a la càmera i el micròfon?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Voleu permetre a aquest domini accedir a la càmera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Voleu permetre aquest domini accedir al micròfon?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (incrustada a %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Sí" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "No" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Indicador del JavaScript" @@ -392,21 +409,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Retalla" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Suprimeix" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Cerca a la pàgina" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Cerca a la pàgina" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -428,8 +445,8 @@ msgid "Address;URL;www" msgstr "Adreça;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Pestanya nova" @@ -451,16 +468,20 @@ msgid "Open link in new tab" msgstr "Obre l'enllaç en una pestanya nova" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Obre el vídeo en una pestanya nova" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Enganxa" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Refés" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Actualitza" @@ -476,32 +497,37 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "Desa l'enllaç" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Desa el vídeo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Selecciona-ho tot" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Comparteix" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Desfés" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "cerca a la pàgina" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Cerqueu o escriviu una adreça" @@ -520,8 +546,8 @@ msgstr "Desa-la a" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Totes les adreces d'interès" @@ -535,100 +561,120 @@ msgstr "Crea una carpeta nova" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Desa" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Pàgina d'inici" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Adreces d'interès" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Fet" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Pestanya nova" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historial" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Pestanyes obertes" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Baixades" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Surt del mode privat" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Mode privat" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Paràmetres" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Llisqueu el dit per sortir de la pantalla completa" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Premeu la tecla Esc per sortir de la pantalla completa" -#: src/app/webbrowser/DownloadsPage.qml:59 -msgid "Confirm selection" +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Trieu una aplicació per a obrir aquest fitxer, o afegiu-lo a la carpeta de " +"baixades." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Trieu una aplicació" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Baixa" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Ha fallat la baixada" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Reprèn" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "Confirma la selecció" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Suprimeix" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "No hi ha cap baixada disponible" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 pàgina" msgstr[1] "%1 pàgines" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menys" @@ -637,53 +683,27 @@ msgstr "Darreres visites" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ahir" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Tot l'historial" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Avui" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "Historial de cerques" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" msgstr "Si inicieu el mode públic es tancaran totes les pestanyes privades" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Sí" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "No" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Esteu en una pestanya privada" @@ -697,38 +717,40 @@ "navegació.\n" "Les adreces d'interès que creeu es mantindran." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Més" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Llocs destacats" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Encara no heu visitat cap pàgina web" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "S'ha tancat el procés de renderització per a aquesta pestanya." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Ha fallat quelcom en mostrar %1" #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"El sistema té poca memòria i no pot mostrar aquesta pàgina web. Intenteu " +"tancar pestanyes que no siguin necessàries i torneu-la a carregar." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Tanca la pestanya" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -786,8 +808,12 @@ msgid "Which is run by" msgstr "Que s'execute per" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Predeterminat" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de cerca" @@ -796,62 +822,58 @@ msgstr "Recupera la sessió anterior a l'inici" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permet l'obertura de pestanyes noves en segon pla" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Privadesa i permisos" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Restableix la configuració del navegador" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Càmera i micròfon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Neteja l'historial de navegació" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Voleu suprimir l'historial de navegació?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Neteja la memòria cau" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Voleu netejar la memòria cau?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Neteja" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Micròfon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Càmera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Feu un toc per veure-ho" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Tanca la pestanya" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Suprimeix" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -929,7 +951,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "S'ha produït un error." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -951,6 +973,9 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "Comproveu els paràmetres de la xarxa i actualitzeu la pàgina." +#~ msgid "Please choose a file" +#~ msgstr "Trieu un fitxer" + #~ msgid "Select an account" #~ msgstr "Seleccioneu un compte" @@ -969,6 +994,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Omet el pas de creació d'un compte" +#~ msgid "Open tabs" +#~ msgstr "Pestanyes obertes" + #~ msgid "Add" #~ msgstr "Afegeix" @@ -977,3 +1005,6 @@ #~ msgid "Privacy" #~ msgstr "Privadesa" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permet l'obertura de pestanyes noves en segon pla" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ca@valencia.po webbrowser-app-0.23+16.04.20160413/po/ca@valencia.po --- webbrowser-app-0.23+16.04.20151124/po/ca@valencia.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ca@valencia.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-02-22 15:22+0000\n" "Last-Translator: David Planella \n" "Language-Team: Catalan \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:41+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancel·la" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmació del JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Error de xarxa" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "Actualitza la pàgina" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Trieu un fitxer" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Sol·licitud de permís" @@ -330,6 +316,36 @@ "seguretat que ha fallat les comprovacions de seguretat per raons " "desconegudes." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Sí" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "No" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Indicador del JavaScript" @@ -398,7 +414,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -428,8 +444,8 @@ msgid "Address;URL;www" msgstr "Adreça;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Pestanya nova" @@ -451,6 +467,10 @@ msgid "Open link in new tab" msgstr "Obri l'enllaç en una pestanya nova" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -460,7 +480,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Actualitza" @@ -478,12 +498,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Comparteix" @@ -492,16 +517,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Cerqueu o escriviu una adreça" @@ -520,8 +545,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -535,100 +560,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Adreces d'interés" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Fet" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Pestanya nova" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historial" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Pestanyes obertes" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Suprimeix" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 pàgina" msgstr[1] "%1 pàgines" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menys" @@ -637,20 +680,20 @@ msgstr "Darreres visites" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ahir" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -658,32 +701,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Sí" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "No" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -694,16 +711,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Llocs destacats" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -783,8 +800,12 @@ msgid "Which is run by" msgstr "Que s'execute per" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -793,60 +814,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Neteja" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Feu un toc per veure-ho" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -943,9 +960,15 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "Comproveu els paràmetres de la xarxa i actualitzeu la pàgina." +#~ msgid "Please choose a file" +#~ msgstr "Trieu un fitxer" + #~ msgid "Share…" #~ msgstr "Comparteix..." +#~ msgid "Open tabs" +#~ msgstr "Pestanyes obertes" + #~ msgid "Delete all history?" #~ msgstr "Voleu suprimir tot l'historial?" diff -Nru webbrowser-app-0.23+16.04.20151124/po/cs.po webbrowser-app-0.23+16.04.20160413/po/cs.po --- webbrowser-app-0.23+16.04.20151124/po/cs.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/cs.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-07-07 10:46+0000\n" "Last-Translator: Vojtěch Daněk \n" "Language-Team: Czech \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" "Language: cs\n" #: src/app/AlertDialog.qml:23 @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Zrušit" @@ -101,19 +104,6 @@ msgid "JavaScript Confirmation" msgstr "Potvrezení JavaScriptu" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Chyba sítě" @@ -126,16 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "Prosím zkontrolujte připojení a zkuste obnovit stránku." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Obnovit stránku" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Prosím, zvolte soubor" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Je požadováno povolení" @@ -330,6 +316,36 @@ "Snažili jste se připojit k %1, avšak server předložil bezpečnostní " "certifikát, který neprošel bezpečnostní kontrolou z neznámého důvodu." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Povolit této doméně přístup ke kameře a mikrofonu?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Povolit této doméně přístup ke kameře?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Povolit této doméně přístup k mikrofonu?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (přistupuje z %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ano" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Ne" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Výzva JavaScriptu" @@ -392,21 +408,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Vyjmout" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Smazat" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Najít na stránce" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Hledat na stránce" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -428,8 +444,8 @@ msgid "Address;URL;www" msgstr "Adresa;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nový panel" @@ -451,16 +467,20 @@ msgid "Open link in new tab" msgstr "Otevřít odkaz v novém panelu" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Otevřít video v novém tabu" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Vložit" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Opakovat" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Obnovit" @@ -476,32 +496,37 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "Uložit odkaz" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Uložit video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Zvolit vše" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Sdílet" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Zpět" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "najít na stránce" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "hledat nebo zadat adresu" @@ -520,8 +545,8 @@ msgstr "Uložit v" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Všechny záložky" @@ -535,92 +560,112 @@ msgstr "Vytvořit nový adresář" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Uložit" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Domovská stránka" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Záložky" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Hotovo" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nový panel" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historie" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Otevřené panely" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Stahování" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Opustit anonymní režim" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Anonymní režim" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Nastavení" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Přejeďte prstem nahoru pro ukončení módu celé obrazovky" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Stiskněte ESC pro ukončení módu celé obrazovky" -#: src/app/webbrowser/DownloadsPage.qml:59 -msgid "Confirm selection" +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Zvolte aplikaci která má otevírat soubory tohoto typu nebo ji přidejte do " +"složky pro stažení." -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Vyberte aplikaci" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Stáhnout" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Stahování selhalo" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Pokračovat" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "Potvrdit výběr" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Smazat" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Stahování je nedostupné" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -628,8 +673,8 @@ msgstr[1] "%1 stránky" msgstr[2] "%1 stránek" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Méně" @@ -638,53 +683,27 @@ msgstr "Poslední navštívené" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Včera" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Celá historie" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "dnes" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "hledání v historii" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" msgstr "Přechodem do veřejného režimu zavřete všechna anonymní okna." -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Toto je anonymní záložka" @@ -697,38 +716,40 @@ "Stránky, které budete prohlížet se neobjeví v historii prohlížení.\n" "Ovšem záložky, které vytvoříte, zůstanou zachovány." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Více" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Nejnavštěvovanější stránky" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Nebyly navštíveny žádné stránky" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "Pro tento panel vykreslování skončilo." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Bohužel se nepodařilo zobrazit %1." #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"Systém má málo paměti a nemůže zobrazit tuto webovou stránku. Ukončete " +"nepotřebné taby s zkuste to znovu." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Zavřít panel" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -783,8 +804,12 @@ msgid "Which is run by" msgstr "Který spravuje" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Výchozí" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Vyhledávač" @@ -793,62 +818,58 @@ msgstr "Obnovit předchozí relaci při startu" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Povolit otevírání nových panelů v pozadí" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Soukromí & oprávnění" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Obnovit nastavení prohlížeče" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera & mikrofón" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Smazat historii procházení" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Smazat historii?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Vymazat Cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Vyčistit vyrovnávací paměť?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" -msgstr "" +msgstr "Vyčistit" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Klepnout pro zobrazení" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Zavřít panel" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Odebrat" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -880,50 +901,52 @@ #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "Problém s účtem" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "Zavřít" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" +"Okno účtu nemůže být otevřeno. Můžete vytvářet pouze jeden účet současně, " +"prosím zkuste to znova po zavření všech ostatních oken účtů." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 vyžaduje přístup do vašeho %2 online účtu." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 žádá o přístup do vašeho %2 online účtu." #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" "Choose an account now, or skip this step and choose an online account later." -msgstr "" +msgstr "Nyní si zvolte účet nebo tento krok prozatím přeskočte." #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "Zavřít aplikaci" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "Přeskočit" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "Vyberte účet" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Jejda, něco se pokazilo." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -945,15 +968,24 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "Zkontrolujte vaše síťová nastavení a znovu zkuste načíst stránku." +#~ msgid "Please choose a file" +#~ msgstr "Prosím, zvolte soubor" + #~ msgid "Share…" #~ msgstr "Sdílet..." +#~ msgid "Open tabs" +#~ msgstr "Otevřené panely" + #~ msgid "see less" #~ msgstr "zobrazit méně" #~ msgid "see more" #~ msgstr "zobrazit více" +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Povolit otevírání nových panelů v pozadí" + #~ msgid "Privacy" #~ msgstr "Soukromí" @@ -965,3 +997,6 @@ #~ msgid "Select an account" #~ msgstr "Zvolit účet" + +#~ msgid "Add" +#~ msgstr "Přidat" diff -Nru webbrowser-app-0.23+16.04.20151124/po/cy.po webbrowser-app-0.23+16.04.20160413/po/cy.po --- webbrowser-app-0.23+16.04.20151124/po/cy.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/cy.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-07-27 14:09+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-03-07 19:36+0000\n" "Last-Translator: Owen Llywelyn \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? " "2 : 3;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Diddymu" @@ -101,19 +104,6 @@ msgid "JavaScript Confirmation" msgstr "Cadarnhad JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Gwall Rhwydwaith" @@ -126,16 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "Gwiriwch eich gosodiadau rhwydwaith a cheisiwch adnewyddu'r dudalen." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Adnewyddu tudalen" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Dewiswch ffeil" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Cais Caniatâd" @@ -330,6 +316,36 @@ "Fe geisioch chi gyrraedd %1 ond cyflwynodd y gweinydd dystystrif diogelwch " "fethodd ein gwiriad diogelwch am reswm anhysbys." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Caniatáu i'r parth hwn gael mynediad i'ch camera a'ch meicroffon?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Caniatáu i'r parth hwn gael mynediad i'ch camera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Caniatáu i'r parth hwn gael mynediad i'ch meicroffon?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (wedi ei fewnblannu yn %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Iawn" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Na" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Proc JavaScript" @@ -392,21 +408,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Torri" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Dileu" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Canfod yn y dudalen" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Canfod yn y dudalen" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -428,8 +444,8 @@ msgid "Address;URL;www" msgstr "Cyfeiriad;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Tab Newydd" @@ -451,16 +467,20 @@ msgid "Open link in new tab" msgstr "Agor dolen mewn tab newydd" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Agor fideo mewn tab newydd" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Gludo" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Ail-wneud" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Ail-lwytho" @@ -476,32 +496,37 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "Cadw'r ddolen" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Cadw fideo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Dewis popeth" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Rhannu" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Dadwneud" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "canfod yn y dudalen" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "chwiliwch neu rowch gyfeiriad" @@ -520,8 +545,8 @@ msgstr "Cadw yn" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Pob Nod Tudalen" @@ -535,92 +560,112 @@ msgstr "Creu plygell newydd" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Cadw" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Tudalen Gartref" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Nodau Tudalen" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Cwblhawyd" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Tab newydd" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Hanes" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Agor tabiau" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Llwythiadau i lawr" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Gadael Modd Preifat" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Modd Preifat" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Gosodiadau" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Traw i Fyny i Adael Sgrîn Lawn" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Pwyswch ESC i Adael Sgrîn Lawn" -#: src/app/webbrowser/DownloadsPage.qml:59 -msgid "Confirm selection" +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Dewiswch raglen i agor y ffeil hon neu ei hychwanegu i'r ffolder llwytho i " +"lawr." -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Dewis rhaglen" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Llwytho i lawr" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Methodd y llwytho i lawr" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Ailgychwyn" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "Cadarnhau'r dewis" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Dileu" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Dim llwythi ar gael" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -629,8 +674,8 @@ msgstr[2] "%1 tudalen" msgstr[3] "%1 tudalen" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Llai" @@ -639,53 +684,27 @@ msgstr "Ymwelwyd Ddiwethaf" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ddoe" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Yr Holl Hanes" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Heddiw" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "hanes chwilio" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" msgstr "Bydd symud i modd cyhoeddus yn cau pob tab preifat" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Tab preifat yw hwn" @@ -699,38 +718,40 @@ "porwr.\n" "Bydd nodau tudalen yr ydych yn eu creu yn cael eu cadw serch hynny." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Mwy" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Prif safleoedd" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Nid ydych wedi ymweld â safle eto" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "Mae'r broses llunio wedi ei gau yn y tab hwn." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Aeth rhywbeth o'i le wrth ddangos %1" #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"Mae lefel y cof y isel ar y system ac nid oes modd dangos y dudalen gwe hon. " +"Ceisiwch gau tabiau diangen ac ail lwytho." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Cau tab" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -785,8 +806,12 @@ msgid "Which is run by" msgstr "Sy'n cael ei redeg gan" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Rhagosodedig" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Peiriant chwilio" @@ -795,62 +820,58 @@ msgstr "Adfer y sesiwn flaenorol wrth gychwyn" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Caniatáu agor tabiau newydd yn y cefndir" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Preifatrwydd a chaniatâd" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Ailosod gosodiadau porwr" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Camera a meicroffon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Clirio Hanes Pori" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Clirio Hanes Pori" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Gwagio'r Celc" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Clirio'r Storfa" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" -msgstr "" +msgstr "Clirio" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Meicroffon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Camera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tapiwch i weld" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Cau'r Tab" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Tynnu" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -928,7 +949,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Wps, aeth rhywbeth o'i le." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -952,8 +973,17 @@ #~ "Mae Ubuntu yn awgrymu y dylech wirio'ch cysylltiad rhwydwaith ac adnewyddu'r " #~ "dudalen." +#~ msgid "Please choose a file" +#~ msgstr "Dewiswch ffeil" + #~ msgid "Share…" #~ msgstr "Rhannu..." +#~ msgid "Open tabs" +#~ msgstr "Agor tabiau" + #~ msgid "Privacy" #~ msgstr "Preifatrwydd" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Caniatáu agor tabiau newydd yn y cefndir" diff -Nru webbrowser-app-0.23+16.04.20151124/po/da.po webbrowser-app-0.23+16.04.20160413/po/da.po --- webbrowser-app-0.23+16.04.20151124/po/da.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/da.po 2016-04-13 15:22:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-08-03 02:48+0000\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" @@ -16,8 +16,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Annullér" @@ -101,21 +104,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript-bekræftelse" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Vælg et program som skal åbne denne fil, eller gem den i mappen med hentede " -"filer." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Vælg et program" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Hent" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Netværksfejl" @@ -129,15 +117,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Tjek venligst dine netværksindstillinger og prøv en genopfriskning af siden." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Genindlæs side" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Vælg venligst en fil" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Anmodning om tilladelse" @@ -334,6 +319,36 @@ "sikkerhedscertifikat, der ikke bestod vores sikkerhedstjek af en ukendt " "grund." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Tillad at dette domæne tilgår dit kamera og din mikrofon?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Tillad at dette domæne tilgår dit kamera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Tillad at dette domæne tilgår din mikrofon?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (indlejret i %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ja" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nej" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript-forespørgsel" @@ -402,7 +417,7 @@ msgid "Erase" msgstr "Slet" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Find på siden" @@ -432,8 +447,8 @@ msgid "Address;URL;www" msgstr "Adresse;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nyt faneblad" @@ -455,6 +470,10 @@ msgid "Open link in new tab" msgstr "Åbn link i nyt faneblad" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Åbn video i ny fane" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Indsæt" @@ -464,7 +483,7 @@ msgstr "Omgør" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Genindlæs" @@ -482,12 +501,17 @@ msgid "Save link" msgstr "Gem link" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Gem video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Vælg alt" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Del" @@ -496,16 +520,16 @@ msgstr "Fortryd" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "find på siden" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "søg eller indtast en adresse" @@ -524,8 +548,8 @@ msgstr "Gem i" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Alle bogmærker" @@ -539,100 +563,120 @@ msgstr "Opret ny mappe" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Gem" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Hjemmeside" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Bogmærker" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Færdig" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nyt faneblad" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historik" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Åbn faneblade" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Hentede filer" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Forlad privat tilstand" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privat tilstand" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Indstillinger" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Stryg opad for at forlade fuldskærm" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Tryk ESC for at forlade fuldskærm" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Vælg et program som skal åbne denne fil, eller gem den i mappen med hentede " +"filer." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Vælg et program" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Hent" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Download mislykkedes" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Genoptag" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Bekræft markering" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Slet" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Ingen tilgængelige hentede filer" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 side" msgstr[1] "%1 sider" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Mindre" @@ -641,20 +685,20 @@ msgstr "Sidst besøgt" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "I går" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Hele historikken" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "I dag" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "søg i historik" @@ -662,32 +706,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Overgangen til offentlig tilstand vil lukke alle private faner" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ja" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nej" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Dette er en privat fane" @@ -700,16 +718,16 @@ "Sider som vises i denne fane, vil ikke fremgå i din browsers historik.\n" "Bogmærker som oprettes bliver dog bevaret." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Mere" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Topsider" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Du har endnu ikke besøgt et websted" @@ -788,8 +806,12 @@ msgid "Which is run by" msgstr "Der bliver drevet af" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Standard" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Søgemaskine" @@ -798,62 +820,58 @@ msgstr "Gendan forrige session ved opstart" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Tillad åbning af nye faneblade i baggrunden" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Privatliv & tilladelser" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Nulstil browserindstillinger" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera & mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Ryd browserhistorikken" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Ryd browserhistorik?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Ryd cachen" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Ryd cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Ryd" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tap for visning" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Luk fanen" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Fjern" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -931,7 +949,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Ups! Der opstod en fejl." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -949,6 +967,9 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "Internet;nettet;WWW;Browser;netlæser;Web;Explorer;stifinder" +#~ msgid "Please choose a file" +#~ msgstr "Vælg venligst en fil" + #~ msgid "Share…" #~ msgstr "Del…" @@ -973,6 +994,9 @@ #~ "Ubuntu foreslår, at du tjekker dine netværksindstillinger og forsøger at " #~ "genindlæse siden." +#~ msgid "Open tabs" +#~ msgstr "Åbn faneblade" + #~ msgid "Delete all history?" #~ msgstr "Slet al historik?" @@ -981,3 +1005,6 @@ #~ msgid "Privacy" #~ msgstr "Privatliv" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Tillad åbning af nye faneblade i baggrunden" diff -Nru webbrowser-app-0.23+16.04.20151124/po/de.po webbrowser-app-0.23+16.04.20160413/po/de.po --- webbrowser-app-0.23+16.04.20151124/po/de.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/de.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-31 13:39+0000\n" -"Last-Translator: Tobias Bannert \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2015-12-26 18:21+0000\n" +"Last-Translator: Torsten Franz \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Abbrechen" @@ -100,20 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript-Bestätigung" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Anwendung zum Öffnen der Datei auswählen oder im Download-Ordner speichern." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Eine Anwendung auswählen" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Herunterladen" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Netzwerkfehler" @@ -134,10 +123,6 @@ msgid "Refresh page" msgstr "Seite neu laden" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Bitte eine Datei auswählen" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Zugriffsanfrage" @@ -334,6 +319,36 @@ "Sicherheitszertifikat vorgelegt, welches unsere Sicherheitsüberprüfungen aus " "einem unbekannten Grund nicht bestand." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Dieser Domain den Zugriff zur Kamera und Mikrofon erlauben?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Dieser Domain den Zugriff zur Kamera erlauben?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Dieser Domain den Zugriff zum Mikrofon erlauben?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (eingebettet in %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ja" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nein" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript-Meldung" @@ -402,7 +417,7 @@ msgid "Erase" msgstr "Löschen" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Suche in Seite" @@ -432,8 +447,8 @@ msgid "Address;URL;www" msgstr "Adresse;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Neuer Reiter" @@ -455,6 +470,10 @@ msgid "Open link in new tab" msgstr "Verweis in neuem Reiter öffnen" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Video in neuem Tab öffnen" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Einfügen" @@ -464,7 +483,7 @@ msgstr "Wiederholen" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Neu laden" @@ -482,12 +501,17 @@ msgid "Save link" msgstr "Verweis speichern" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Video speichern" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Alle auswählen" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Teilen" @@ -496,16 +520,16 @@ msgstr "Rückgängig" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "Suche in Seite" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Suchen oder eine Adresse eingeben" @@ -524,8 +548,8 @@ msgstr "Speichern unter" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Alle Lesezeichen" @@ -539,100 +563,119 @@ msgstr "Neuen Ordner erstellen" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Speichern" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Startseite" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Lesezeichen" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Fertig" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Neuer Reiter" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Verlauf" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Offene Reiter" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Übertragungen" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Privaten Modus verlassen" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privater Modus" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Einstellungen" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Nach oben wischen, um das Vollbild zu beenden" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "ESC drücken, um das Vollbild zu beenden" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Anwendung zum Öffnen der Datei auswählen oder im Download-Ordner speichern." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Eine Anwendung auswählen" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Herunterladen" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Herunterladen ist fehlgeschlagen" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Fortsetzen" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Auswahl bestätigen" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Entfernen" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Keine Downloads verfügbar" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 Seite" msgstr[1] "%1 Seiten" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Weniger" @@ -641,20 +684,20 @@ msgstr "Zuletzt besucht" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Gestern" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Vollständiger Verlauf" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Heute" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "Verlauf durchsuchen" @@ -662,32 +705,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Das Wechseln zum öffentlichen Modus schließt alle privaten Reiter" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Dieser Domain den Zugriff zur Kamera und Mikrofon erlauben?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Dieser Domain den Zugriff zur Kamera erlauben?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Dieser Domain den Zugriff zum Mikrofon erlauben?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (eingebettet in %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ja" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nein" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Dies ist ein privater Reiter" @@ -701,16 +718,16 @@ "Verlauf.\n" "Lesezeichen, die Sie anlegen, werden jedoch beibehalten." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Mehr" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Beliebte Seiten" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Sie haben bisher noch keine Seite besucht." @@ -794,8 +811,12 @@ msgid "Which is run by" msgstr "Was betrieben wird von" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Standardeinstellung" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Suchmaschine" @@ -804,60 +825,56 @@ msgstr "Vorige Sitzung beim Start wiederherstellen" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Öffnen von neuen Reitern im Hintergrund erlauben" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Datenschutz & Zugriffsrechte" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Browsereinstellungen zurücksetzen" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Kamera & Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Browserverlauf löschen" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Browserverlauf löschen?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Puffer leeren" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Cache leeren?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Leeren" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tippen zum Betrachten" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Reiter schließen" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Entfernen" @@ -984,8 +1001,17 @@ #~ msgid "Add" #~ msgstr "Neu" +#~ msgid "Please choose a file" +#~ msgstr "Bitte eine Datei auswählen" + #~ msgid "No local account found for " #~ msgstr "Keine lokales Konto gefunden für " +#~ msgid "Open tabs" +#~ msgstr "Offene Reiter" + #~ msgid "Privacy" #~ msgstr "Datenschutz" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Öffnen von neuen Reitern im Hintergrund erlauben" diff -Nru webbrowser-app-0.23+16.04.20151124/po/el.po webbrowser-app-0.23+16.04.20160413/po/el.po --- webbrowser-app-0.23+16.04.20151124/po/el.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/el.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-09-06 08:20+0000\n" -"Last-Translator: j3lc \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-03-15 20:00+0000\n" +"Last-Translator: Aggelos Arnaoutis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Ακύρωση" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Επιβεβαίωση JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Επιλέξτε μια εφαρμογή για να ανοίξετε αυτό το αρχείο ή προσθέστε το στον " -"φάκελο λήψεις." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Επιλέξτε μια εφαρμογή" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Λήψη" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Σφάλμα δικτύου" @@ -128,15 +116,13 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Παρακαλούμε ελέγξτε τις ρυθμίσεις δικτύου σας και δοκιμάστε να " +"επαναφορτώσετε τη σελίδα." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Ανανέωση σελίδας" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Παρακαλώ επιλέξτε ένα αρχείο" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Αίτηση αδειοδότησης" @@ -332,6 +318,38 @@ "πιστοποιητικό ασφαλείας που για άγνωστους λόγους απέτυχε στους ελέγχους μας " "ασφαλείας." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Επιτρέπετε σε αυτή την τοποθεσία να έχει πρόσβαση στην κάμερα και το " +"μικρόφωνό σας;" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Επιτρέπετε σε αυτή την τοποθεσία να έχει πρόσβαση στην κάμερά σας;" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Επιτρέπετε σε αυτή την τοποθεσία να έχει πρόσβαση στο μικρόφωνό σας;" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (ενσωματωμένο στο %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ναι" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Όχι" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Προτροπή JavaScript" @@ -400,7 +418,7 @@ msgid "Erase" msgstr "Διαγραφή" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Εύρεση στη σελίδα" @@ -430,8 +448,8 @@ msgid "Address;URL;www" msgstr "Διεύθυνση;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Νέα καρτέλα" @@ -453,6 +471,10 @@ msgid "Open link in new tab" msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Άνοιγμα βίντεο σε νέα καρτέλα" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Επικόλληση" @@ -462,7 +484,7 @@ msgstr "Επανάληψη" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Επαναφόρτωση" @@ -480,12 +502,17 @@ msgid "Save link" msgstr "Αποθήκευση συνδέσμου" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Αποθήκευση βίντεο" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Επιλογή όλων" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Κοινοποίηση" @@ -494,16 +521,16 @@ msgstr "Αναίρεση" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "εύρεση στη σελίδα" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "αναζήτηση ή εισαγωγή διεύθυνσης" @@ -522,8 +549,8 @@ msgstr "Αποθήκευση σε" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Όλοι οι σελιδοδείκτες" @@ -537,100 +564,120 @@ msgstr "Δημιουργία νέου φακέλου" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Αποθήκευση" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Αρχική σελίδα" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Ολοκληρώθηκε" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Νέα καρτέλα" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Ιστορικό" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Ανοιχτές καρτέλες" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Λήψεις" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Επιστροφή από Ιδιωτική περιήγηση" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Ιδιωτική περιήγηση" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Ρυθμίσεις" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Σύρτε προς τα πάνω για Έξοδο από Πλήρη οθόνη" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Πατήστε ESC για έξοδο από Πλήρη οθόνη" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Επιλέξτε μια εφαρμογή για να ανοίξετε αυτό το αρχείο ή προσθέστε το στον " +"φάκελο λήψεις." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Επιλέξτε μια εφαρμογή" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Λήψη" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Αποτυχία λήψης" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Συνέχιση" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Επιβεβαίωση επιλογής" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Διαγραφή" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Δεν υπάρχουν διαθέσιμες λήψεις" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 σελίδα" msgstr[1] "%1 σελίδες" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Λιγότερα" @@ -639,20 +686,20 @@ msgstr "Τελευταία επίσκεψη" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Χθες" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Όλο το ιστορικό" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Σήμερα" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "Ιστορικό αναζήτησης" @@ -661,32 +708,6 @@ msgstr "" "Η μετάβαση προς δημόσια περιήγηση θα κλείσει όλες τις ιδιωτικές καρτέλες" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ναι" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Όχι" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Αυτή είναι μια ιδιωτική καρτέλα" @@ -700,16 +721,16 @@ "πλοήγησής σας.\n" "Ωστόσο, οι σελιδοδείκτες που θα δημιουργήσετε, θα διατηρηθούν." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Περισσότερα" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Συχνά επισκεπτόμενες ιστοσελίδες" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Δεν έχετε επισκεφτεί ακόμα κάποιο δικτυακό τόπο" @@ -794,8 +815,12 @@ msgid "Which is run by" msgstr "Που διαχειρίζεται" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Προεπιλογή" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Μηχανή αναζήτησης" @@ -804,62 +829,58 @@ msgstr "Επαναφορά προηγούμενης συνεδρίας στο ξεκίνημα" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Επίτρεψη ανοίγματος νέων κατρελών στο παρασκήνιο" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Ιδιωτικότητα & δικαιώματα" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Επαναφορά ρυθμίσεων περιηγητή" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Κάμερα & μικρόφωνο" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Εκκαθάριση ιστορικού περιήγησης" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Καθαρισμός ιστορικού περιήγησης;" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Καθαρισμός προσωρινής μνήμης" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Καθαρισμός λανθάνουσας μνήμης;" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Καθαρισμός" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Μικρόφωνο" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Κάμερα" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Πατήστε για εμφάνιση" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Κλείσιμο Καρτέλας" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Αφαίρεση" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -941,7 +962,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Ωχ, κάτι πήγε στραβά." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -980,6 +1001,12 @@ #~ msgid "Delete all history?" #~ msgstr "Εκκαθάριση ολόκληρου του ιστορικού;" +#~ msgid "Please choose a file" +#~ msgstr "Παρακαλώ επιλέξτε ένα αρχείο" + +#~ msgid "Open tabs" +#~ msgstr "Ανοιχτές καρτέλες" + #~ msgid "Add" #~ msgstr "Προσθήκη" @@ -991,3 +1018,6 @@ #~ msgid "Privacy" #~ msgstr "Ιδιωτικότητα" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Επίτρεψη ανοίγματος νέων κατρελών στο παρασκήνιο" diff -Nru webbrowser-app-0.23+16.04.20151124/po/en_AU.po webbrowser-app-0.23+16.04.20160413/po/en_AU.po --- webbrowser-app-0.23+16.04.20151124/po/en_AU.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/en_AU.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-24 13:07+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-19 09:49+0000\n" "Last-Translator: Jared Norris \n" "Language-Team: English (Australia) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:41+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancel" @@ -100,20 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript Confirmation" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Choose an application to open this file or add it to the downloads folder." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Choose an application" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Download" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Network Error" @@ -132,10 +121,6 @@ msgid "Refresh page" msgstr "Refresh page" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Please choose a file" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Permission Request" @@ -330,6 +315,36 @@ "You attempted to reach %1 but the server presented a security certificate " "which failed our security checks for an unknown reason." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Allow this domain to access your camera and microphone?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Allow this domain to access your camera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Allow this domain to access your microphone?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (embedded in %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Yes" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "No" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript Prompt" @@ -398,7 +413,7 @@ msgid "Erase" msgstr "Erase" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Find in page" @@ -428,8 +443,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "New Tab" @@ -451,6 +466,10 @@ msgid "Open link in new tab" msgstr "Open link in new tab" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Open video in new tab" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Paste" @@ -460,7 +479,7 @@ msgstr "Redo" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Reload" @@ -478,12 +497,17 @@ msgid "Save link" msgstr "Save link" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Save video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Select all" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Share" @@ -492,16 +516,16 @@ msgstr "Undo" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "find in page" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "search or enter an address" @@ -520,8 +544,8 @@ msgstr "Save in" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "All Bookmarks" @@ -535,100 +559,119 @@ msgstr "Create new folder" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Save" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Homepage" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Bookmarks" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Done" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "New tab" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "History" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Open tabs" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Downloads" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Leave Private Mode" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Private Mode" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Settings" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Swipe Up To Exit Full Screen" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Press ESC To Exit Full Screen" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Choose an application to open this file or add it to the downloads folder." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Choose an application" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Download" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Download failed" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Resume" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirm selection" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Delete" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "No downloads available" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 page" msgstr[1] "%1 pages" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Less" @@ -637,20 +680,20 @@ msgstr "Last Visited" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Yesterday" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "All History" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Today" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "search history" @@ -658,32 +701,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Going to public mode will close all private tabs" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Allow this domain to access your camera and microphone?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Allow this domain to access your camera?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Allow this domain to access your microphone?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (embedded in %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Yes" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "No" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "This is a private tab" @@ -696,16 +713,16 @@ "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "More" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Top sites" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "You haven't visited any sites yet" @@ -783,8 +800,12 @@ msgid "Which is run by" msgstr "Which is run by" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Default" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Search engine" @@ -793,60 +814,56 @@ msgstr "Restore previous session at startup" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Allow opening new tabs in background" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privacy & permissions" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Reset browser settings" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Camera & microphone" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Clear Browsing History" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Clear Browsing History?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Clear Cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Clear Cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Clear" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Microphone" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Camera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tap to view" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Close Tab" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Remove" @@ -952,6 +969,9 @@ #~ msgid "Share…" #~ msgstr "Share…" +#~ msgid "Please choose a file" +#~ msgstr "Please choose a file" + #~ msgid "see more" #~ msgstr "see more" @@ -967,6 +987,9 @@ #~ msgid "Select an account" #~ msgstr "Select an account" +#~ msgid "Open tabs" +#~ msgstr "Open tabs" + #~ msgid "Add" #~ msgstr "Add" @@ -975,3 +998,6 @@ #~ msgid "Privacy" #~ msgstr "Privacy" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Allow opening new tabs in background" diff -Nru webbrowser-app-0.23+16.04.20151124/po/en_GB.po webbrowser-app-0.23+16.04.20160413/po/en_GB.po --- webbrowser-app-0.23+16.04.20151124/po/en_GB.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/en_GB.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-11-01 02:54+0000\n" -"Last-Translator: James Tait \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-18 06:29+0000\n" +"Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:41+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancel" @@ -100,20 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript Confirmation" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Choose an application to open this file or add it to the downloads folder." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Choose an application" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Download" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Network Error" @@ -132,10 +121,6 @@ msgid "Refresh page" msgstr "Refresh page" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Please choose a file" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Permission Request" @@ -330,6 +315,36 @@ "You attempted to reach %1 but the server presented a security certificate " "which failed our security checks for an unknown reason." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Allow this domain to access your camera and microphone?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Allow this domain to access your camera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Allow this domain to access your microphone?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (embedded in %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Yes" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "No" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript Prompt" @@ -398,7 +413,7 @@ msgid "Erase" msgstr "Erase" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Find on page" @@ -428,8 +443,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "New Tab" @@ -451,6 +466,10 @@ msgid "Open link in new tab" msgstr "Open link in new tab" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Open video in new tab" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Paste" @@ -460,7 +479,7 @@ msgstr "Redo" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Reload" @@ -478,12 +497,17 @@ msgid "Save link" msgstr "Save link" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Save video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Select all" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Share" @@ -492,16 +516,16 @@ msgstr "Undo" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "find on page" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "search or enter an address" @@ -520,8 +544,8 @@ msgstr "Save in" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "All Bookmarks" @@ -535,100 +559,119 @@ msgstr "Create new folder" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Save" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Homepage" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Bookmarks" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Done" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "New tab" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "History" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Open tabs" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Downloads" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Leave Private Mode" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Private Mode" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Settings" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Swipe Up To Exit Full Screen" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Press ESC To Exit Full Screen" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Choose an application to open this file or add it to the downloads folder." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Choose an application" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Download" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Download failed" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Resume" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirm selection" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Delete" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "No downloads available" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 page" msgstr[1] "%1 pages" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Less" @@ -637,20 +680,20 @@ msgstr "Last Visited" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Yesterday" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "All History" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Today" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "search history" @@ -658,32 +701,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Going to public mode will close all private tabs" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Allow this domain to access your camera and microphone?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Allow this domain to access your camera?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Allow this domain to access your microphone?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (embedded in %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Yes" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "No" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "This is a private tab" @@ -696,16 +713,16 @@ "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "More" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Top sites" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "You haven't visited any site yet" @@ -783,8 +800,12 @@ msgid "Which is run by" msgstr "Which is run by" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Default" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Search engine" @@ -793,60 +814,56 @@ msgstr "Restore previous session at startup" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Allow opening new tabs in background" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privacy & permissions" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Reset browser settings" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Camera & microphone" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Clear Browsing History" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Clear Browsing History?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Clear Cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Clear Cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Clear" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Microphone" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Camera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tap to view" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Close Tab" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Remove" @@ -949,6 +966,9 @@ #~ msgstr "" #~ "Ubuntu suggests you check your network settings and try refreshing the page." +#~ msgid "Please choose a file" +#~ msgstr "Please choose a file" + #~ msgid "Share…" #~ msgstr "Share…" @@ -967,6 +987,9 @@ #~ msgid "see more" #~ msgstr "see more" +#~ msgid "Open tabs" +#~ msgstr "Open tabs" + #~ msgid "Add" #~ msgstr "Add" @@ -975,3 +998,6 @@ #~ msgid "Privacy" #~ msgstr "Privacy" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Allow opening new tabs in background" diff -Nru webbrowser-app-0.23+16.04.20151124/po/eo.po webbrowser-app-0.23+16.04.20160413/po/eo.po --- webbrowser-app-0.23+16.04.20151124/po/eo.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/eo.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-09-24 23:38+0000\n" "Last-Translator: Adolfo Jayme \n" "Language-Team: Esperanto \n" @@ -15,19 +15,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" -msgstr "" +msgstr "JavaScript-averto" #: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 #: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 #: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101 #: src/app/webbrowser/LeavePrivateModeDialog.qml:39 msgid "OK" -msgstr "" +msgstr "Bone" #: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 msgid "Authentication required." @@ -50,15 +50,18 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" -msgstr "" +msgstr "Nuligi" #: src/app/BeforeUnloadDialog.qml:23 msgid "Confirm Navigation" @@ -66,7 +69,7 @@ #: src/app/BeforeUnloadDialog.qml:26 msgid "Leave" -msgstr "" +msgstr "Forlasi" #: src/app/BeforeUnloadDialog.qml:31 msgid "Stay" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Elekti aplikaĵon" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Elŝuti" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -143,7 +129,7 @@ #: src/app/GeolocationPermissionRequest.qml:33 msgid "Deny" -msgstr "Rifuzi" +msgstr "Malpermesi" #: src/app/GeolocationPermissionRequest.qml:43 msgid "Allow" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Elekti aplikaĵon" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Elŝuti" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/es.po webbrowser-app-0.23+16.04.20160413/po/es.po --- webbrowser-app-0.23+16.04.20151124/po/es.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/es.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-10-26 09:16+0000\n" "Last-Translator: Víctor R. Ruiz \n" "Language-Team: Spanish \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancelar" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmación JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Elija una aplicación para abrir este archivo o guárdelo en la carpeta de " -"descargas." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Elegir una aplicación" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Descargar" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Error de red" @@ -134,10 +122,6 @@ msgid "Refresh page" msgstr "Recargar página" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Seleccione un archivo" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Solicitud de permiso" @@ -332,6 +316,36 @@ "Ha intentado acceder a %1, pero el servidor ha presentado un certificado de " "seguridad que no pasó los controles de seguridad por una razón desconocida." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "¿Permitir que este dominio acceda a la cámara y micrófono?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "¿Permitir que este dominio acceda a la cámara?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "¿Permitir que este dominio acceda al micrófono?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (embebido en %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Sí" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "No" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Diálogo de JavaScript" @@ -400,7 +414,7 @@ msgid "Erase" msgstr "Borrar" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Buscar en la página" @@ -430,8 +444,8 @@ msgid "Address;URL;www" msgstr "Dirección;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Pestaña nueva" @@ -453,6 +467,10 @@ msgid "Open link in new tab" msgstr "Abrir enlace en pestaña nueva" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Abrir vídeo en pestaña nueva" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Pegar" @@ -462,7 +480,7 @@ msgstr "Restaurar" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Recargar" @@ -480,12 +498,17 @@ msgid "Save link" msgstr "Guardar el enlace" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Guardar vídeo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Todos" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Compartir" @@ -494,16 +517,16 @@ msgstr "Deshacer" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "buscar en la página" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "buscar o escribir una dirección" @@ -522,8 +545,8 @@ msgstr "Guardar en" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Todos los marcadores" @@ -537,100 +560,120 @@ msgstr "Crear carpeta" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Guardar" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Página de inicio" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Marcadores" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Hecho" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Pestaña nueva" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historial" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Pestañas abiertas" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Descargas" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "Salir del modo privado" +msgstr "Cerrar modo privado" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Modo privado" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Configuración" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Deslice hacia arriba para salir de pantalla completa" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Presione Esc para salir de pantalla completa" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Elija una aplicación para abrir este archivo o guárdelo en la carpeta de " +"descargas." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Elegir una aplicación" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Descargar" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Falló la descarga" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Reanudar" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirmar la selección" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Eliminar" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "No hay descargas disponibles" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 página" msgstr[1] "%1 páginas" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menos" @@ -639,20 +682,20 @@ msgstr "Últimas visitas" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ayer" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Todo el historial" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Hoy" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "historial de búsquedas" @@ -660,32 +703,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Al volver al modo público se cerrarán todas las pestañas privadas" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "¿Permitir que este dominio acceda a la cámara y micrófono?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "¿Permitir que este dominio acceda a la cámara?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "¿Permitir que este dominio acceda al micrófono?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (embebido en %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Sí" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "No" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Esta pestaña es privada" @@ -698,16 +715,16 @@ "Las páginas que visualice en esta pestaña no se añadirán al historial.\n" "Sin embargo, se conservará cualquier marcador que cree." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Más" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Sitios populares" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Aún no ha visitado ningún sitio" @@ -788,8 +805,12 @@ msgid "Which is run by" msgstr "Propiedad de" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Por defecto" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de búsquedas" @@ -798,60 +819,56 @@ msgstr "Restaurar sesión anterior al iniciar" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permitir abrir pestañas nuevas en segundo plano" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Permisos y privacidad" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Restablecer la configuración del navegador" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Cámara y micrófono" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Vaciar historial de navegación" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "¿Vaciar el historial de navegación?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Vaciar caché" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "¿Vaciar la caché?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Vaciar" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Micrófono" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Cámara" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Toque para ver" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Cerrar pestaña" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Eliminar" @@ -957,6 +974,9 @@ #~ msgid "Select an account" #~ msgstr "Seleccione una cuenta" +#~ msgid "Please choose a file" +#~ msgstr "Seleccione un archivo" + #~ msgid "No local account found for " #~ msgstr "No se pudo encontrar ninguna cuenta local para " @@ -972,6 +992,9 @@ #~ msgid "see less" #~ msgstr "ver menos" +#~ msgid "Open tabs" +#~ msgstr "Pestañas abiertas" + #~ msgid "Add" #~ msgstr "Añadir" @@ -980,3 +1003,6 @@ #~ msgid "Privacy" #~ msgstr "Privacidad" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permitir abrir pestañas en segundo plano" diff -Nru webbrowser-app-0.23+16.04.20151124/po/et.po webbrowser-app-0.23+16.04.20160413/po/et.po --- webbrowser-app-0.23+16.04.20151124/po/et.po 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/et.po 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,915 @@ +# Estonian translation for webbrowser-app +# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016 +# This file is distributed under the same license as the webbrowser-app package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: webbrowser-app\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-01-09 19:57+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Estonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" + +#: src/app/AlertDialog.qml:23 +msgid "JavaScript Alert" +msgstr "" + +#: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 +#: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 +#: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101 +#: src/app/webbrowser/LeavePrivateModeDialog.qml:39 +msgid "OK" +msgstr "" + +#: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 +msgid "Authentication required." +msgstr "" + +#. TRANSLATORS: %1 refers to the URL of the current website +#: src/app/AuthenticationDialog.qml:26 +#, qt-format +msgid "The website %1 requires authentication." +msgstr "" + +#: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 +msgid "Username" +msgstr "" + +#: src/app/AuthenticationDialog.qml:41 src/app/HttpAuthenticationDialog.qml:49 +msgid "Password" +msgstr "" + +#: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 +#: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 +#: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 +#: src/app/webbrowser/ContextMenuMobile.qml:139 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 +#: src/app/webbrowser/LeavePrivateModeDialog.qml:32 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 +#: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 +msgid "Cancel" +msgstr "" + +#: src/app/BeforeUnloadDialog.qml:23 +msgid "Confirm Navigation" +msgstr "" + +#: src/app/BeforeUnloadDialog.qml:26 +msgid "Leave" +msgstr "" + +#: src/app/BeforeUnloadDialog.qml:31 +msgid "Stay" +msgstr "" + +#: src/app/CertificateVerificationDialog.qml:24 +msgid "This connection is untrusted" +msgstr "" + +#. TRANSLATORS: %1 refers to the hostname +#: src/app/CertificateVerificationDialog.qml:26 +#, qt-format +msgid "" +"You are trying to securely reach %1, but the security certificate of this " +"website is not trusted." +msgstr "" + +#: src/app/CertificateVerificationDialog.qml:29 +#: src/app/InvalidCertificateErrorSheet.qml:160 +msgid "Proceed anyway" +msgstr "" + +#: src/app/CertificateVerificationDialog.qml:35 +#: src/app/InvalidCertificateErrorSheet.qml:173 +msgid "Back to safety" +msgstr "" + +#: src/app/ConfirmDialog.qml:23 +msgid "JavaScript Confirmation" +msgstr "" + +#: src/app/ErrorSheet.qml:36 +msgid "Network Error" +msgstr "" + +#. TRANSLATORS: %1 refers to the URL of the current page +#: src/app/ErrorSheet.qml:42 +#, qt-format +msgid "It appears you are having trouble viewing: %1." +msgstr "" + +#: src/app/ErrorSheet.qml:48 +msgid "Please check your network settings and try refreshing the page." +msgstr "" + +#: src/app/ErrorSheet.qml:53 +msgid "Refresh page" +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:28 +msgid "Permission Request" +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:29 +msgid "This page wants to know your device’s location." +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:33 +msgid "Deny" +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:43 +msgid "Allow" +msgstr "" + +#: src/app/InvalidCertificateErrorSheet.qml:55 +msgid "This site security certificate is not trusted.\n" +msgstr "" + +#: src/app/InvalidCertificateErrorSheet.qml:63 +msgid "Learn more" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's serial number +#: src/app/InvalidCertificateErrorSheet.qml:87 +#, qt-format +msgid "" +"Serial number:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's subject display name +#: src/app/InvalidCertificateErrorSheet.qml:94 +#, qt-format +msgid "" +"Subject:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's subject's address +#: src/app/InvalidCertificateErrorSheet.qml:102 +#, qt-format +msgid "" +"Subject address:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's issuer display name +#: src/app/InvalidCertificateErrorSheet.qml:113 +#, qt-format +msgid "" +"Issuer:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's issuer's address +#: src/app/InvalidCertificateErrorSheet.qml:121 +#, qt-format +msgid "" +"Issuer address:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's start date +#: src/app/InvalidCertificateErrorSheet.qml:132 +#, qt-format +msgid "" +"Valid from:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's expiry date +#: src/app/InvalidCertificateErrorSheet.qml:139 +#, qt-format +msgid "" +"Valid until:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's SHA1 fingerprint +#: src/app/InvalidCertificateErrorSheet.qml:146 +#, qt-format +msgid "" +"Fingerprint (SHA1):\n" +"%1" +msgstr "" + +#: src/app/InvalidCertificateErrorSheet.qml:153 +msgid "" +"You should not proceed, especially if you have never seen this warning " +"before for this site." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:187 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which does not match the identity of the site." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:190 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which has expired." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:193 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which contains invalid dates." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:196 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"issued by an entity that is not trusted." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:199 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"that has been revoked." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:202 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented an invalid security " +"certificate." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:205 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented an insecure security " +"certificate." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:208 +#, qt-format +msgid "" +"This site security certificate is not trusted\n" +"You attempted to reach %1 but the server presented a security certificate " +"which failed our security checks for an unknown reason." +msgstr "" + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + +#: src/app/PromptDialog.qml:23 +msgid "JavaScript Prompt" +msgstr "" + +#: src/app/ProxyAuthenticationDialog.qml:22 +msgid "Proxy authentication required." +msgstr "" + +#. TRANSLATORS: %1 refers to the proxy address, %2 refers to the proxy port +#: src/app/ProxyAuthenticationDialog.qml:24 +#, qt-format +msgid "The website %1:%2 requires authentication." +msgstr "" + +#: src/app/actions/Back.qml:23 +msgid "Back" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Back' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Back.qml:26 +msgid "Older Page" +msgstr "" + +#: src/app/actions/Bookmark.qml:23 +msgid "Bookmark" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Bookmark' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Bookmark.qml:26 +msgid "Add This Page to Bookmarks" +msgstr "" + +#: src/app/actions/BookmarkLink.qml:22 +msgid "Bookmark link" +msgstr "" + +#: src/app/actions/ClearHistory.qml:23 +msgid "Clear History" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Clear History' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/ClearHistory.qml:26 +msgid "Clear Navigation History" +msgstr "" + +#: src/app/actions/Copy.qml:22 +msgid "Copy" +msgstr "" + +#: src/app/actions/CopyImage.qml:22 +msgid "Copy image" +msgstr "" + +#: src/app/actions/CopyLink.qml:22 +msgid "Copy link" +msgstr "" + +#: src/app/actions/Cut.qml:22 +msgid "Cut" +msgstr "" + +#: src/app/actions/Erase.qml:22 +msgid "Erase" +msgstr "" + +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 +msgid "Find in page" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/FindInPage.qml:26 +msgid "Search in Page" +msgstr "" + +#: src/app/actions/Forward.qml:23 +msgid "Forward" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Forward' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Forward.qml:26 +msgid "Newer Page" +msgstr "" + +#: src/app/actions/GoTo.qml:23 +msgid "Goto" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Goto' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/GoTo.qml:26 +msgid "Address;URL;www" +msgstr "" + +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 +msgid "New Tab" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'New Tab' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/NewTab.qml:26 +msgid "Open a New Tab" +msgstr "" + +#: src/app/actions/OpenImageInNewTab.qml:22 +msgid "Open image in new tab" +msgstr "" + +#: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 +msgid "Open link in new background tab" +msgstr "" + +#: src/app/actions/OpenLinkInNewTab.qml:22 +msgid "Open link in new tab" +msgstr "" + +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + +#: src/app/actions/Paste.qml:22 +msgid "Paste" +msgstr "" + +#: src/app/actions/Redo.qml:22 +msgid "Redo" +msgstr "" + +#: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 +msgid "Reload" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Reload' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Reload.qml:26 +msgid "Leave Page" +msgstr "" + +#: src/app/actions/SaveImage.qml:22 +msgid "Save image" +msgstr "" + +#: src/app/actions/SaveLink.qml:22 +msgid "Save link" +msgstr "" + +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 +msgid "Select all" +msgstr "" + +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 +msgid "Share" +msgstr "" + +#: src/app/actions/Undo.qml:22 +msgid "Undo" +msgstr "" + +#. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result +#: src/app/webbrowser/AddressBar.qml:210 +#, qt-format +msgid "%1/%2" +msgstr "" + +#: src/app/webbrowser/AddressBar.qml:246 +msgid "find in page" +msgstr "" + +#: src/app/webbrowser/AddressBar.qml:247 +msgid "search or enter an address" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:48 +msgid "Bookmark Added" +msgstr "" + +#. TRANSLATORS: Field where the title of bookmarked URL can be changed +#: src/app/webbrowser/BookmarkOptions.qml:53 +msgid "Name" +msgstr "" + +#. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in +#: src/app/webbrowser/BookmarkOptions.qml:71 +msgid "Save in" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:78 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 +msgid "All Bookmarks" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:93 +#: src/app/webbrowser/BookmarkOptions.qml:133 +msgid "New Folder" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:115 +msgid "Create new folder" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:153 +#: src/app/webbrowser/SettingsPage.qml:339 +msgid "Save" +msgstr "" + +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 +msgid "Homepage" +msgstr "" + +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 +msgid "Bookmarks" +msgstr "" + +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 +msgid "Done" +msgstr "" + +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 +msgid "New tab" +msgstr "" + +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 +msgid "History" +msgstr "" + +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 +msgid "Downloads" +msgstr "" + +#: src/app/webbrowser/Browser.qml:566 +msgid "Leave Private Mode" +msgstr "" + +#: src/app/webbrowser/Browser.qml:566 +msgid "Private Mode" +msgstr "" + +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 +msgid "Settings" +msgstr "" + +#. TRANSLATORS: %1 refers to the current number of tabs opened +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 +#, qt-format +msgid "(%1)" +msgstr "" + +#: src/app/webbrowser/Browser.qml:1345 +msgid "Swipe Up To Exit Full Screen" +msgstr "" + +#: src/app/webbrowser/Browser.qml:1346 +msgid "Press ESC To Exit Full Screen" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 +msgid "Delete" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:252 +msgid "No downloads available" +msgstr "" + +#: src/app/webbrowser/ExpandedHistoryView.qml:121 +#, qt-format +msgid "%1 page" +msgid_plural "%1 pages" +msgstr[0] "" +msgstr[1] "" + +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 +msgid "Less" +msgstr "" + +#: src/app/webbrowser/HistorySectionDelegate.qml:26 +msgid "Last Visited" +msgstr "" + +#: src/app/webbrowser/HistorySectionDelegate.qml:48 +#: src/app/webbrowser/HistoryViewWide.qml:212 +msgid "Yesterday" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:196 +msgid "All History" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 +msgid "Today" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:462 +msgid "search history" +msgstr "" + +#: src/app/webbrowser/LeavePrivateModeDialog.qml:24 +msgid "Going to public mode will close all private tabs" +msgstr "" + +#: src/app/webbrowser/NewPrivateTabView.qml:41 +msgid "This is a private tab" +msgstr "" + +#: src/app/webbrowser/NewPrivateTabView.qml:56 +msgid "" +"Pages that you view in this tab won't appear in your browser history.\n" +"Bookmarks you create will be preserved, however." +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:148 +msgid "More" +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 +msgid "Top sites" +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:366 +msgid "You haven't visited any site yet" +msgstr "" + +#: src/app/webbrowser/SadTab.qml:48 +msgid "The rendering process has been closed for this tab." +msgstr "" + +#. TRANSLATORS: %1 is the URL of the page that crashed the renderer process +#: src/app/webbrowser/SadTab.qml:65 +#, qt-format +msgid "Something went wrong while displaying %1." +msgstr "" + +#: src/app/webbrowser/SadTab.qml:67 +msgid "" +"The system is low on memory and can't display this webpage. Try closing " +"unneeded tabs and reloading." +msgstr "" + +#: src/app/webbrowser/SadTab.qml:80 +msgid "Close tab" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:69 +msgid "This site has insecure content" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:70 +msgid "Identity Not Verified" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:78 +msgid "The identity of this website has not been verified." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:89 +msgid "Server certificate does not match the identity of the site." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:91 +msgid "Server certificate has expired." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:93 +msgid "Server certificate contains invalid dates." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:95 +msgid "Server certificate is issued by an entity that is not trusted." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:97 +msgid "Server certificate has been revoked." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:99 +msgid "Server certificate is invalid." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:101 +msgid "Server certificate is insecure." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:103 +msgid "Server certificate failed our security checks for an unknown reason." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:126 +msgid "You are connected to" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:148 +msgid "Which is run by" +msgstr "" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:80 +#: src/app/webbrowser/SettingsPage.qml:156 +msgid "Search engine" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:100 +msgid "Restore previous session at startup" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:118 +#: src/app/webbrowser/SettingsPage.qml:208 +msgid "Privacy & permissions" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:126 +msgid "Reset browser settings" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 +msgid "Camera & microphone" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:235 +msgid "Clear Browsing History" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:238 +msgid "Clear Browsing History?" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:245 +msgid "Clear Cache" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:247 +msgid "Clear Cache?" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:282 +msgid "Clear" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:387 +msgid "Microphone" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:406 +msgid "Camera" +msgstr "" + +#: src/app/webbrowser/TabPreview.qml:86 +msgid "Tap to view" +msgstr "" + +#: src/app/webbrowser/TabsBar.qml:102 +msgid "Close Tab" +msgstr "" + +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 +msgid "Remove" +msgstr "" + +#. TRANSLATORS: %1 refers to the current page’s title +#: src/app/webbrowser/webbrowser-app.qml:35 +#: src/app/webcontainer/webapp-container.qml:67 +#, qt-format +msgid "%1 - Ubuntu Web Browser" +msgstr "" + +#: src/app/webbrowser/webbrowser-app.qml:37 +#: src/app/webcontainer/webapp-container.qml:69 +msgid "Ubuntu Web Browser" +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:62 +msgid "" +"No accounts have been linked to this webapp; press the item below to add an " +"account." +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:78 +msgid "Add account" +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:87 +msgid "Don't use an account" +msgstr "" + +#: src/app/webcontainer/AccountErrorScreen.qml:39 +msgid "Account error" +msgstr "" + +#: src/app/webcontainer/AccountErrorScreen.qml:50 +msgid "Close" +msgstr "" + +#: src/app/webcontainer/AccountsLogic.qml:63 +msgid "" +"Account window could not be opened. You can only create one account at a " +"time; please try again after closing all other account windows." +msgstr "" + +#. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider +#: src/app/webcontainer/AccountsSplashScreen.qml:45 +#, qt-format +msgid "%1 needs to access your %2 online account." +msgstr "" + +#. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider +#: src/app/webcontainer/AccountsSplashScreen.qml:55 +#, qt-format +msgid "%1 would like to access your %2 online account." +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:64 +msgid "" +"Choose an account now, or skip this step and choose an online account later." +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:77 +msgid "Close the app" +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:77 +msgid "Skip" +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:84 +msgid "Choose account" +msgstr "" + +#: src/app/webcontainer/SadPage.qml:45 +msgid "Oops, something went wrong." +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 +msgid "Browser" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:2 +msgid "Web Browser" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:3 +msgid "Browse the World Wide Web" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 +msgid "Internet;WWW;Browser;Web;Explorer" +msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/eu.po webbrowser-app-0.23+16.04.20160413/po/eu.po --- webbrowser-app-0.23+16.04.20151124/po/eu.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/eu.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-07-11 16:20+0000\n" "Last-Translator: Ibai Oihanguren Sala \n" "Language-Team: Basque \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Utzi" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript berrespena" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Sareko errorea" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "Freskatu orria" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Aukeratu fitxategi bat" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Baimen-eskaera" @@ -329,6 +315,36 @@ "%1 atzitzen saiatu zara, baina zerbitzariak aurkeztu duen segurtasun-" "ziurtagiriak ez ditu gure segurtasun-probak gainditu, arrazoi ezezagunagatik." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Bai" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Ez" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript gonbita" @@ -397,7 +413,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -427,8 +443,8 @@ msgid "Address;URL;www" msgstr "Helbidea;URLa;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Fitxa berria" @@ -450,6 +466,10 @@ msgid "Open link in new tab" msgstr "Ireki lotura fitxa berrian" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -459,7 +479,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Birkargatu" @@ -477,12 +497,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Hautatu dena" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Partekatu" @@ -491,16 +516,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "bilatu edo idatzi helbide bat" @@ -519,8 +544,8 @@ msgstr "Gorde hemen" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Laster-marka guztiak" @@ -534,100 +559,118 @@ msgstr "Sortu karpeta berria" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Gorde" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Hasiera-orria" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Laster-markak" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Eginda" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Fitxa berria" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historia" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Ireki fitxak" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Utzi modu pribatua" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Modu pribatua" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Ezarpenak" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Pasa hatza gorantz pantaila osotik irteteko" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Sakatu IHES tekla pantaila osotik irteteko" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Ezabatu" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "orri %1" msgstr[1] "%1 orri" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Gutxiago" @@ -636,20 +679,20 @@ msgstr "Azkena bisitatuak" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Atzo" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -657,32 +700,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Modu publikora joanez gero fitxa pribatu guztiak itxiko dira" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Bai" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Ez" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Hau fitxa pribatu bat da" @@ -693,16 +710,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Gehiago" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Gune nagusiak" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -778,8 +795,12 @@ msgid "Which is run by" msgstr "Honek kudeatuta:" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Bilaketa-motorra" @@ -788,60 +809,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Baimendu fitxa berriak atzeko planoan irekitzea" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Berrezarri nabigatzailearen ezarpenak" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Garbitu nabigatze-historia" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Garbitu cache-a" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Garbitu" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Sakatu ikusteko" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -940,6 +957,9 @@ #~ "Ubuntuk sareko ezarpenak egiaztatzea iradokitzen dizu, eta orria freskatzen " #~ "probatzea." +#~ msgid "Please choose a file" +#~ msgstr "Aukeratu fitxategi bat" + #~ msgid "Share…" #~ msgstr "Partekatu..." @@ -958,6 +978,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Saltatu kontua sortzeko urratsa" +#~ msgid "Open tabs" +#~ msgstr "Ireki fitxak" + #~ msgid "Add" #~ msgstr "Gehitu" @@ -966,3 +989,6 @@ #~ msgid "Privacy" #~ msgstr "Pribatutasuna" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Baimendu fitxa berriak atzeko planoan irekitzea" diff -Nru webbrowser-app-0.23+16.04.20151124/po/fa.po webbrowser-app-0.23+16.04.20160413/po/fa.po --- webbrowser-app-0.23+16.04.20151124/po/fa.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/fa.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-29 00:15+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-27 20:16+0000\n" "Last-Translator: Danial Behzadi \n" "Language-Team: Persian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "لغو" @@ -83,8 +86,8 @@ "You are trying to securely reach %1, but the security certificate of this " "website is not trusted." msgstr "" -"با اینکه می‌خواهید به صورت ایمن به %1 وصل شوید، ولی گواهینامه‌ی امنیتی این " -"وب‌سایت قابل اطمینان نیست." +"تلاش می‌کنید به صورت امن به %1 وصل شوید، ولی گواهینامهٔ امنیتی این پایگاه وب " +"قابل اطمینان نیست." #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 @@ -100,20 +103,6 @@ msgid "JavaScript Confirmation" msgstr "تایید جاوا اسکریپت" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"برنامه‌ای را برای گشودن این پرونده گزیده، یا آن را به شاخهٔ بارگیری بیفزایید." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "برنامه‌ای را برگزینید" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "بارگیری" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "خطای شبکه" @@ -133,10 +122,6 @@ msgid "Refresh page" msgstr "تازه‌سازی صفحه" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "لطفا پرونده‌ای را برگزینید" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "درخواست اجازه" @@ -155,7 +140,7 @@ #: src/app/InvalidCertificateErrorSheet.qml:55 msgid "This site security certificate is not trusted.\n" -msgstr "گواهی‌نامه‌ی امنیتی این پایگاه مطمئن نیست.\n" +msgstr "گواهینامهٔ امنیتی این پایگاه وب قابل اطمینان نیست.\n" #: src/app/InvalidCertificateErrorSheet.qml:63 msgid "Learn more" @@ -256,8 +241,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which does not match the identity of the site." msgstr "" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی ارائه داد " -"که با هویت این پایگاه تطابق ندارد." +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی ارائه داد که با " +"هویت این پایگاه تطابق ندارد." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:190 @@ -266,8 +251,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which has expired." msgstr "" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی منقضی شده " -"ارائه داد." +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی منقضی شده ارائه " +"داد." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:193 @@ -276,8 +261,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which contains invalid dates." msgstr "" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی ارائه داد " -"که شامل تاریخ‌های نامعتبر است." +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی ارائه داد که " +"تاریخ‌های نامعتبری دارد." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:196 @@ -286,8 +271,8 @@ "You attempted to reach %1 but the server presented a security certificate " "issued by an entity that is not trusted." msgstr "" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی ارائه داد " -"که توسّط نهادی که قابل اعتماد نیست صادر شده است." +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی ارائه داد که توسّط " +"نهادی که قابل اعتماد نیست صادر شده است." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:199 @@ -296,8 +281,7 @@ "You attempted to reach %1 but the server presented a security certificate " "that has been revoked." msgstr "" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی باطل شده " -"ارائه داد." +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی باطل شده ارائه داد." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:202 @@ -306,8 +290,7 @@ "You attempted to reach %1 but the server presented an invalid security " "certificate." msgstr "" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی نامعتبر " -"ارائه داد." +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی نامعتبر ارائه داد." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:205 @@ -316,8 +299,7 @@ "You attempted to reach %1 but the server presented an insecure security " "certificate." msgstr "" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی ناامن " -"ارائه داد." +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی ناامن ارائه داد." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:208 @@ -327,9 +309,40 @@ "You attempted to reach %1 but the server presented a security certificate " "which failed our security checks for an unknown reason." msgstr "" -"گواهی‌نامه‌ی امنیتی این پایگاه قابل اعتماد نیست.\n" -"شما تلاش کردید به %1 برسید، ولی سرویس دهنده یک گواهی‌نامه‌ی امنیتی ارائه داد " -"که به دلیل نامعلومی در بررسی‌های امنیتی ما شکست خورد." +"گواهی‌نامهٔ امنیتی این پایگاه قابل اعتماد نیست.\n" +"تلاش کردید به %1 برسید، ولی کارساز، یک گواهی‌نامهٔ امنیتی ارائه داد که به " +"دلیل نامعلومی در بررسی‌های امنیتی ما شکست خورد." + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"به این دامنه اجازه داده شود به میکروفون و دوربینتان دسترسی داشته باشد؟" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "به این دامنه اجازه داده شود به دوربینتان دسترسی داشته باشد؟" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "به این دامنه اجازه داده شود به میکروفونتان دسترسی داشته باشد؟" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "‫%1 (تعبیه شده در %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "بله" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "خیر" #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" @@ -377,7 +390,7 @@ #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/ClearHistory.qml:26 msgid "Clear Navigation History" -msgstr "پاک کردن تاریخچه‌ی ناوبری" +msgstr "پاک کردن تاریخچهٔ ناوبری" #: src/app/actions/Copy.qml:22 msgid "Copy" @@ -399,7 +412,7 @@ msgid "Erase" msgstr "پاک کردن" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "یافتن در صفحه" @@ -429,8 +442,8 @@ msgid "Address;URL;www" msgstr "آدرس;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "زبانه تازه" @@ -438,19 +451,23 @@ #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/NewTab.qml:26 msgid "Open a New Tab" -msgstr "بازکردن زبانه‌ی جدید" +msgstr "گشودن زبانه‌‌ای جدید" #: src/app/actions/OpenImageInNewTab.qml:22 msgid "Open image in new tab" -msgstr "بازکردن تصویر در زبانه‌ی جدید" +msgstr "گشودن تصویر در زبانهٔ جدید" #: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 msgid "Open link in new background tab" -msgstr "گشودن پیوند در زبانه‌ی پس‌زمینه‌ی جدید" +msgstr "گشودن تصویر در زبانهٔ پس‌زمینهٔ جدید" #: src/app/actions/OpenLinkInNewTab.qml:22 msgid "Open link in new tab" -msgstr "بازکردن پیوند در زبانه‌ی جدید" +msgstr "گشودن پیوند در زبانهٔ جدید" + +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "گشودن ویدیو در زبانهٔ جدید" #: src/app/actions/Paste.qml:22 msgid "Paste" @@ -461,7 +478,7 @@ msgstr "انجام دوباره" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "بارگیری دوباره" @@ -473,36 +490,41 @@ #: src/app/actions/SaveImage.qml:22 msgid "Save image" -msgstr "ذخیره‌ی تصویر" +msgstr "ذخیرهٔ تصویر" #: src/app/actions/SaveLink.qml:22 msgid "Save link" msgstr "ذخیرهٔ پیوند" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "ذخیرهٔ ویدیو" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "گزینش همه" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" -msgstr "به‌اشتراک گذاری" +msgstr "هم‌رسانی" #: src/app/actions/Undo.qml:22 msgid "Undo" msgstr "بر‌گرداندن" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "یافتن در صفحه" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "جست‌وجو کرده یا یک نشانی را وارد کنید" @@ -521,8 +543,8 @@ msgstr "ذخیره در" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "تمام نشانک‌ها" @@ -536,99 +558,118 @@ msgstr "ایجاد پوشهٔ جدید" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "ذخیره" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" -msgstr "صفحه‌ی خانگی" +msgstr "صفحهٔ خانگی" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "نشانک‌ها" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "انجام شد" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" -msgstr "زبانه‌ی جدید" +msgstr "زبانهٔ جدید" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "تاریخچه" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "زبانه‌های باز" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "بارگیری‌ها" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "ترک حالت خصوصی" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "حالت خصوصی" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "تنظیمات" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "برای خروج از حالت تمام‌صفحه، به سمت بالا بکشید" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "برای خروج از حالت تمام‌صفحه، ecs را فشار دهید" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"برنامه‌ای را برای گشودن این پرونده گزیده، یا آن را به شاخهٔ بارگیری بیفزایید." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "برنامه‌ای را برگزینید" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "بارگیری" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "بارگیری شکست خورد" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "از سر گیری" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "تأیید گزینش" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "حذف" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "هیج بارگیری‌ای موجود نیست" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 صفحه" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "کم‌تر" @@ -637,20 +678,20 @@ msgstr "آخرین بازدیدها" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "دیروز" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "تمام تاریخچه" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "امروز" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "جست‌وجوی تاریخچه" @@ -658,55 +699,28 @@ msgid "Going to public mode will close all private tabs" msgstr "رفتن به حالت عمومی، تمام زبانه‌های خصوصی را خواهد بست" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" -"به این دامنه اجازه داده شود به میکروفون و دوربینتان دسترسی داشته باشد؟" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "به این دامنه اجازه داده شود به دوربینتان دسترسی داشته باشد؟" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "به این دامنه اجازه داده شود به میکروفونتان دسترسی داشته باشد؟" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "‫%1 (تعبیه شده در %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "بله" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "خیر" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "این یک زبانه‌ی خصوصی است" +msgstr "این یک زبانهٔ خصوصی است" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" -"صفحه‌هایی که در این زبانه می‌بینید، در تاریخچه‌ی مرور شما ظاهر نمی شوند.\n" -"با این خال، نشانک‌هایی که می‌سازید، ذخیره خواهند شد." +"صفحه‌هایی که در این زبانه می‌بینید، در تاریخچهٔ مرور شما ظاهر نمی‌شوند.\n" +"گرچه نشانک‌هایی که می‌سازید، ذخیره خواهند شد." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "بیش‌تر" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "پایگاه‌های برتر" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "هنوز از هیچ پایگاهی دیدن نکرده‌اید" @@ -746,36 +760,36 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:89 msgid "Server certificate does not match the identity of the site." -msgstr "گواهی‌نامه‌ی کارگزار با هویت پایگاه تطابق ندارد." +msgstr "گواهی‌نامهٔ کارساز با هویت پایگاه تطابق ندارد." #: src/app/webbrowser/SecurityCertificatePopover.qml:91 msgid "Server certificate has expired." -msgstr "گواهی‌نامه‌ی کارگزار منقضی شده است." +msgstr "گواهی‌نامهٔ کارساز منقضی شده است." #: src/app/webbrowser/SecurityCertificatePopover.qml:93 msgid "Server certificate contains invalid dates." -msgstr "گواهی‌نامه‌ی کارگزار شامل تازیخ‌های نامعتبر است." +msgstr "گواهی‌نامهٔ کارساز، تاریخ‌های نامعتبر دارد." #: src/app/webbrowser/SecurityCertificatePopover.qml:95 msgid "Server certificate is issued by an entity that is not trusted." -msgstr "گواهی‌نامه‌ی کارگزار توسّط نهادی صادر شده که مورد اطمینان نیست." +msgstr "گواهی‌نامهٔ کارساز توسّط نهادی صادر شده که مورد اطمینان نیست." #: src/app/webbrowser/SecurityCertificatePopover.qml:97 msgid "Server certificate has been revoked." -msgstr "گواهی‌نامه‌ی کارگزار سلب شده است." +msgstr "گواهی‌نامهٔ کارساز باطل شده است." #: src/app/webbrowser/SecurityCertificatePopover.qml:99 msgid "Server certificate is invalid." -msgstr "گواهی‌نامه‌ی کارگزار نامعتبر است." +msgstr "گواهی‌نامهٔ کارساز نامعتبر است." #: src/app/webbrowser/SecurityCertificatePopover.qml:101 msgid "Server certificate is insecure." -msgstr "گواهی‌نامه‌ی کارگزار ناامن است." +msgstr "گواهی‌نامهٔ کارساز ناامن است." #: src/app/webbrowser/SecurityCertificatePopover.qml:103 msgid "Server certificate failed our security checks for an unknown reason." msgstr "" -"گواهی‌نامه‌ی کارگزار به دلیل نامشخّصی در بررسی‌های امنیتی ما شکست خورد." +"گواهی‌نامهٔ کارساز، به دلیل نامشخّصی در بررسی‌های امنیتی ما شکست خورد." #: src/app/webbrowser/SecurityCertificatePopover.qml:126 msgid "You are connected to" @@ -785,8 +799,12 @@ msgid "Which is run by" msgstr "که اداره می‌شود توسّط" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "پیش‌گزیده" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "موتور جست‌وجو" @@ -795,60 +813,56 @@ msgstr "بازگردانی نشست پیشین هنگام شروع" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "اجازه‌ی گشودن زبانه‌ها در پس‌زمینه" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "محرمانگی و اجازه‌ها" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "بازنشانی تنظیمات مرورگر" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "دوربین و میکروفون" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" -msgstr "پاک‌سازی تاریخچه‌ی جست‌وجو" +msgstr "پاک کردن تاریخچهٔ مرور" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "پاک‌سازی تاریخچهٔ مرور؟" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "پاک‌سازی انباره" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "پاک‌سازی انباره؟" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "پاک‌کردن" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "میکروفون" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "دوربین" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "برای دیدن فشار دهید" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "بستن زبانه" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "برداشتن" @@ -947,12 +961,18 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "اینترنت;وب‌جهان‌گستر;مرورگر;وب;کاوشگر" +#~ msgid "Please choose a file" +#~ msgstr "لطفا پرونده‌ای را برگزینید" + #~ msgid "Share…" #~ msgstr "به اشترام گذاری…" #~ msgid "Delete all history?" #~ msgstr "تمامی تاریخجه پاک شود؟" +#~ msgid "Open tabs" +#~ msgstr "زبانه‌های باز" + #~ msgid "see more" #~ msgstr "مشاهده‌ی بیش‌تر" @@ -979,3 +999,6 @@ #~ msgid "Privacy" #~ msgstr "محرمانگی" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "اجازهٔ گشودن زبانه‌ها در پس‌زمینه" diff -Nru webbrowser-app-0.23+16.04.20151124/po/fi.po webbrowser-app-0.23+16.04.20160413/po/fi.po --- webbrowser-app-0.23+16.04.20151124/po/fi.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/fi.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-10-06 17:50+0000\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Peru" @@ -100,20 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript-vahvistus" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Valitse sovellus tiedoston avaamiseen tai tallenna se latauskansioon." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Valitse sovellus" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Lataa" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Verkkovirhe" @@ -132,10 +121,6 @@ msgid "Refresh page" msgstr "Päivitä sivu" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Valitse tiedosto" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Lupapyyntö" @@ -329,6 +314,36 @@ "Yritit tavoittaa sivustoa %1, mutta palvelin palautti varmenteen, joka ei " "läpäissyt turvallisuustarkastuksia tuntemattomasta syystä." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Sallitko tämän sivuston käyttää kameraa ja mikrofonia?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Sallitko tämän sivuston käyttää kameraa?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Sallitko tämän sivuston käyttää mikrofonia?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (upotettu sivulle %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Kyllä" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Ei" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript-kehote" @@ -397,7 +412,7 @@ msgid "Erase" msgstr "Poista" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Etsi sivulta" @@ -427,8 +442,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www;osoite;internet;webbi;netti" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Uusi välilehti" @@ -450,6 +465,10 @@ msgid "Open link in new tab" msgstr "Avaa linkki uuteen välilehteen" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Avaa video uudessa välilehdessä" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Liitä" @@ -459,7 +478,7 @@ msgstr "Tee uudelleen" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Päivitä" @@ -477,12 +496,17 @@ msgid "Save link" msgstr "Tallenna linkki" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Tallenna video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Valitse kaikki" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Jaa" @@ -491,16 +515,16 @@ msgstr "Kumoa" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "etsi sivulta" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "etsi tai kirjoita osoite" @@ -519,8 +543,8 @@ msgstr "Tallennuskohde" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Kaikki kirjanmerkit" @@ -534,100 +558,119 @@ msgstr "Luo uusi kansio" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Tallenna" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Kotisivu" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Kirjanmerkit" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Valmis" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Uusi välilehti" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historia" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Avoimet välilehdet" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Lataukset" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Poistu yksityisestä tilasta" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Yksityinen tila" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Asetukset" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Vedä ylös poistuaksesi koko näytön tilasta" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Paina Esc poistuaksesi koko näytön tilasta" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Valitse sovellus tiedoston avaamiseen tai tallenna se latauskansioon." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Valitse sovellus" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Lataa" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Lataus epäonnistui" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Palauta" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Vahvista valinta" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Poista" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Ei latauksia" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 sivu" msgstr[1] "%1 sivua" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Vähemmän" @@ -636,20 +679,20 @@ msgstr "Viimeksi käyty" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Eilen" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Koko historia" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Tänään" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "hakuhistoria" @@ -657,32 +700,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Julkiseen tilaan siirtyminen sulkee kaikki yksityiset välilehdet" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Sallitko tämän sivuston käyttää kameraa ja mikrofonia?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Sallitko tämän sivuston käyttää kameraa?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Sallitko tämän sivuston käyttää mikrofonia?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (upotettu sivulle %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Kyllä" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Ei" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Tämä on yksityinen välilehti" @@ -695,16 +712,16 @@ "Tässä välilehdessä avaamasi sivut eivät näy selaushistoriassa.\n" "Lisäämäsi kirjanmerkit kuitenkin säilyvät." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Enemmän" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Suosituimmat sivustot" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Et ole vieraillut millään sivustolla vielä" @@ -783,8 +800,12 @@ msgid "Which is run by" msgstr "Sen taustalla on" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Oletus" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Hakukone" @@ -793,60 +814,56 @@ msgstr "Palauta edellinen istunto käynnistyksen yhteydessä" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Salli uusien välilehtien avaaminen taustalle" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Yksityisyys ja oikeudet" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Palauta selaimen oletusasetukset" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Kamera ja mikrofoni" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Tyhjennä selailuhistoria" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Tyhjennetäänkö selaushistoria?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Tyhjennä välimuisti" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Tyhjennetäänkö välimuisti?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Tyhjennä" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Mikrofoni" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Kosketa näyttääksesi" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Sulje välilehti" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Poista" @@ -954,6 +971,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Ohita tilin luomisvaihe" +#~ msgid "Please choose a file" +#~ msgstr "Valitse tiedosto" + #~ msgid "No local account found for " #~ msgstr "Paikallista tiliä ei löytynyt - " @@ -972,5 +992,11 @@ #~ msgid "Delete all history?" #~ msgstr "Poistetaanko koko historia?" +#~ msgid "Open tabs" +#~ msgstr "Avoimet välilehdet" + #~ msgid "Privacy" #~ msgstr "Yksityisyys" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Salli uusien välilehtien avaaminen taustalle" diff -Nru webbrowser-app-0.23+16.04.20151124/po/fr_CA.po webbrowser-app-0.23+16.04.20160413/po/fr_CA.po --- webbrowser-app-0.23+16.04.20151124/po/fr_CA.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/fr_CA.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-07-15 14:21+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: French (Canada) \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:41+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Annuler" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmation JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Erreur réseau" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "Rafraîchir la page" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Veuillez choisir un fichier" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Demande d'autorisation" @@ -329,6 +315,36 @@ "Vous avez essayé d'accéder à %1 mais le serveur a présenté un certificat de " "sécurité qui n'a pas réussi nos tests de sécurité pour une raison inconnue." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Oui" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Non" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Invite JavaScript" @@ -397,7 +413,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -427,8 +443,8 @@ msgid "Address;URL;www" msgstr "Adresse;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nouvel onglet" @@ -450,6 +466,10 @@ msgid "Open link in new tab" msgstr "Ouvrir le lien dans un nouvel onglet" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -459,7 +479,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Recharger" @@ -477,12 +497,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Tout sélectionner" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Partager" @@ -491,16 +516,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "rechercher ou saisir une adresse" @@ -519,8 +544,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -534,100 +559,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Enregistrer" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Page d’accueil" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Marque-pages" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Terminé" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nouvel onglet" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historique" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Ouvrir les onglets" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Paramètres" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Supprimer" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 page" msgstr[1] "%1 pages" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Moins" @@ -636,20 +679,20 @@ msgstr "Dernière visite" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Hier" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -657,32 +700,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Oui" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Non" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -693,16 +710,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Sites populaires" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -782,8 +799,12 @@ msgid "Which is run by" msgstr "Qui est exploité par" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Moteur de recherche" @@ -792,60 +813,56 @@ msgstr "Restaurer la session précédente au démarrage" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Autoriser l’ouverture de nouveaux onglets en arrière-plan" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Réinitialiser les paramètres du navigateur" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Effacer l’historique de navigation" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Vider le cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Effacer" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Toucher pour voir" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -944,6 +961,9 @@ #~ "Ubuntu suggère que vous vérifiez vos paramètres réseau et essayer de " #~ "rafraîchir la page." +#~ msgid "Please choose a file" +#~ msgstr "Veuillez choisir un fichier" + #~ msgid "Share…" #~ msgstr "Partager..." @@ -962,6 +982,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Ignorer l'étape de création de compte" +#~ msgid "Open tabs" +#~ msgstr "Ouvrir les onglets" + #~ msgid "Delete all history?" #~ msgstr "Supprimer tout l'historique?" @@ -970,3 +993,6 @@ #~ msgid "Privacy" #~ msgstr "Confidentialité" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Autoriser l’ouverture de nouveaux onglets en arrière-plan" diff -Nru webbrowser-app-0.23+16.04.20151124/po/fr.po webbrowser-app-0.23+16.04.20160413/po/fr.po --- webbrowser-app-0.23+16.04.20151124/po/fr.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/fr.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-25 11:31+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-20 19:09+0000\n" "Last-Translator: Anne \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Annuler" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmation JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Choisissez une application pour ouvrir ce fichier ou ajoutez le dans le " -"dossier Téléchargements." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Choisir une application" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Télécharger" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Erreur réseau" @@ -135,10 +123,6 @@ msgid "Refresh page" msgstr "Actualiser la page" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Veuillez choisir un fichier" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Demande d'autorisation" @@ -333,6 +317,37 @@ "Vous avez essayé d'accéder à %1 mais le serveur a présenté un certificat de " "sécurité qui n'a pas réussi nos tests de sécurité pour une raison inconnue." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Autoriser ce domaine à accéder à votre caméra et à votre microphone ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Autoriser ce domaine à accéder à votre caméra ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Autoriser ce domaine à accéder à votre microphone ?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (intégré dans %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Oui" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Non" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Invite JavaScript" @@ -401,7 +416,7 @@ msgid "Erase" msgstr "Effacer" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Trouver dans la page" @@ -431,8 +446,8 @@ msgid "Address;URL;www" msgstr "Adresse;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nouvel onglet" @@ -454,6 +469,10 @@ msgid "Open link in new tab" msgstr "Ouvrir le lien dans un nouvel onglet" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Ouvrir la vidéo dans un nouvel onglet" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Coller" @@ -463,7 +482,7 @@ msgstr "Rétablir" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Actualiser" @@ -481,12 +500,17 @@ msgid "Save link" msgstr "Enregistrer le lien" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Enregistrer la vidéo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Tout sélectionner" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Partager" @@ -495,16 +519,16 @@ msgstr "Annuler" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "trouver dans la page" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "rechercher ou saisir une adresse" @@ -523,8 +547,8 @@ msgstr "Dossier" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Tous les marque-pages" @@ -538,100 +562,120 @@ msgstr "Créer un nouveau dossier" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Enregistrer" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Page d’accueil" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Favoris" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Terminé" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nouvel onglet" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historique" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Onglets ouverts" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Téléchargements" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Quitter le mode privé" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Mode privé" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Paramètres" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Faites glisser vers le haut pour sortir du plein écran" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Appuyez sur Échap pour sortir du plein écran" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Choisissez une application pour ouvrir ce fichier ou ajoutez le dans le " +"dossier Téléchargements." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Choisir une application" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Télécharger" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Échec du téléchargement" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Reprendre" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirmer la sélection" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Supprimer" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Aucun téléchargement disponible" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 page" msgstr[1] "%1 pages" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Moins" @@ -640,20 +684,20 @@ msgstr "Visités récemment" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Hier" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Tout l'historique" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Aujourd'hui" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "chercher dans l'historique" @@ -661,33 +705,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Basculer en mode public fermera tous les onglets privés" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" -"Autoriser ce domaine à accéder à votre caméra et à votre microphone ?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Autoriser ce domaine à accéder à votre caméra ?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Autoriser ce domaine à accéder à votre microphone ?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (intégré dans %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Oui" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Non" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Ceci est un onglet privé" @@ -701,16 +718,16 @@ "l'historique de votre navigateur.\n" "Les marques-pages que vous créerez seront toutefois conservés." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Plus" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Sites populaires" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Vous n'avez pas encore visité de site" @@ -792,8 +809,12 @@ msgid "Which is run by" msgstr "Qui est géré par" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Par défaut" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Moteur de recherche" @@ -802,60 +823,56 @@ msgstr "Restaurer la session précédente au démarrage" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Autoriser l’ouverture de nouveaux onglets en arrière-plan" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Vie privée & permissions" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Réinitialiser les paramètres du navigateur" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Caméra & microphone" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Supprimer l’historique de navigation" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Effacer l'historique de navigation ?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Vider le cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Effacer le cache ?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Effacer" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Microphone" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Caméra" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Appuyez pour voir" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Fermer l'onglet" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Enlever" @@ -964,6 +981,9 @@ #~ msgid "Select an account" #~ msgstr "Sélectionner un compte" +#~ msgid "Please choose a file" +#~ msgstr "Veuillez choisir un fichier" + #~ msgid "No local account found for " #~ msgstr "Pas de compte local trouvé pour " @@ -973,6 +993,9 @@ #~ msgid "Share…" #~ msgstr "Partager..." +#~ msgid "Open tabs" +#~ msgstr "Onglets ouverts" + #~ msgid "Add" #~ msgstr "Ajouter" @@ -987,3 +1010,6 @@ #~ msgid "Privacy" #~ msgstr "Vie privée" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Autoriser l’ouverture de nouveaux onglets en arrière-plan" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ga.po webbrowser-app-0.23+16.04.20160413/po/ga.po --- webbrowser-app-0.23+16.04.20151124/po/ga.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ga.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-01-11 17:53+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Irish \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cealaigh" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -300,6 +286,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -368,7 +384,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -398,8 +414,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Cluaisín Nua" @@ -421,6 +437,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -430,7 +450,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -448,12 +468,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -462,16 +487,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -490,8 +515,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -505,100 +530,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -607,20 +650,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -628,32 +671,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -664,16 +681,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -749,8 +766,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -759,60 +780,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/gd.po webbrowser-app-0.23+16.04.20160413/po/gd.po --- webbrowser-app-0.23+16.04.20151124/po/gd.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/gd.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-09-03 13:32+0000\n" "Last-Translator: GunChleoc \n" "Language-Team: Fòram na Gàidhlig\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " "(n > 2 && n < 20) ? 2 : 3;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" "Language: gd\n" #: src/app/AlertDialog.qml:23 @@ -52,13 +52,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Sguir dheth" @@ -102,19 +105,6 @@ msgid "JavaScript Confirmation" msgstr "Dearbhadh JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Mearachd leis an lìonra" @@ -128,15 +118,13 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Thoir sùil air roghainnean an lìonraidh is feuch ath-nuadhachadh na " +"duilleige." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Ath-nuadhaich an duilleag" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Tagh faidhle" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Iarrtas cead" @@ -333,6 +321,40 @@ "tèarainteachd nach do sheas ris an dearbhadh tèarainteachd againn air " "adhbhar nach aithne dhuinn." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"A bheil thu airson cothrom a thoirt dhan àrainn seo air a’ chamara ’s " +"micreofon agad?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" +"A bheil thu airson cothrom a thoirt dhan àrainn seo air a’ chamara agad?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" +"A bheil thu airson cothrom a thoirt dhan àrainn seo air a’ mhicreofon agad?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (leabaichte ann an %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Falamhaich" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Na falamhaich" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Brodadh JavaScript" @@ -401,7 +423,7 @@ msgid "Erase" msgstr "Suath às" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Lorg san duilleag" @@ -431,8 +453,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www;Seòladh" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Taba ùr" @@ -454,6 +476,10 @@ msgid "Open link in new tab" msgstr "Fosgail an ceangal ann an taba ùr" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Fosgail a' video ann an taba ùr" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Cuir ann" @@ -463,7 +489,7 @@ msgstr "Ath-dhèan" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Ath-luchdaich" @@ -481,12 +507,17 @@ msgid "Save link" msgstr "Sàbhail an ceangal" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Sàbhail a' video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Tagh na h-uile" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Co-roinn" @@ -495,16 +526,16 @@ msgstr "Neo-dhèan" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "lorg san duilleag" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "lorg no cuir a-steach seòladh-lìn" @@ -523,8 +554,8 @@ msgstr "Sàbhail ann an" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "A h-uile comharra-lìn" @@ -538,92 +569,112 @@ msgstr "Cruthaich pasgan ùr" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Sàbhail" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Duilleag-dhachaigh" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Comharran-lìn" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Dèanta" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Taba ùr" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Eachdraidh" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Tabaichean fosgailte" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Luchdaidhean a-nuas" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Fàg am modh prìobhaideach" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Am modh prìobhaideach" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Roghainnean" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Grad-shlaighd suas gus am modh làn-sgrìn fhàgail" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Brùth air ESC gus am modh làn-sgrìn fhàgail" -#: src/app/webbrowser/DownloadsPage.qml:59 -msgid "Confirm selection" +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Tagh aplacaid a dh’fhosglas am faidhle seo no cuir e ri pasgan nan rudan a " +"chaidh a luchdadh a-nuas." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Tagh aplacaid" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Luchdaich a-nuas" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Dh’fhàillig an luchdadh a-nuas" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Lean air" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "Dearbh an taghadh" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Sguab às" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Chan eil dad ri luchdadh a-nuas" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -632,8 +683,8 @@ msgstr[2] "%1 duilleagan" msgstr[3] "%1 duilleag" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Nas lugha dheth" @@ -642,54 +693,28 @@ msgstr "Air a thadhal mu dheireadh" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "An-dè" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "An eachdraidh gu lèir" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "An-diugh" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "an eachdraidh luirg" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" msgstr "" "Ma thèid thu gun mhodh phoblach, thèid gach taba prìobhaideach a dhùnadh" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Falamhaich" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Na falamhaich" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Seo taba prìobhaideach" @@ -702,38 +727,41 @@ "Cha nochd na duilleagan air an seall thu ann an eachdraidh a' bhrabhsair.\n" "Cumaidh sinn na comharran-lìn a chruthaicheas tu co-dhiù." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Barrachd" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Gràinnean-mullaich nan làrach" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Cha do thadhail thu air làrach sam bith fhathast" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "Chaidh am pròiseas reandaraidh airson an taba seo a dhùnadh." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Chaidh rudeigin cearr nuair a dh’fheuch sinn ri %1 a thaisbeanadh." #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"Tha a’ chuimhne aig an t-siostam gann is chan urrainn dha an duilleag-lìn " +"seo a thaisbeanadh. Feuch is dùin tabaichean nach eil feum agad air is ath-" +"luchdaich e." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Dùin an taba" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -793,8 +821,12 @@ msgid "Which is run by" msgstr "A tha 'ga ruith le" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Bun-roghainn" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Inneal-luirg" @@ -803,60 +835,56 @@ msgstr "Aisig an seisean mu dheireadh leis an tòiseachadh" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Ceadaich fosgladh thabaichean ùra sa chùlaibh" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Prìobhaideachd ⁊ ceadan" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Ath-shuidhich roghainnean a' bhrabhsair" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Camara ⁊ micreofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Glan eachdraidh a' bhrabhsaidh" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "A bheil thu airson an eachdraidh brabhsaidh fhalamhachadh?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Glan an tasgadan" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "A bheil thu airson an tasgadan fhalamhachadh?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Falamhaich" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Micreofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Camara" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Thoir gnogag gus a shealltainn" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Dùin an taba" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Thoir air falbh" @@ -970,6 +998,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Leum seachad air cruthachadh cunntais" +#~ msgid "Please choose a file" +#~ msgstr "Tagh faidhle" + #~ msgid "Select an account" #~ msgstr "Tagh cunntas" @@ -982,6 +1013,9 @@ #~ msgid "see more" #~ msgstr "seall barrachd" +#~ msgid "Open tabs" +#~ msgstr "Tabaichean fosgailte" + #~ msgid "Delete all history?" #~ msgstr "Falamhaich an eachraidh gu lèir?" @@ -990,3 +1024,6 @@ #~ msgid "Privacy" #~ msgstr "Prìobhaideachd" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Ceadaich fosgladh thabaichean ùra sa chùlaibh" diff -Nru webbrowser-app-0.23+16.04.20151124/po/gl.po webbrowser-app-0.23+16.04.20160413/po/gl.po --- webbrowser-app-0.23+16.04.20151124/po/gl.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/gl.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-22 12:45+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-03-17 20:04+0000\n" "Last-Translator: Marcos Lans \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancelar" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmación de JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Seleccionar un aplicativo para abrir este ficheiro ou engadilo ao cartafol " -"de descargas." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Seleccionar aplicativo" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Descargar" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Erro de rede" @@ -133,10 +121,6 @@ msgid "Refresh page" msgstr "Actualizar a páxina" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Escolla un ficheiro" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Petición de permiso" @@ -331,6 +315,36 @@ "Intentou conectar con %1 pero o servidor presentou un certificado de " "seguranza que non superou as nosas comprobacións." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "Permiso" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Permite a este dominio acceder á cámara e ao micrófono?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Permite a este dominio acceder á cámara?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Permite a este dominio acceder ao micrófono?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (encaixada en %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Si" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Non" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Aviso de JavaScript" @@ -399,9 +413,9 @@ msgid "Erase" msgstr "Borrar" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "Atopar na páxina" +msgstr "Buscar na páxina" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. @@ -429,8 +443,8 @@ msgid "Address;URL;www" msgstr "Enderezo;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nova lapela" @@ -452,6 +466,10 @@ msgid "Open link in new tab" msgstr "Abrir a ligazón nunha nova lapela" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Abrir vídeo nunha lapela nova" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Pegar" @@ -461,7 +479,7 @@ msgstr "Refacer" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Recargar" @@ -479,12 +497,17 @@ msgid "Save link" msgstr "Gardar ligazón" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Gardar vídeo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Seleccionar todo" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Compartir" @@ -493,16 +516,16 @@ msgstr "Desfacer" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "buscar na páxina" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Buscar ou introducir un enderezo" @@ -521,8 +544,8 @@ msgstr "Gardar en" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Todos os marcadores" @@ -536,100 +559,120 @@ msgstr "Crear un novo cartafol" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Gardar" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Páxina de inicio" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Marcadores" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Feito" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nova lapela" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historial" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Abrir lapelas" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Descargas" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Saír do modo privado" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Modo privado" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Axustes" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Esvare cara a arriba e saia da pantalla completa" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Prema ESC e saia da pantalla completa" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Seleccionar un aplicativo para abrir este ficheiro ou engadilo ao cartafol " +"de descargas." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Seleccionar aplicativo" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Descargar" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Produciuse un fallo na descarga" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Continuar" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirmar selección" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Eliminar" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Non hai descargas dispoñíbeis" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 páxina" msgstr[1] "%1 páxinas" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menos" @@ -638,20 +681,20 @@ msgstr "Últimas visitas" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Onte" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Todo o historial" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Hoxe" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "buscar no historial" @@ -659,32 +702,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Ir ao modo público pechará todas as lapelas privadas" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Permite a este dominio acceder á cámara e ao micrófono?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Permite a este dominio acceder á cámara?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Permite a este dominio acceder ao micrófono?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (encaixada en %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Si" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Non" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Esta é unha lapela privada" @@ -697,16 +714,16 @@ "As páxinas que vexa nesta lapela non aparecerán no historial de navegación.\n" "Porén manteranse os marcadores que cree." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Máis" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Sitios destacados" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Aínda non visitou ningunha páxina" @@ -786,8 +803,12 @@ msgid "Which is run by" msgstr "Que está dirixido por" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Predeterminado" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de busca" @@ -796,60 +817,56 @@ msgstr "Restabelecer a sesión previa ao iniciar" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permitir novas lapelas en 2º plano" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privacidade e permisos" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Restabelecer axustes do navegador" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Cámara e micrófono" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Borrar historial de navegación" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Desexa borrar o historial de navegación?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Limpar a caché" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Desexa borrar a caché?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Borrar" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Micrófono" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Cámara" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Toque para ver" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Pechar a lapela" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Eliminar" @@ -951,6 +968,9 @@ #~ msgid "No local account found for " #~ msgstr "Non se atopou unha conta local de " +#~ msgid "Please choose a file" +#~ msgstr "Escolla un ficheiro" + #~ msgid "Select an account" #~ msgstr "Seleccionar unha conta" @@ -972,6 +992,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Saltar o paso para crear unha conta" +#~ msgid "Open tabs" +#~ msgstr "Abrir lapelas" + #~ msgid "Add" #~ msgstr "Engadir" @@ -980,3 +1003,6 @@ #~ msgid "Privacy" #~ msgstr "Privacidade" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permitir novas lapelas en 2º plano" diff -Nru webbrowser-app-0.23+16.04.20151124/po/he.po webbrowser-app-0.23+16.04.20160413/po/he.po --- webbrowser-app-0.23+16.04.20151124/po/he.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/he.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-12-23 13:15+0000\n" "Last-Translator: Yaron \n" "Language-Team: Hebrew \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "ביטול" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "אישור JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "יש לבחור ביישום לפתיחת הקובץ הזה או להוסיף אותו לתיקיית ההורדות." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "בחירת יישום" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "הורדה" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "שגיאת רשת" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "רענון העמוד" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "נא לבחור בקובץ" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "בקשת הרשאה" @@ -313,6 +299,36 @@ "ניסית להגיע אל %1 אך השרת הציג אישור אבטחה שלא צלח את בדיקות האבטחה שלנו " "מסיבות שאינן ידועות." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "כן" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "לא" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "בקשה מ־JavaScript" @@ -381,7 +397,7 @@ msgid "Erase" msgstr "מחיקה" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "איתור בעמוד" @@ -411,8 +427,8 @@ msgid "Address;URL;www" msgstr "כתובת;URL;www;דפדפן" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "לשונית חדשה" @@ -434,6 +450,10 @@ msgid "Open link in new tab" msgstr "פתיחת קישור בלשונית חדשה" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "הדבקה" @@ -443,7 +463,7 @@ msgstr "ביצוע חוזר" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "טעינה מחדש" @@ -461,12 +481,17 @@ msgid "Save link" msgstr "שמירת קישור" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "בחירת הכול" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "שיתוף" @@ -475,16 +500,16 @@ msgstr "ביטול" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "חיפוש בעמוד" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "ניתן לחפש או להזין כתובת" @@ -503,8 +528,8 @@ msgstr "שמירה תחת" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "כל הסימניות" @@ -518,100 +543,118 @@ msgstr "יצירת תיקייה חדשה" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "שמירה" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "דף הבית" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "סימניות" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "בוצע" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "לשונית חדשה" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "היסטוריה" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "לשוניות פתוחות" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "הורדות" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "יציאה ממצב פרטי" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "מצב פרטי" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "הגדרות" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "יש לגרור כלפי מעלה כדי לצאת ממסך מלא" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "יש ללחוץ על ESC כדי לצאת ממסך מלא" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "יש לבחור ביישום לפתיחת הקובץ הזה או להוסיף אותו לתיקיית ההורדות." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "בחירת יישום" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "הורדה" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "אישור הבחירה" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "מחיקה" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "אין הורדות זמינות" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "עמוד %1" msgstr[1] "%1 עמודים" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "פחות" @@ -620,20 +663,20 @@ msgstr "ביקרת לאחרונה" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "אתמול" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "כל ההיסטוריה" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "היום" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "היסטוריית החיפוש" @@ -641,32 +684,6 @@ msgid "Going to public mode will close all private tabs" msgstr "מעבר למצב ציבורי תסגור את כל הלשוניות הפרטיות" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "כן" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "לא" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "זוהי לשונית פרטית" @@ -679,16 +696,16 @@ "עמודים בהם צפית בלשונית זו לא יופיעו בהיסטוריית הדפדפן.\n" "עם זאת, הסימניות שתיווצרנה תישמרנה." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "פרטים נוספים" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "אתרים מובילים" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "לא ביקרת באף אתר עדיין" @@ -766,8 +783,12 @@ msgid "Which is run by" msgstr "שמופעל על־ידי" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "מנוע חיפוש" @@ -776,60 +797,56 @@ msgstr "שחזור ההפעלה הקודמת עם ההפעלה" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "לאפשר לפתוח לשוניות חדשות ברקע" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "איפוס הגדרות הדפדפן" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "מחיקת היסטוריית הגלישה" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "למחוק את היסטוריית הגלישה?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "מחיקת המטמון" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "למחוק את המטמון?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "ניקוי" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "יש לגעת כדי לצפות" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "סגירת הלשונית" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -936,6 +953,9 @@ #~ msgid "Skip account creation step" #~ msgstr "דילוג על שלב יצירת החשבון" +#~ msgid "Please choose a file" +#~ msgstr "נא לבחור בקובץ" + #~ msgid "Select an account" #~ msgstr "נא לבחור חשבון" @@ -954,5 +974,11 @@ #~ msgid "Delete all history?" #~ msgstr "האם למחוק את כל ההיסטוריה" +#~ msgid "Open tabs" +#~ msgstr "לשוניות פתוחות" + #~ msgid "Privacy" #~ msgstr "פרטיות" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "לאפשר לפתוח לשוניות חדשות ברקע" diff -Nru webbrowser-app-0.23+16.04.20151124/po/hi.po webbrowser-app-0.23+16.04.20160413/po/hi.po --- webbrowser-app-0.23+16.04.20151124/po/hi.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/hi.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-05-25 18:58+0000\n" "Last-Translator: Sambit \n" "Language-Team: Hindi \n" @@ -15,19 +15,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" -msgstr "" +msgstr "JavaScript अलर्ट" #: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 #: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 #: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101 #: src/app/webbrowser/LeavePrivateModeDialog.qml:39 msgid "OK" -msgstr "" +msgstr "ठीक" #: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 msgid "Authentication required." @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "" @@ -87,7 +90,7 @@ #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 msgid "Proceed anyway" -msgstr "" +msgstr "फिर भी आगे बढ़ें" #: src/app/CertificateVerificationDialog.qml:35 #: src/app/InvalidCertificateErrorSheet.qml:173 @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -143,11 +129,11 @@ #: src/app/GeolocationPermissionRequest.qml:33 msgid "Deny" -msgstr "" +msgstr "अस्वीकार करें" #: src/app/GeolocationPermissionRequest.qml:43 msgid "Allow" -msgstr "" +msgstr "स्वीकारें" #: src/app/InvalidCertificateErrorSheet.qml:55 msgid "This site security certificate is not trusted.\n" @@ -155,7 +141,7 @@ #: src/app/InvalidCertificateErrorSheet.qml:63 msgid "Learn more" -msgstr "" +msgstr "अधिक जानें" #. TRANSLATORS: %1 refers to the SSL certificate's serial number #: src/app/InvalidCertificateErrorSheet.qml:87 @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "डाउनलोड" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -901,3 +918,6 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "" #~ "उबुन्टु आपको अपने नेटवर्क सेटिंग जाँचने और पृष्ठ ताज़ा करने का सुझाव देता है" + +#~ msgid "Please choose a file" +#~ msgstr "कृपया एक फ़ाइल चुनें" diff -Nru webbrowser-app-0.23+16.04.20151124/po/hr.po webbrowser-app-0.23+16.04.20160413/po/hr.po --- webbrowser-app-0.23+16.04.20151124/po/hr.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/hr.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-12-07 23:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Croatian \n" @@ -16,8 +16,8 @@ "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" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Odustani" @@ -101,21 +104,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript potvrda" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Odaberite aplikaciju za otvaranje ove datoteke ili ju dodajte u mapu " -"preuzimanja." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Odaberite aplikaciju" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Preuzimanje" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Mrežna greška" @@ -128,16 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "Provjerite svoje mrežne postavke i pokušajte osvježiti stranicu." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Osvježi stranicu" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Odaberite datoteku" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Zatražena dozvola" @@ -332,6 +316,36 @@ "Pokušali ste dosegnuti %1 ali poslužitelj je predstavio sigurnosnu " "vjerodajnicu koja nije prošla našu sigurnosnu provjeru iz nepoznatog razloga." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Dopusti ovoj domeni pristup tvojoj kameri i mikrofonu?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Dopusti ovoj domeni pristup tvojoj kameri?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Dopusti ovoj domeni pristup tvojem i mikrofonu?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (uklopljeno u %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Da" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Ne" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript upit" @@ -400,7 +414,7 @@ msgid "Erase" msgstr "Obriši" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Potraži na stranici" @@ -430,8 +444,8 @@ msgid "Address;URL;www" msgstr "Adresa;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nova kartica" @@ -453,6 +467,10 @@ msgid "Open link in new tab" msgstr "Otvori poveznicu u novoj kartici" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Otvori video snimku u novoj kartici" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Zalijepi" @@ -462,7 +480,7 @@ msgstr "Ponovi" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Ponovo učitaj" @@ -480,12 +498,17 @@ msgid "Save link" msgstr "Spremi poveznicu" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Spremi video snimku" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Odaberi sve" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Podijeli" @@ -494,16 +517,16 @@ msgstr "Vrati" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "potraži na stranici" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "pretraži ili upiši adresu" @@ -522,8 +545,8 @@ msgstr "Spremi u" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Sve zabilješke" @@ -537,92 +560,112 @@ msgstr "Stvori novu mapu" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Spremi" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Početna stranica" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Zabilješke" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Završeno" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nova kartica" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Povijest" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Otvori kartice" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Preuzimanja" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Napusti privatan način" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privatan način" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Postavke" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Klizni za izlazak i cjelozaslonskog prikaza" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Pritisni ESC za izlazak i cjelozaslonskog prikaza" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Odaberite aplikaciju za otvaranje ove datoteke ili ju dodajte u mapu " +"preuzimanja." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Odaberite aplikaciju" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Preuzimanje" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Preuzimanje neuspjelo" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Nastavi" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Potvrdi odabir" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Obriši" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Nema dostupnih preuzimanja" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -630,8 +673,8 @@ msgstr[1] "%1 stranice" msgstr[2] "%1 stranica" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Manje" @@ -640,20 +683,20 @@ msgstr "Posljednje posjećeno" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Jučer" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Sva povijest" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Danas" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "pretraži povijest" @@ -661,32 +704,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Prijelaz u javni način će zatvoriti sve privatne kartice" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Da" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Ne" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Ovo je privatna kartica" @@ -700,16 +717,16 @@ "pregledavanja.\n" "Međutim, zabilješka koju stvorite biti će očuvana." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Više" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Popularne stranice" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Još niste posjetili niti jednu stranicu" @@ -789,8 +806,12 @@ msgid "Which is run by" msgstr "Koji je pogonjen s" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Zadano" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Pogon pretraživanja" @@ -799,62 +820,58 @@ msgstr "Vrati prijašnju sesiju pri pokretanju" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Dopusti pokretanje novih kartica u pozadini" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Privatnost i dozvole" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Vrati zadane postavke preglednika" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera i mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Obriši povijest pregledavanja" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Želite li obrisati povijest pretraživanja?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Obriši predmemoriju" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Želite li obrisati predmemoriju?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Obriši" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Dodirnite za prikaz" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Zatvori karticu" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Ukloni" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -933,7 +950,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Ups... Nešto je pošlo po krivu." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -956,9 +973,15 @@ #~ msgstr "" #~ "Ubuntu preporuča da provjerite mrežne postavke i probate osvježiti stranicu." +#~ msgid "Please choose a file" +#~ msgstr "Odaberite datoteku" + #~ msgid "Share…" #~ msgstr "Dijeli..." +#~ msgid "Open tabs" +#~ msgstr "Otvori kartice" + #~ msgid "see more" #~ msgstr "pogledaj više" @@ -977,6 +1000,9 @@ #~ msgid "Privacy" #~ msgstr "Privatnost" +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Dopusti pokretanje novih kartica u pozadini" + #~ msgid "Add" #~ msgstr "Dodaj" diff -Nru webbrowser-app-0.23+16.04.20151124/po/hu.po webbrowser-app-0.23+16.04.20160413/po/hu.po --- webbrowser-app-0.23+16.04.20151124/po/hu.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/hu.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-28 13:50+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-01-30 22:47+0000\n" "Last-Translator: Richard Somlói \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Mégse" @@ -87,7 +90,7 @@ #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 msgid "Proceed anyway" -msgstr "Folytatás mindenképp" +msgstr "Folytatás mindenképpen" #: src/app/CertificateVerificationDialog.qml:35 #: src/app/InvalidCertificateErrorSheet.qml:173 @@ -98,21 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript futtatásának jóváhagyása" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Adjon megy egy alkalmazást, amivel megnyitja ezt a fájlt, vagy válassza a " -"letöltések mappát." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Alkalmazás kiválasztása" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Letöltés" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Hálózati hiba" @@ -121,27 +109,24 @@ #: src/app/ErrorSheet.qml:42 #, qt-format msgid "It appears you are having trouble viewing: %1." -msgstr "Hiba történt a megjelenítés során: %1." +msgstr "Hiba történt a következő megjelenítése közben: %1." #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "Kérjük ellenőrizze a hálózati beállításait és frissítse az oldalt." +msgstr "" +"Kérjük ellenőrizze a hálózati beállításait, majd frissítse az oldalt." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Oldal frissítése" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Válasszon egy fájlt" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" -msgstr "Jogosultság igénylés" +msgstr "Jogosultságigénylés" #: src/app/GeolocationPermissionRequest.qml:29 msgid "This page wants to know your device’s location." -msgstr "Ez az oldal tudni szeretné az eszköze helyzetét." +msgstr "Ez az oldal hozzá szeretne férni a készüléke helyzetéhez." #: src/app/GeolocationPermissionRequest.qml:33 msgid "Deny" @@ -255,7 +240,7 @@ "which does not match the identity of the site." msgstr "" "Az elérni kívánt %1 oldalnál a kiszolgáló által nyújtott biztonsági " -"tanúsítvány nem egyezik az oldal identitásával." +"tanúsítvány nem egyezik meg az oldal identitásával." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:190 @@ -329,6 +314,37 @@ "Az elérni kívánt %1 oldalnál a kiszolgáló által nyújtott biztonsági " "tanúsítvány ismeretlen okból nem ment át a biztonsági ellenőrzésen." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Engedélyezi a a kamera- és a mikrofon-hozzáférést ennek a tartománynak?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Engedélyezi a a kamera-hozzáférést ennek a tartománynak?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Engedélyezi a a mikrofon-hozzáférést ennek a tartománynak?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (beágyazva ide: %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Igen" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nem" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript parancssor" @@ -397,7 +413,7 @@ msgid "Erase" msgstr "Törlés" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Keresés" @@ -427,8 +443,8 @@ msgid "Address;URL;www" msgstr "Cím;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Új lap" @@ -450,6 +466,10 @@ msgid "Open link in new tab" msgstr "Hivatkozás megnyitása új lapon" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Videó megnyitása új lapon" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Beillesztés" @@ -459,7 +479,7 @@ msgstr "Újra" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Újratöltés" @@ -477,12 +497,17 @@ msgid "Save link" msgstr "Hivatkozás mentése" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Videó mentése" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Összes kijelölése" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Megosztás" @@ -491,16 +516,16 @@ msgstr "Visszavonás" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "keresés" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "keresés vagy cím megadása" @@ -519,8 +544,8 @@ msgstr "Mentés ide" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Minden könyvjelző" @@ -534,100 +559,120 @@ msgstr "Új mappa létrehozása" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Mentés" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Kezdőlap" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Könyvjelzők" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Kész" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Új lap" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Előzmények" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Nyitott lapok" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Letöltések" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Privát mód bezárása" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privát mód" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Beállítások" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "Húzza felfelé az ujját a teljes képernyős mód elhagyásához" +msgstr "Felfelé húzással léphet ki a teljes képernyős módból" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" -msgstr "Nyomja meg az ESC billentyűt a teljes képernyős mód elhagyásához" +msgstr "Az ESC billentyű lenyomásával léphet ki a teljes képernyős módból" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Válasszon egy alkalmazást, amivel megnyitja ezt a fájlt, vagy csak töltse le " +"a Letöltések mappába." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Alkalmazás kiválasztása" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Letöltés" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "A letöltés meghiúsult" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Folytatás" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Kiválasztás megerősítése" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Törlés" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Nincsenek letöltések" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 oldal" msgstr[1] "%1 oldal" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Kevesebb" @@ -636,20 +681,20 @@ msgstr "Utoljára meglátogatott" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Tegnap" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Minden előzmény" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Ma" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "előzmények keresése" @@ -657,34 +702,6 @@ msgid "Going to public mode will close all private tabs" msgstr "A publikus módba visszatérés bezárja az összes privát lapot" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" -"Engedélyezi ennek a domainnévnek, hogy hozzáférjen a kamerához és " -"mikrofonhoz?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Engedélyezi ennek a domainnévnek, hogy hozzáférjen a kamerához?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Engedélyezi ennek a domainnévnek, hogy hozzáférjen a mikrofonhoz?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (beágyazva itt: %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Igen" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nem" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Ez egy privát lap" @@ -698,16 +715,16 @@ "előzményeinél.\n" "A létrehozott könyvjelzők azonban megmaradnak." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Több" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Leglátogatottabb oldalak" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Még nem látogatott meg egyetlen oldalt sem" @@ -735,7 +752,7 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" -msgstr "Ezen az oldalon nem megbízható a tartalom" +msgstr "Nem megbízható a tartalom ezen az oldalon" #: src/app/webbrowser/SecurityCertificatePopover.qml:70 msgid "Identity Not Verified" @@ -787,8 +804,12 @@ msgid "Which is run by" msgstr "Üzemeltető:" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Alapértelmezett" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Keresőmotor" @@ -797,60 +818,56 @@ msgstr "Előző munkamenet induláskor" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Új lap megnyitása a háttérben" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "Adatvédelem és jogosultságok" +msgstr "Adatvédelem és engedélyek" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Böngészőbeállítások visszaállítása" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Kamera és mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Böngészési előzmények törlése" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Törli az előzményeket?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Gyorsítótár törlése" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Törli a gyorsítótárat?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Törlés" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Koppintson a megtekintéshez" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Lap bezárása" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Eltávolítás" @@ -870,8 +887,7 @@ msgid "" "No accounts have been linked to this webapp; press the item below to add an " "account." -msgstr "" -"Nincs fiók megadva ennél a webalkalmazásnál. Itt adhat hozzá új fiókot." +msgstr "Nincs fiók megadva ennél a webalkalmazásnál. Itt adhat hozzá újat." #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" @@ -962,6 +978,9 @@ #~ msgid "Share…" #~ msgstr "Megosztás…" +#~ msgid "Please choose a file" +#~ msgstr "Válasszon egy fájlt" + #~ msgid "Select an account" #~ msgstr "Válasszon egy fiókot" @@ -974,8 +993,14 @@ #~ msgid "Add" #~ msgstr "Hozzáadás" +#~ msgid "Open tabs" +#~ msgstr "Nyitott lapok" + #~ msgid "Delete all history?" #~ msgstr "Összes előzmény törlése?" #~ msgid "Privacy" #~ msgstr "Adatvédelem" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Új lap megnyitása a háttérben" diff -Nru webbrowser-app-0.23+16.04.20151124/po/hy.po webbrowser-app-0.23+16.04.20160413/po/hy.po --- webbrowser-app-0.23+16.04.20151124/po/hy.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/hy.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-07-08 16:41+0000\n" "Last-Translator: iAbaS \n" "Language-Team: Armenian \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Կապի սխալ" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "Թարմացնել էջը" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "Հասցե;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Նոր ներդիր" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Թարմացնել" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ia.po webbrowser-app-0.23+16.04.20160413/po/ia.po --- webbrowser-app-0.23+16.04.20151124/po/ia.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ia.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-05-04 16:59+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Interlingua \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancellar" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmation JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Error de rete" @@ -126,15 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Per favor controla le configurationes de tu rete e proa a refrescar le pagina" #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Renovar le pagina" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Per favor selige un file" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Requesta de permission" @@ -330,6 +317,36 @@ "a attinger %1 sed le server presentava un certificato de securitate que " "falleva nostre controlos pro motivo incognite." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Consenti a iste dominio de acceder a tu camera e microphono?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Consenti a iste dominio de acceder a tu camera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Consenti a iste dominio de acceder a tu microphono?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (incastrate in %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Si" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "No" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Prompt de JavaScript" @@ -392,21 +409,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Secar" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Cancellar" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Cercar un pagina" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Cercar in Pagina" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -428,8 +445,8 @@ msgid "Address;URL;www" msgstr "Adresse;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nove scheda" @@ -451,16 +468,20 @@ msgid "Open link in new tab" msgstr "Aperir le ligamine in un nove scheda" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Aperir un video in un nove scheda" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Collar" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Refacer" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Recargar" @@ -476,159 +497,183 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "Salvar le ligamine" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Salvar un video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Selige tote" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Compartir" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Disfacer" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "cercar in un pagina" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "cercar o introducer un adress" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" -msgstr "" +msgstr "Signalibro addite" #. TRANSLATORS: Field where the title of bookmarked URL can be changed #: src/app/webbrowser/BookmarkOptions.qml:53 msgid "Name" -msgstr "" +msgstr "Nomine" #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "Savar in" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" -msgstr "" +msgstr "Tote le signalibros" #: src/app/webbrowser/BookmarkOptions.qml:93 #: src/app/webbrowser/BookmarkOptions.qml:133 msgid "New Folder" -msgstr "" +msgstr "Nove plica" #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "" +msgstr "Crear un nove plica" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Salvar" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Pagina initial" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Marcatores de libro" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Facite" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nove scheda" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historia" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Aperir le schedas" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Discargas" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "" +msgstr "Lassar le modo private" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" -msgstr "" +msgstr "Modo private" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Configurationes" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" -msgstr "" +msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "" +msgstr "Striar super pro exir del schermo plen" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" +msgstr "Pulsar ESC pro exir de schermo plen" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Eliger un application pro aperir iste file o adder lo al plica del discargas." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Eliger un application" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Discargar" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Discargamento fallite" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Resumer" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "Confirmar le selection" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Deler" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Nulle discargamentos dispodible" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 pagina" msgstr[1] "%1 paginas" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Minus" @@ -637,95 +682,74 @@ msgstr "Visitate ultimemente" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Heri" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Tote le chronologia" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Hodie" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "cercar le chronologia" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" +msgstr "Ir al modo public claudera tote le schedas private" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "" +msgstr "Iste es un scheda private" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" +"Le paginas que tu vide in iste scheda non apparera in tu chronologia del " +"navigator.\n" +"Sed essera preservate le signa libros tu ha create." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "" +msgstr "Plus" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Sitos maxime" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "" +msgstr "Tu non ha ancora visitate ulle sito" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "Le processo de render ha essite clause pro iste scheda." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Alcun cosa de mal capitava durante le monstra de %1." #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"Le systema es paupere de memoria e non pote monstrar iste pagina WEB. Prova " +"a clauder le schedas non necessari e a recargar." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Clauder le scheda" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -783,8 +807,12 @@ msgid "Which is run by" msgstr "Que es facite fluer per" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Predefinite" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de recerca" @@ -793,62 +821,58 @@ msgstr "Restaurar le session previe al initio" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permitter aperir nove tabellas in fundo" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Confidentialitate & licentias" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Restaurar al configurationes base le navigator" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Camera & microphono" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Cancellar le historia del navigator" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Clarar le chronologia del navigator?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Cancellar le memoria tampon" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Clarar le memoria tampon?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" -msgstr "" +msgstr "Nettar" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Microphono" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Camera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Toccar pro vider" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Clauder scheda" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Remover" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -867,6 +891,8 @@ "No accounts have been linked to this webapp; press the item below to add an " "account." msgstr "" +"Nulle conto ha essite ligate a iste application WEB; pulsa le elemento in " +"basso pro adder un conto." #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" @@ -874,54 +900,58 @@ #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "Non usar un conto" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "Error del conto" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "Clauder" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" +"Le fenestra del conto non pote ser aperte. Tu pote sol crear un conto per " +"vice; per favor reproba post haber claudite tote le altere fenestras de " +"conto." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 necessita acceder tu%2 conto in linea" #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 desirarea acceder tu conto in linea %2." #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" "Choose an account now, or skip this step and choose an online account later." msgstr "" +"Selige un conto ora, o salta iste grado e selige un conto in linea postea." #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "Clauder le application" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "Saltar" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "Eliger le conto" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Oops, alcun cosa iva mal." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -945,6 +975,9 @@ #~ "Ubuntu suggere tu verifica tu configurationes de rete e prova a renovar le " #~ "pagina." +#~ msgid "Please choose a file" +#~ msgstr "Per favor selige un file" + #~ msgid "Select an account" #~ msgstr "Seliger un conto" @@ -954,6 +987,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Saltar le grado del creation del conto" +#~ msgid "Open tabs" +#~ msgstr "Aperir le schedas" + #~ msgid "see more" #~ msgstr "vider plus" @@ -968,3 +1004,6 @@ #~ msgid "Privacy" #~ msgstr "Privacy" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permitter aperir nove tabellas in fundo" diff -Nru webbrowser-app-0.23+16.04.20151124/po/id.po webbrowser-app-0.23+16.04.20160413/po/id.po --- webbrowser-app-0.23+16.04.20151124/po/id.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/id.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-09-21 06:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Indonesian \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Batal" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Konfirmasi JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Galat Jaringan" @@ -126,15 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Tolong cek pengaturan jaringan anda dan coba menyegarkan ulang halaman." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Segarkan halaman" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Silakan pilih berkas" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Permintaan Izin" @@ -329,6 +316,36 @@ "Anda mencoba menuju %1 tapi server menyajikan suatu sertifikat keamanan yang " "tak lolos pemeriksaan keamanan kami dengan alasan yang tak diketahui." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Perbolehkan domain ini untuk mengakses kamera dan mikrophon anda?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Perbolehkan domain ini untuk mengakses kamera anda?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Perbolehkan domain ini untuk mengakses mikrophon anda?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (terembed di %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ya" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Tidak" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Pertanyaan JavaScript" @@ -391,21 +408,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Potong" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Hapus" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Cari di halaman" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Cari di halaman" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -427,8 +444,8 @@ msgid "Address;URL;www" msgstr "Alamat;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Tab Baru" @@ -444,22 +461,26 @@ #: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 msgid "Open link in new background tab" -msgstr "" +msgstr "Buka tautan di background tab" #: src/app/actions/OpenLinkInNewTab.qml:22 msgid "Open link in new tab" msgstr "Buka tautan di tab baru" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Tempel" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Ulangi" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Muat ulang" @@ -475,158 +496,182 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" +msgstr "Simpan link" + +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" -msgstr "" +msgstr "Pilih semua" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Berbagi" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Kembalikan" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "cari di halaman" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "cari atau masukkan sebuah alamat" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" -msgstr "" +msgstr "Bookmark ditambahkan" #. TRANSLATORS: Field where the title of bookmarked URL can be changed #: src/app/webbrowser/BookmarkOptions.qml:53 msgid "Name" -msgstr "" +msgstr "Nama" #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "Simpan di" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" -msgstr "" +msgstr "Semua Bookmark" #: src/app/webbrowser/BookmarkOptions.qml:93 #: src/app/webbrowser/BookmarkOptions.qml:133 msgid "New Folder" -msgstr "" +msgstr "Folder Baru" #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "" +msgstr "Buat folder baru" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" -msgstr "" +msgstr "Simpan" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" -msgstr "" +msgstr "Beranda" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Markah Buku" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Selesai" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Tab baru" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Riwayat" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Buka tab" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Unduhan" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "" +msgstr "Keluar Mode Pribadi" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" -msgstr "" +msgstr "Mode Pribadi" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" -msgstr "" +msgstr "Pengaturan" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" -msgstr "" +msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "" +msgstr "Geser keatas untuk keluar Mode Penuh" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" +msgstr "Tekan ESC untuk keluar Mode Penuh" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Pilih aplikasi untuk membuka file ini atau tambahkan ke folder download." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Pilih aplikasi" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Unduh" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Gagal mengunduh" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Lanjutkan" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "Konfirmasi pilihan" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" -msgstr "" +msgstr "Hapus" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Tidak ada download tersedia" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 halaman" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Kurang" @@ -635,95 +680,74 @@ msgstr "Terakhir Dikunjungi" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Kemarin" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Semua Riwayat" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Hari ini" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "riwayat pencaharian" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ya" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Tidak" +msgstr "Pergi ke mode publik akan menutup semua tab pribadi" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "" +msgstr "Ini adalah tab pribadi" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" +"Halaman yang anda lihat di tab ini tidak akan muncul di riwayat browser " +"anda.\n" +"Tetapi, Bookmark yang anda buat akan tetap disimpan." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "" +msgstr "Lainnya" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Situs top" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "" +msgstr "Anda belum mengunjungi situs apapun." #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "Proses merender telah ditutup untuk tab ini." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Sesuatu menjadi salah saat menampilkan %1." #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"Memori pada sistem ini penuh dan tidak bisa menampilkan halaman web. Coba " +"tutup tab yang tidak dipakai dan segarkan browser." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Tutup tab" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -731,43 +755,45 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:70 msgid "Identity Not Verified" -msgstr "" +msgstr "Identitas Tidak Terverifikasi" #: src/app/webbrowser/SecurityCertificatePopover.qml:78 msgid "The identity of this website has not been verified." -msgstr "" +msgstr "Identitas situs web ini belum diverifikasi." #: src/app/webbrowser/SecurityCertificatePopover.qml:89 msgid "Server certificate does not match the identity of the site." -msgstr "" +msgstr "Sertifikat server tidak cocok dengan identitas situs." #: src/app/webbrowser/SecurityCertificatePopover.qml:91 msgid "Server certificate has expired." -msgstr "" +msgstr "Sertifikat server telah kadaluwarsa." #: src/app/webbrowser/SecurityCertificatePopover.qml:93 msgid "Server certificate contains invalid dates." -msgstr "" +msgstr "Sertifikat server berisi tanggal yang tidak valid." #: src/app/webbrowser/SecurityCertificatePopover.qml:95 msgid "Server certificate is issued by an entity that is not trusted." -msgstr "" +msgstr "Sertifikat server dikeluarkan oleh entitas yang tidak terpercaya." #: src/app/webbrowser/SecurityCertificatePopover.qml:97 msgid "Server certificate has been revoked." -msgstr "" +msgstr "Sertifikat server telah dicabut." #: src/app/webbrowser/SecurityCertificatePopover.qml:99 msgid "Server certificate is invalid." -msgstr "" +msgstr "Sertifikat server tidak valid." #: src/app/webbrowser/SecurityCertificatePopover.qml:101 msgid "Server certificate is insecure." -msgstr "" +msgstr "Sertifikat server tidak aman." #: src/app/webbrowser/SecurityCertificatePopover.qml:103 msgid "Server certificate failed our security checks for an unknown reason." msgstr "" +"Sertifikat server menggagalkan pengecekan keamanan kami karena alasan yang " +"tidak diketahui." #: src/app/webbrowser/SecurityCertificatePopover.qml:126 msgid "You are connected to" @@ -777,72 +803,72 @@ msgid "Which is run by" msgstr "Yang dijalankan oleh" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Bawaan" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" -msgstr "" +msgstr "Mesin pencari" #: src/app/webbrowser/SettingsPage.qml:100 msgid "Restore previous session at startup" -msgstr "" +msgstr "Kembalikan sesi terakhir saat startup" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Privasi & perizinan" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" -msgstr "" +msgstr "Setel ulang setelan browser" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera & Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" -msgstr "" +msgstr "Hapus Riwayat Penjelajahan" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Bersihkan Riwayat Penjelajahan?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" -msgstr "" +msgstr "Hapus Cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Hapus Cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Bersihkan" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Sentuh untuk melihat" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Tutup Tab" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Hapus" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -861,6 +887,8 @@ "No accounts have been linked to this webapp; press the item below to add an " "account." msgstr "" +"Tidak ada akun yang dihubungkan dengan aplikasi web ini; tekan item dibawah " +"ini untuk menambahkan akun." #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" @@ -868,54 +896,58 @@ #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "Tidak menggunakan akun" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "Akun error" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "Tutup" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" +"Jendela akun tidak bisa dibuka. Kamu hanya dapat membuat satu akun pada saat " +"ini; tolong coba lagi setelah menutup jendela akun yang lain." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 memerlukan akses terhadap %2 akun online anda." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 memerlukan akses terhadap %2 akun online anda." #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" "Choose an account now, or skip this step and choose an online account later." msgstr "" +"Pilih akun sekarang, atau lewati step ini dan pilih untuk membuat akun lain " +"waktu." #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "Tutup aplikasi" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "Lewati" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "Pilih akun" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Ups ... Ada sesuatu yang salah." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -933,9 +965,15 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "Internet;WWW;Peramban;Web;Explorer" +#~ msgid "Please choose a file" +#~ msgstr "Silakan pilih berkas" + #~ msgid "Share…" #~ msgstr "Berbagi..." +#~ msgid "Open tabs" +#~ msgstr "Buka tab" + #~ msgid "see more" #~ msgstr "lihat lebih banyak" @@ -962,3 +1000,6 @@ #~ msgstr "" #~ "Ubuntu menyarankan Anda untuk memeriksa pengaturan jaringan Anda dan mencoba " #~ "menyegarkan halaman." + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Memperbolehkan membuka tab baru di background" diff -Nru webbrowser-app-0.23+16.04.20151124/po/is.po webbrowser-app-0.23+16.04.20160413/po/is.po --- webbrowser-app-0.23+16.04.20151124/po/is.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/is.po 2016-04-13 15:22:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-10-05 08:44+0000\n" "Last-Translator: Sveinn í Felli \n" "Language-Team: Icelandic \n" @@ -16,8 +16,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" "Language: is\n" #: src/app/AlertDialog.qml:23 @@ -52,13 +52,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Hætta við" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Staðfesting JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Villa í netkerfi" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "Endurlesa síðu" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Veldu einhverja skrá" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Fyrirspurn um heimild" @@ -294,6 +280,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Já" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nei" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript kvaðning" @@ -362,7 +378,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -392,8 +408,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nýr flipi" @@ -415,6 +431,10 @@ msgid "Open link in new tab" msgstr "Opna tengil í nýjum flipa" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -424,7 +444,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Endurlesa" @@ -442,12 +462,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Deila" @@ -456,16 +481,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "leita eða slá inn netfang" @@ -484,8 +509,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -499,100 +524,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Bókamerki" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Lokið" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nýr flipi" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Ferill" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Opna flipa" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 síða" msgstr[1] "%1 síður" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Minna" @@ -601,20 +644,20 @@ msgstr "Síðast heimsótt" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Í gær" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -622,32 +665,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Já" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nei" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -658,16 +675,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Efstu vefir" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -743,8 +760,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -753,60 +774,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Hreinsa" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Sláðu á til að skoða" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -899,6 +916,9 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "" +#~ msgid "Please choose a file" +#~ msgstr "Veldu einhverja skrá" + #~ msgid "Share…" #~ msgstr "Deila..." @@ -914,6 +934,9 @@ #~ msgid "Select an account" #~ msgstr "Veldu aðgang" +#~ msgid "Open tabs" +#~ msgstr "Opna flipa" + #~ msgid "Delete all history?" #~ msgstr "Eyða öllum ferli?" diff -Nru webbrowser-app-0.23+16.04.20151124/po/it.po webbrowser-app-0.23+16.04.20160413/po/it.po --- webbrowser-app-0.23+16.04.20151124/po/it.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/it.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-11-18 18:17+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-03-05 09:11+0000\n" "Last-Translator: Claudio Arseni \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Annulla" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Conferma JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Scegliere un'applicazione con cui aprire questo file o aggiungerlo nella " -"cartella degli scaricamenti." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Scegli un'applicazione" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Scarica" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Errore di rete" @@ -134,10 +122,6 @@ msgid "Refresh page" msgstr "Aggiorna la pagina" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Selezionare un file" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Richiesta permessi" @@ -332,6 +316,36 @@ "Tentato l'accesso a %1, ma il server ha fornito un certificato di sicurezza " "che non ha superato i controlli per ragioni sconosciute." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Consentire a questo dominio di accedere a fotocamera e microfono?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Consentire a questo dominio di accedere alla fotocamera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Consentire a questo dominio di accedere al microfono?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (incorporato in %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Sì" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "No" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Prompt JavaScript" @@ -400,7 +414,7 @@ msgid "Erase" msgstr "Cancella" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Trova nella pagina" @@ -430,8 +444,8 @@ msgid "Address;URL;www" msgstr "Indirizzo;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nuova scheda" @@ -453,6 +467,10 @@ msgid "Open link in new tab" msgstr "Apri collegamento in una nuova scheda" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Apri il video in nuova scheda" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Incolla" @@ -462,7 +480,7 @@ msgstr "Ripeti" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Ricarica" @@ -480,12 +498,17 @@ msgid "Save link" msgstr "Salva collegamento" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Salva il video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Seleziona tutto" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Condividi" @@ -494,16 +517,16 @@ msgstr "Annulla" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "trova nella pagina" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Cercare o immettere un indirizzo" @@ -522,8 +545,8 @@ msgstr "Salva in" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Tutti i segnalibri" @@ -537,100 +560,120 @@ msgstr "Crea nuova cartella" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Salva" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Pagina iniziale" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Segnalibri" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Fatto" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nuova scheda" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Cronologia" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Apri schede" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Scaricamenti" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Esci dalla modalità privata" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Modalità privata" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Impostazioni" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Scorrere verso l'alto per uscire da schermo intero" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Premere Esc per uscire da schermo intero" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Scegliere un'applicazione con cui aprire questo file o aggiungerlo nella " +"cartella degli scaricamenti." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Scegli un'applicazione" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Scarica" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Scaricamento non riuscito" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Riprendi" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Conferma selezione" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Elimina" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Nessuno scaricamento disponibile" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 pagina" msgstr[1] "%1 pagine" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Meno" @@ -639,20 +682,20 @@ msgstr "Ultima pagina visitata" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ieri" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Tutta la cronologia" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Oggi" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "cronologia ricerca" @@ -660,32 +703,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Tornare alla modalità pubblica chiuderà tutte le schede private" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Consentire a questo dominio di accedere a fotocamera e microfono?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Consentire a questo dominio di accedere alla fotocamera?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Consentire a questo dominio di accedere al microfono?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (incorporato in %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Sì" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "No" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Questa è una scheda privata" @@ -699,16 +716,16 @@ "browser.\n" "I segnalibri creati verranno salvati." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Altro" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Siti principali" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Non è stato visitato alcun sito web" @@ -789,8 +806,12 @@ msgid "Which is run by" msgstr "Che è gestito da" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Predefinito" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motore di ricerca" @@ -799,60 +820,56 @@ msgstr "Ripristina ultima sessione all'avvio" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Consenti l'apertura di nuove schede in secondo piano" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privacy e permessi" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Ripristina le impostazioni del browser" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Fotocamera e microfono" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Cancella cronologia di navigazione" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Pulire la cronologia di navigazione?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Cancella cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Pulire la cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Pulisci" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Microfono" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Fotocamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tocca per visualizzare" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Chiudi scheda" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Rimuovi" @@ -961,6 +978,9 @@ #~ msgid "No local account found for " #~ msgstr "Nessun account locale trovato per " +#~ msgid "Please choose a file" +#~ msgstr "Selezionare un file" + #~ msgid "Select an account" #~ msgstr "Seleziona un account" @@ -973,6 +993,9 @@ #~ msgid "see less" #~ msgstr "mostra meno" +#~ msgid "Open tabs" +#~ msgstr "Apri schede" + #~ msgid "Add" #~ msgstr "Aggiungi" @@ -984,3 +1007,6 @@ #~ msgid "Privacy" #~ msgstr "Privacy" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Consenti l'apertura di nuove schede in secondo piano" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ja.po webbrowser-app-0.23+16.04.20160413/po/ja.po --- webbrowser-app-0.23+16.04.20151124/po/ja.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ja.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-09-18 06:34+0000\n" "Last-Translator: Mitsuya Shibata \n" "Language-Team: Japanese \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "キャンセル" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScriptの確認" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "このファイルを開くアプリケーションを選択するか、downloadsフォルダーに追加してください。" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "アプリケーションを選択" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "ダウンロード" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "ネットワークエラー" @@ -123,16 +113,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "ネットワーク設定を確認して、ページを更新してください。" #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "ページを更新" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "ファイルを選択してください" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "許可を求めています" @@ -310,6 +296,36 @@ "このサイトセキュリティ証明書は信頼できません。\n" "%1に接続しようとしましたが、サーバーは不明な理由でセキュリティチェックに失敗したセキュリティ証明書を提示しています。" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "このドメインがカメラとマイクにアクセスすることを許可しますか?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "このドメインがカメラにアクセスすることを許可しますか?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "このドメインがマイクにアクセスすることを許可しますか?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (%2 に埋め込まれている)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "はい" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "いいえ" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScriptのプロンプト" @@ -378,7 +394,7 @@ msgid "Erase" msgstr "削除" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "ページ内検索" @@ -408,8 +424,8 @@ msgid "Address;URL;www" msgstr "アドレス;Address;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "新しいタブ" @@ -431,6 +447,10 @@ msgid "Open link in new tab" msgstr "新しいタブでリンクを開く" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "新しいタブで動画で開く" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "貼り付け" @@ -440,7 +460,7 @@ msgstr "やり直す" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "再読み込み" @@ -458,12 +478,17 @@ msgid "Save link" msgstr "リンクを保存" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "動画を保存" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "すべて選択" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "共有" @@ -472,16 +497,16 @@ msgstr "元に戻す" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "ページ内検索" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "検索 / アドレスの入力" @@ -497,11 +522,11 @@ #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "保存先" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "すべてのブックマーク" @@ -515,99 +540,117 @@ msgstr "新しいフォルダーを作成" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "保存" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "ホームページ" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "ブックマーク" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "完了" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "新しいタブ" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "履歴" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "タブを表示" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "ダウンロード" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "プライベートモードを離れる" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "プライベートモード" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "設定" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "フルスクリーン表示を終了するには上にスワイプしてください" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "フルスクリーン表示を終了するにはESCキーを押してください" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "このファイルを開くアプリケーションを選択するか、downloadsフォルダーに追加してください。" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "アプリケーションを選択" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "ダウンロード" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "ダウンロードに失敗しました" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "再開する" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "選択を確認" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "削除" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "ダウンロードはありません" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1ページ" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "隠す" @@ -616,52 +659,26 @@ msgstr "直近の訪問" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "昨日" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "すべての履歴" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "今日" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "検索履歴" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "はい" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "いいえ" +msgstr "パブリックモードに移行するとすべてのプライベートタブを閉じます" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" @@ -672,19 +689,21 @@ "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" +"このタブで見ているページはブラウザ履歴には表示されません。\n" +"ただし、作成したブックマークについては保存されます。" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "" +msgstr "もっと表示する" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "よく訪れるサイト" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "" +msgstr "まだどのサイトも訪れていません" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." @@ -694,7 +713,7 @@ #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "%1 の表示中にエラーが発生しました。" #: src/app/webbrowser/SadTab.qml:67 msgid "" @@ -756,10 +775,14 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:148 msgid "Which is run by" -msgstr "" +msgstr "次によって実行:" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "デフォルト" #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "検索エンジン" @@ -768,62 +791,58 @@ msgstr "起動時に前回のセッションを復元する" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "新しいタブをバックグラウンドで開くのを許可する" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "プライバシーとアクセス許可" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "ブラウザの設定をリセットする" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "カメラとマイク" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "ブラウジング履歴を消去する" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "ブラウジング履歴を消去しますか？" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "キャッシュをクリアする" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "キャッシュを消去しますか？" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "クリア" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "マイク" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "カメラ" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "表示するにはタップ" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "タブを閉じる" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "削除する" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -841,7 +860,7 @@ msgid "" "No accounts have been linked to this webapp; press the item below to add an " "account." -msgstr "" +msgstr "このウェブアプリにリンクされたアカウントはありません。アカウントを追加するために以下の項目から選んで下さい。" #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" @@ -864,18 +883,20 @@ "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" +"アカウントウィンドウを開けませんでした。1度に1つのアカウントのみを作成することができます。他のすべてのアカウントウィンドウを閉じた後で、もう一度試してく" +"ださい。" #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 はあなたの %2 アカウントへのアクセスを必要としています。" #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 はあなたの %2 アカウントにアクセスしようとしています。" #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" @@ -888,15 +909,15 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "スキップ" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "アカウントを選択してください" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "エラーが発生しました。" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -918,6 +939,9 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "ネットワーク設定を確認してページを更新してみてください" +#~ msgid "Please choose a file" +#~ msgstr "ファイルを選択してください" + #~ msgid "Delete all history?" #~ msgstr "履歴をすべて削除しますか？" @@ -927,6 +951,9 @@ #~ msgid "Share…" #~ msgstr "共有..." +#~ msgid "Open tabs" +#~ msgstr "タブを表示" + #~ msgid "see more" #~ msgstr "さらに表示" @@ -944,3 +971,6 @@ #~ msgid "Privacy" #~ msgstr "プライバシー" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "新しいタブをバックグラウンドで開くのを許可する" diff -Nru webbrowser-app-0.23+16.04.20151124/po/km.po webbrowser-app-0.23+16.04.20160413/po/km.po --- webbrowser-app-0.23+16.04.20151124/po/km.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/km.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-09-01 10:08+0000\n" "Last-Translator: Sophea Sok \n" "Language-Team: Khmer \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "បោះ​បង់" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "ការ​បញ្ជាក់ JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "ជ្រើស​កម្មវិធី​ដើម្បី​បើក​ឯកសារ​នេះ ឬ​បន្ថែម​វា​ទៅកាន់​ថត​ទាញ​យក។" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "ជ្រើស​កម្មវិធី" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "ទាញ​យក" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "កំហុស​បណ្ដាញ" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "ផ្ទុក​ទំព័រ​ឡើងវិញ" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "សូម​ជ្រើស​ឯកសារ" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "ស្នើ​សិទ្ធិ" @@ -333,6 +319,36 @@ "ទេប៉ុន្តែម៉ាស៊ីនបម្រើបានបង្ហាញវិញ្ញាបនបត្រសន្តិសុខមួយដែលបានបរាជ័យក្នុងការត្រួ" "តពិនិត្យសន្តិសុខរបស់យើងសម្រាប់ហេតុផលដែលមិនស្គាល់មួយ ។" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "បាទ/ចាស" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "ទេ" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "ប្រាប់ JavaScript" @@ -401,7 +417,7 @@ msgid "Erase" msgstr "លុប" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "រក​មើល​ក្នុង​ទំព័រ" @@ -431,8 +447,8 @@ msgid "Address;URL;www" msgstr "អាសយដ្ឋាន;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "ផ្ទាំង​ថ្មី" @@ -454,6 +470,10 @@ msgid "Open link in new tab" msgstr "បើក​តំណ​ក្នុង​ផ្ទាំង​ថ្មី" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "​បិទភ្ជាប់" @@ -463,7 +483,7 @@ msgstr "ធ្វើ​វិញ" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "ផ្ទុក​ឡើង​វិញ" @@ -481,12 +501,17 @@ msgid "Save link" msgstr "រក្សាទុក​តំណ" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "ជ្រើស​ទាំងអស់" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "ចែករំលែក" @@ -495,16 +520,16 @@ msgstr "​មិន​ធ្វើ​វិញ" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "រក​មើល​ក្នុង​ទំព័រ" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "ស្វែងរក ឬ​បញ្ចូល​អាសយដ្ឋាន" @@ -523,8 +548,8 @@ msgstr "រក្សាទុក​ក្នុង" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "ចំណាំ​ទាំងអស់" @@ -538,99 +563,117 @@ msgstr "បង្កើតថតថ្មី" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "រក្សា​ទុក" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "គេហទំព័រ" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "ចំណាំ" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "ធ្វើរួច" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "ផ្ទាំង​ថ្មី" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "ប្រវត្តិ" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "បើក​ផ្ទាំង" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "ការ​ទាញយក" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "បិទ​របៀប​ឯកជន" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "របៀប​ឯកជន" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "ការ​កំណត់" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "រុញ​ឡើង​លើ​ដើម្បី​បិទ​របៀប​ពេញ​អេក្រង់" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "ចុច​គេច (ESC) ដើម្បី​បិទ​របៀប​ពេញ​អេក្រង់" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "ជ្រើស​កម្មវិធី​ដើម្បី​បើក​ឯកសារ​នេះ ឬ​បន្ថែម​វា​ទៅកាន់​ថត​ទាញ​យក។" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "ជ្រើស​កម្មវិធី" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "ទាញ​យក" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "បន្ត" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "បញ្ជាក់​ជម្រើស" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "​លុប​" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "មិន​មាន​ការ​ទាញ​យក" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 ទំព័រ" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "តិចជាង" @@ -639,20 +682,20 @@ msgstr "បាន​មើល​ចុងក្រោយ" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "ម្សិល​មិញ" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "ប្រវត្តិ​ទាំងអស់" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "ថ្ងៃនេះ" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "ប្រវត្តិ​ស្វែងរក" @@ -660,32 +703,6 @@ msgid "Going to public mode will close all private tabs" msgstr "ការ​ទៅកាន់​របៀប​សាធារណៈ វា​នឹង​បិទ​ផ្ទាំង​ឯកជន​ទាំងអស់" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "បាទ/ចាស" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "ទេ" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "នេះ​ជា​ផ្ទាំង​ឯកជន" @@ -699,16 +716,16 @@ "នឹង​មិន​លេចឡើង​នៅ​ក្នុង​ប្រវត្តិ​កម្មវិធី​អ៊ីនធឺណិត​របស់​អ្នក​ឡើយ។\n" "ទោះ​យ៉ាងណា ចំណាំ​ដែល​អ្នក​បង្កើត​នឹង​ត្រូវ​បាន​រក្សាទុក។" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "ច្រើនទៀត" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "តំបន់បណ្ដាញ​ពេញនិយម" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "អ្នក​មិនទាន់​បាន​ទស្សនា​វេបសាយ​ណាមួយ​នៅ​ឡើយ​ទេ" @@ -789,8 +806,12 @@ msgid "Which is run by" msgstr "ដែលត្រូវបានគ្រប់គ្រងដោយ" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "​លំនាំដើម" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "ម៉ាស៊ីន​ស្វែងរក" @@ -799,62 +820,58 @@ msgstr "ស្ដារ​សម័យ​មុន​ដែល​នៅ​ពេល​ចាប់​ផ្ដើម" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "អនុញ្ញាត​ឱ្យ​មាន​ការ​បើក​ផ្ទាំង​ថ្មី​ក្នុង​​ខាង​ក្រោយ" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "​កំណត់​កម្មវិធី​រុករក​ឡើង​វិញ" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "ជម្រះ​ប្រវត្តិ​ការរុករក" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "សម្អាត​ប្រវត្តិ​ស្វែងរក?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "ជម្រះ​ឃ្លាំង​សម្ងាត់" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "សម្អាត​ឃ្លាំង​សម្ងាត់?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "សម្អាត" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "មីក្រូហ្វូន" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "ម៉ាស៊ីន​ថត" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "ប៉ះ​ដើម្បី​មើល" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "បិទ​ផ្ទាំង" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "យកចេញ" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -957,6 +974,9 @@ #~ "Ubuntu ស្នើ​ឲ្យ​អ្នក​ពិនិត្យ​ការ​កំណត់​បណ្ដាញ​របស់​អ្នក " #~ "និង​ព្យាយាម​ផ្ទុក​ទំព័រ​ឡើងវិញ។" +#~ msgid "Please choose a file" +#~ msgstr "សូម​ជ្រើស​ឯកសារ" + #~ msgid "Select an account" #~ msgstr "ជ្រើស​គណនី" @@ -975,6 +995,9 @@ #~ msgid "see more" #~ msgstr "មើល​ច្រើន​ជាង" +#~ msgid "Open tabs" +#~ msgstr "បើក​ផ្ទាំង" + #~ msgid "Add" #~ msgstr "បន្ថែម" @@ -983,3 +1006,6 @@ #~ msgid "Privacy" #~ msgstr "ភាពឯកជន" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "អនុញ្ញាត​ឱ្យ​មាន​ការ​បើក​ផ្ទាំង​ថ្មី​ក្នុង​​ខាង​ក្រោយ" diff -Nru webbrowser-app-0.23+16.04.20151124/po/kn.po webbrowser-app-0.23+16.04.20160413/po/kn.po --- webbrowser-app-0.23+16.04.20151124/po/kn.po 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/kn.po 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,915 @@ +# Kannada translation for webbrowser-app +# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016 +# This file is distributed under the same license as the webbrowser-app package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: webbrowser-app\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-03-26 10:16+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Kannada \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" + +#: src/app/AlertDialog.qml:23 +msgid "JavaScript Alert" +msgstr "" + +#: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 +#: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 +#: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101 +#: src/app/webbrowser/LeavePrivateModeDialog.qml:39 +msgid "OK" +msgstr "ಸರಿ" + +#: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 +msgid "Authentication required." +msgstr "ದೃಢೀಕರಣ ಅವಶ್ಯಕವಾಗಿದೆ." + +#. TRANSLATORS: %1 refers to the URL of the current website +#: src/app/AuthenticationDialog.qml:26 +#, qt-format +msgid "The website %1 requires authentication." +msgstr "%1 - ಈ ಜಾಲತಾಣಕ್ಕೆ ದೃಢೀಕರಣ ಅವಶ್ಯಕವಾಗಿದೆ." + +#: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 +msgid "Username" +msgstr "ಬಳಕೆದಾರರ ಹೆಸರು" + +#: src/app/AuthenticationDialog.qml:41 src/app/HttpAuthenticationDialog.qml:49 +msgid "Password" +msgstr "ಗುಪ್ತ ಪದ" + +#: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 +#: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 +#: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 +#: src/app/webbrowser/ContextMenuMobile.qml:139 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 +#: src/app/webbrowser/LeavePrivateModeDialog.qml:32 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 +#: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 +msgid "Cancel" +msgstr "ರದ್ದುಗೊಳಿಸು" + +#: src/app/BeforeUnloadDialog.qml:23 +msgid "Confirm Navigation" +msgstr "" + +#: src/app/BeforeUnloadDialog.qml:26 +msgid "Leave" +msgstr "ಬಿಟ್ಟುಬಿಡು" + +#: src/app/BeforeUnloadDialog.qml:31 +msgid "Stay" +msgstr "ಉಳಿಸು" + +#: src/app/CertificateVerificationDialog.qml:24 +msgid "This connection is untrusted" +msgstr "" + +#. TRANSLATORS: %1 refers to the hostname +#: src/app/CertificateVerificationDialog.qml:26 +#, qt-format +msgid "" +"You are trying to securely reach %1, but the security certificate of this " +"website is not trusted." +msgstr "" + +#: src/app/CertificateVerificationDialog.qml:29 +#: src/app/InvalidCertificateErrorSheet.qml:160 +msgid "Proceed anyway" +msgstr "" + +#: src/app/CertificateVerificationDialog.qml:35 +#: src/app/InvalidCertificateErrorSheet.qml:173 +msgid "Back to safety" +msgstr "" + +#: src/app/ConfirmDialog.qml:23 +msgid "JavaScript Confirmation" +msgstr "" + +#: src/app/ErrorSheet.qml:36 +msgid "Network Error" +msgstr "" + +#. TRANSLATORS: %1 refers to the URL of the current page +#: src/app/ErrorSheet.qml:42 +#, qt-format +msgid "It appears you are having trouble viewing: %1." +msgstr "" + +#: src/app/ErrorSheet.qml:48 +msgid "Please check your network settings and try refreshing the page." +msgstr "" + +#: src/app/ErrorSheet.qml:53 +msgid "Refresh page" +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:28 +msgid "Permission Request" +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:29 +msgid "This page wants to know your device’s location." +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:33 +msgid "Deny" +msgstr "" + +#: src/app/GeolocationPermissionRequest.qml:43 +msgid "Allow" +msgstr "" + +#: src/app/InvalidCertificateErrorSheet.qml:55 +msgid "This site security certificate is not trusted.\n" +msgstr "" + +#: src/app/InvalidCertificateErrorSheet.qml:63 +msgid "Learn more" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's serial number +#: src/app/InvalidCertificateErrorSheet.qml:87 +#, qt-format +msgid "" +"Serial number:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's subject display name +#: src/app/InvalidCertificateErrorSheet.qml:94 +#, qt-format +msgid "" +"Subject:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's subject's address +#: src/app/InvalidCertificateErrorSheet.qml:102 +#, qt-format +msgid "" +"Subject address:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's issuer display name +#: src/app/InvalidCertificateErrorSheet.qml:113 +#, qt-format +msgid "" +"Issuer:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's issuer's address +#: src/app/InvalidCertificateErrorSheet.qml:121 +#, qt-format +msgid "" +"Issuer address:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's start date +#: src/app/InvalidCertificateErrorSheet.qml:132 +#, qt-format +msgid "" +"Valid from:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's expiry date +#: src/app/InvalidCertificateErrorSheet.qml:139 +#, qt-format +msgid "" +"Valid until:\n" +"%1" +msgstr "" + +#. TRANSLATORS: %1 refers to the SSL certificate's SHA1 fingerprint +#: src/app/InvalidCertificateErrorSheet.qml:146 +#, qt-format +msgid "" +"Fingerprint (SHA1):\n" +"%1" +msgstr "" + +#: src/app/InvalidCertificateErrorSheet.qml:153 +msgid "" +"You should not proceed, especially if you have never seen this warning " +"before for this site." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:187 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which does not match the identity of the site." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:190 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which has expired." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:193 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which contains invalid dates." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:196 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"issued by an entity that is not trusted." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:199 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"that has been revoked." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:202 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented an invalid security " +"certificate." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:205 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented an insecure security " +"certificate." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:208 +#, qt-format +msgid "" +"This site security certificate is not trusted\n" +"You attempted to reach %1 but the server presented a security certificate " +"which failed our security checks for an unknown reason." +msgstr "" + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + +#: src/app/PromptDialog.qml:23 +msgid "JavaScript Prompt" +msgstr "" + +#: src/app/ProxyAuthenticationDialog.qml:22 +msgid "Proxy authentication required." +msgstr "" + +#. TRANSLATORS: %1 refers to the proxy address, %2 refers to the proxy port +#: src/app/ProxyAuthenticationDialog.qml:24 +#, qt-format +msgid "The website %1:%2 requires authentication." +msgstr "" + +#: src/app/actions/Back.qml:23 +msgid "Back" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Back' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Back.qml:26 +msgid "Older Page" +msgstr "" + +#: src/app/actions/Bookmark.qml:23 +msgid "Bookmark" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Bookmark' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Bookmark.qml:26 +msgid "Add This Page to Bookmarks" +msgstr "" + +#: src/app/actions/BookmarkLink.qml:22 +msgid "Bookmark link" +msgstr "" + +#: src/app/actions/ClearHistory.qml:23 +msgid "Clear History" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Clear History' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/ClearHistory.qml:26 +msgid "Clear Navigation History" +msgstr "" + +#: src/app/actions/Copy.qml:22 +msgid "Copy" +msgstr "" + +#: src/app/actions/CopyImage.qml:22 +msgid "Copy image" +msgstr "" + +#: src/app/actions/CopyLink.qml:22 +msgid "Copy link" +msgstr "" + +#: src/app/actions/Cut.qml:22 +msgid "Cut" +msgstr "" + +#: src/app/actions/Erase.qml:22 +msgid "Erase" +msgstr "" + +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 +msgid "Find in page" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/FindInPage.qml:26 +msgid "Search in Page" +msgstr "" + +#: src/app/actions/Forward.qml:23 +msgid "Forward" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Forward' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Forward.qml:26 +msgid "Newer Page" +msgstr "" + +#: src/app/actions/GoTo.qml:23 +msgid "Goto" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Goto' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/GoTo.qml:26 +msgid "Address;URL;www" +msgstr "" + +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 +msgid "New Tab" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'New Tab' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/NewTab.qml:26 +msgid "Open a New Tab" +msgstr "" + +#: src/app/actions/OpenImageInNewTab.qml:22 +msgid "Open image in new tab" +msgstr "" + +#: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 +msgid "Open link in new background tab" +msgstr "" + +#: src/app/actions/OpenLinkInNewTab.qml:22 +msgid "Open link in new tab" +msgstr "" + +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + +#: src/app/actions/Paste.qml:22 +msgid "Paste" +msgstr "" + +#: src/app/actions/Redo.qml:22 +msgid "Redo" +msgstr "" + +#: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 +msgid "Reload" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Reload' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Reload.qml:26 +msgid "Leave Page" +msgstr "" + +#: src/app/actions/SaveImage.qml:22 +msgid "Save image" +msgstr "" + +#: src/app/actions/SaveLink.qml:22 +msgid "Save link" +msgstr "" + +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 +msgid "Select all" +msgstr "" + +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 +msgid "Share" +msgstr "" + +#: src/app/actions/Undo.qml:22 +msgid "Undo" +msgstr "" + +#. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result +#: src/app/webbrowser/AddressBar.qml:210 +#, qt-format +msgid "%1/%2" +msgstr "" + +#: src/app/webbrowser/AddressBar.qml:246 +msgid "find in page" +msgstr "" + +#: src/app/webbrowser/AddressBar.qml:247 +msgid "search or enter an address" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:48 +msgid "Bookmark Added" +msgstr "" + +#. TRANSLATORS: Field where the title of bookmarked URL can be changed +#: src/app/webbrowser/BookmarkOptions.qml:53 +msgid "Name" +msgstr "" + +#. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in +#: src/app/webbrowser/BookmarkOptions.qml:71 +msgid "Save in" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:78 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 +msgid "All Bookmarks" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:93 +#: src/app/webbrowser/BookmarkOptions.qml:133 +msgid "New Folder" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:115 +msgid "Create new folder" +msgstr "" + +#: src/app/webbrowser/BookmarkOptions.qml:153 +#: src/app/webbrowser/SettingsPage.qml:339 +msgid "Save" +msgstr "" + +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 +msgid "Homepage" +msgstr "" + +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 +msgid "Bookmarks" +msgstr "" + +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 +msgid "Done" +msgstr "" + +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 +msgid "New tab" +msgstr "" + +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 +msgid "History" +msgstr "" + +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 +msgid "Downloads" +msgstr "" + +#: src/app/webbrowser/Browser.qml:566 +msgid "Leave Private Mode" +msgstr "" + +#: src/app/webbrowser/Browser.qml:566 +msgid "Private Mode" +msgstr "" + +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 +msgid "Settings" +msgstr "" + +#. TRANSLATORS: %1 refers to the current number of tabs opened +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 +#, qt-format +msgid "(%1)" +msgstr "" + +#: src/app/webbrowser/Browser.qml:1345 +msgid "Swipe Up To Exit Full Screen" +msgstr "" + +#: src/app/webbrowser/Browser.qml:1346 +msgid "Press ESC To Exit Full Screen" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 +msgid "Delete" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:252 +msgid "No downloads available" +msgstr "" + +#: src/app/webbrowser/ExpandedHistoryView.qml:121 +#, qt-format +msgid "%1 page" +msgid_plural "%1 pages" +msgstr[0] "" +msgstr[1] "" + +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 +msgid "Less" +msgstr "" + +#: src/app/webbrowser/HistorySectionDelegate.qml:26 +msgid "Last Visited" +msgstr "" + +#: src/app/webbrowser/HistorySectionDelegate.qml:48 +#: src/app/webbrowser/HistoryViewWide.qml:212 +msgid "Yesterday" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:196 +msgid "All History" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 +msgid "Today" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:462 +msgid "search history" +msgstr "" + +#: src/app/webbrowser/LeavePrivateModeDialog.qml:24 +msgid "Going to public mode will close all private tabs" +msgstr "" + +#: src/app/webbrowser/NewPrivateTabView.qml:41 +msgid "This is a private tab" +msgstr "" + +#: src/app/webbrowser/NewPrivateTabView.qml:56 +msgid "" +"Pages that you view in this tab won't appear in your browser history.\n" +"Bookmarks you create will be preserved, however." +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:148 +msgid "More" +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 +msgid "Top sites" +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:366 +msgid "You haven't visited any site yet" +msgstr "" + +#: src/app/webbrowser/SadTab.qml:48 +msgid "The rendering process has been closed for this tab." +msgstr "" + +#. TRANSLATORS: %1 is the URL of the page that crashed the renderer process +#: src/app/webbrowser/SadTab.qml:65 +#, qt-format +msgid "Something went wrong while displaying %1." +msgstr "" + +#: src/app/webbrowser/SadTab.qml:67 +msgid "" +"The system is low on memory and can't display this webpage. Try closing " +"unneeded tabs and reloading." +msgstr "" + +#: src/app/webbrowser/SadTab.qml:80 +msgid "Close tab" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:69 +msgid "This site has insecure content" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:70 +msgid "Identity Not Verified" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:78 +msgid "The identity of this website has not been verified." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:89 +msgid "Server certificate does not match the identity of the site." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:91 +msgid "Server certificate has expired." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:93 +msgid "Server certificate contains invalid dates." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:95 +msgid "Server certificate is issued by an entity that is not trusted." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:97 +msgid "Server certificate has been revoked." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:99 +msgid "Server certificate is invalid." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:101 +msgid "Server certificate is insecure." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:103 +msgid "Server certificate failed our security checks for an unknown reason." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:126 +msgid "You are connected to" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:148 +msgid "Which is run by" +msgstr "" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:80 +#: src/app/webbrowser/SettingsPage.qml:156 +msgid "Search engine" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:100 +msgid "Restore previous session at startup" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:118 +#: src/app/webbrowser/SettingsPage.qml:208 +msgid "Privacy & permissions" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:126 +msgid "Reset browser settings" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 +msgid "Camera & microphone" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:235 +msgid "Clear Browsing History" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:238 +msgid "Clear Browsing History?" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:245 +msgid "Clear Cache" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:247 +msgid "Clear Cache?" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:282 +msgid "Clear" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:387 +msgid "Microphone" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:406 +msgid "Camera" +msgstr "" + +#: src/app/webbrowser/TabPreview.qml:86 +msgid "Tap to view" +msgstr "" + +#: src/app/webbrowser/TabsBar.qml:102 +msgid "Close Tab" +msgstr "" + +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 +msgid "Remove" +msgstr "" + +#. TRANSLATORS: %1 refers to the current page’s title +#: src/app/webbrowser/webbrowser-app.qml:35 +#: src/app/webcontainer/webapp-container.qml:67 +#, qt-format +msgid "%1 - Ubuntu Web Browser" +msgstr "" + +#: src/app/webbrowser/webbrowser-app.qml:37 +#: src/app/webcontainer/webapp-container.qml:69 +msgid "Ubuntu Web Browser" +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:62 +msgid "" +"No accounts have been linked to this webapp; press the item below to add an " +"account." +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:78 +msgid "Add account" +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:87 +msgid "Don't use an account" +msgstr "" + +#: src/app/webcontainer/AccountErrorScreen.qml:39 +msgid "Account error" +msgstr "" + +#: src/app/webcontainer/AccountErrorScreen.qml:50 +msgid "Close" +msgstr "" + +#: src/app/webcontainer/AccountsLogic.qml:63 +msgid "" +"Account window could not be opened. You can only create one account at a " +"time; please try again after closing all other account windows." +msgstr "" + +#. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider +#: src/app/webcontainer/AccountsSplashScreen.qml:45 +#, qt-format +msgid "%1 needs to access your %2 online account." +msgstr "" + +#. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider +#: src/app/webcontainer/AccountsSplashScreen.qml:55 +#, qt-format +msgid "%1 would like to access your %2 online account." +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:64 +msgid "" +"Choose an account now, or skip this step and choose an online account later." +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:77 +msgid "Close the app" +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:77 +msgid "Skip" +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:84 +msgid "Choose account" +msgstr "" + +#: src/app/webcontainer/SadPage.qml:45 +msgid "Oops, something went wrong." +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 +msgid "Browser" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:2 +msgid "Web Browser" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:3 +msgid "Browse the World Wide Web" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 +msgid "Internet;WWW;Browser;Web;Explorer" +msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ko.po webbrowser-app-0.23+16.04.20160413/po/ko.po --- webbrowser-app-0.23+16.04.20151124/po/ko.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ko.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-05-19 19:42+0000\n" "Last-Translator: B. W. Knight \n" "Language-Team: Korean \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "취소" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "자바 스크립트 확인" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "이 파일을 열 프로그램을 선택하거나 다운로드 폴더에 추가합니다." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "프로그램 선택" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "다운로드" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "네트워크가 잘못됨" @@ -123,16 +113,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "네트워크 설정을 확인한 후 페이지를 다시 읽어주십시오." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "페이지 새로고침" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "파일을 선택해 주세요." - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "권한 요구" @@ -310,6 +296,36 @@ "이 사이트의 보안 인증서를 신뢰할 수 없습니다\n" "%1에 접근하려 했지만 서버는 알려지지 않은 이유로 보안 검증을 통과하지 못한 보안 인증서를 제시했습니다." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "이 도메인이 사용자의 카메리와 마이크에 접근할 수 있게 하시겠습니까?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "이 도메인이 사용자의 카메리에 접근할 수 있게 하시겠습니까?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "이 도메인이 사용자의 마이크에 접근할 수 있게 하시겠습니까?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (%2에 포함됨)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "예" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "아니요" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "자바스크립트 명령" @@ -378,7 +394,7 @@ msgid "Erase" msgstr "지우기" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "페이지에서 찾기" @@ -408,8 +424,8 @@ msgid "Address;URL;www" msgstr "주소" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "새 탭" @@ -431,6 +447,10 @@ msgid "Open link in new tab" msgstr "새 탭에 링크 열기" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "새 탭에 동영상 열기" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "붙여넣기" @@ -440,7 +460,7 @@ msgstr "다시 실행" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "다시 읽기" @@ -458,12 +478,17 @@ msgid "Save link" msgstr "링크 저장" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "동영상 저장" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "모두 선택" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "공유" @@ -472,16 +497,16 @@ msgstr "실행 취소" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "페이지에서 찾기" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "검색할 단어나 주소를 입력하십시오." @@ -500,8 +525,8 @@ msgstr "다음 위치에 저장" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "모든 책갈피" @@ -515,99 +540,117 @@ msgstr "새 폴더 만들기" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "저장하기" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "홈페이지" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "책갈피" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "완료" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "새 탭" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "기록" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "탭 열기" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "다운로드" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "사생활 보호 모드 떠나기" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "사생활 보호 모드" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "설정" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "위로 쓸어 올리셔서 전체 화면을 종료하십시오" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "ESC 키를 누르셔서 전체 화면을 종료하십시오" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "이 파일을 열 프로그램을 선택하거나 다운로드 폴더에 추가합니다." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "프로그램 선택" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "다운로드" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "다운로드 실패" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "계속" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "선택 확인" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "삭제" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "다운로드할 수 있는 항목 없음" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1페이지" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "적게" @@ -616,20 +659,20 @@ msgstr "마지막 방문" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "어제" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "전체 기록" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "오늘" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "검색 기록" @@ -637,32 +680,6 @@ msgid "Going to public mode will close all private tabs" msgstr "공개 모드를 사용하면 사생활 보호 모드의 모든 탭을 닫습니다." -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "예" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "아니요" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "사생활 보호 모드 탭입니다." @@ -675,16 +692,16 @@ "이 탭에서 보는 페이지는 사용자의 브라우저 기록에 남지 않습니다.\n" "하지만 사용자가 만든 책갈피는 보존합니다." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "더 보기" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "상위 사이트" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "아직 어떤 사이트도 방문하지 않았습니다." @@ -760,8 +777,12 @@ msgid "Which is run by" msgstr "다음 주체가 운영합니다." +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "기본" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "검색 엔진" @@ -770,62 +791,58 @@ msgstr "시작할 때 이전 세션 복구하기" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "새 탭을 배경으로 여는 걸 허용하기" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "사생활과 권한 설정" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "브라우저 설정 초기화하기" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "카메라와 마이크 설정" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "검색 기록 삭제하기" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "브라우저 사용 기록을 지우시겠습니까?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "캐시 삭제하기" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "캐시를 지우시겠습니다?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "지우기" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "마이크" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "카메라" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "볼 탭" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "탭 닫기" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "제거" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -899,7 +916,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "문제가 발생했습니다." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -931,6 +948,9 @@ #~ msgid "Skip account creation step" #~ msgstr "계정 만들기 과정 중단" +#~ msgid "Please choose a file" +#~ msgstr "파일을 선택해 주세요." + #~ msgid "see less" #~ msgstr "간단하게 보기" @@ -940,6 +960,9 @@ #~ msgid "No local account found for " #~ msgstr "로컬 계정을 찾을 수 없음 " +#~ msgid "Open tabs" +#~ msgstr "탭 열기" + #~ msgid "Add" #~ msgstr "추가" @@ -948,3 +971,6 @@ #~ msgid "Privacy" #~ msgstr "프라이버시" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "새 탭을 배경으로 여는 걸 허용하기" diff -Nru webbrowser-app-0.23+16.04.20151124/po/lo.po webbrowser-app-0.23+16.04.20160413/po/lo.po --- webbrowser-app-0.23+16.04.20151124/po/lo.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/lo.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-10-04 04:39+0000\n" "Last-Translator: Anousak \n" "Language-Team: Lao \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "ຍົກເລີກ" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "ການຢັ້ງຢືນຈາວາສະກິບ" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "ຄວາມຜິດພາດເຄືອຂ່າຍ" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "ໂລດໜ້າໃໝ່" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "ຄໍາຮ້ອງຂໍອະນຸຍາດ" @@ -294,6 +280,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "ຈາວາສະກິບລໍຖ້າ" @@ -362,7 +378,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -392,8 +408,8 @@ msgid "Address;URL;www" msgstr "ທີ່ຢູ່;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "ໜ້າໃມ່" @@ -415,6 +431,10 @@ msgid "Open link in new tab" msgstr "ເປີດລີ້ງໃນໜ້າໃໝ່" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -424,7 +444,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "ໂລດອີກ" @@ -442,12 +462,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -456,16 +481,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -484,8 +509,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -499,100 +524,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "ບຸກມາກ" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -601,20 +644,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "ມື້ວານນີ້" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -622,32 +665,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -658,16 +675,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -743,8 +760,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -753,60 +774,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/lt.po webbrowser-app-0.23+16.04.20160413/po/lt.po --- webbrowser-app-0.23+16.04.20151124/po/lt.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/lt.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-08-23 18:36+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Lithuanian \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "(n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Atsisakyti" @@ -99,19 +102,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -130,10 +120,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -293,6 +279,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -361,7 +377,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -391,8 +407,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -414,6 +430,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -423,7 +443,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -441,12 +461,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -455,16 +480,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -483,8 +508,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -498,100 +523,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -600,20 +643,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -621,32 +664,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -657,16 +674,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -742,8 +759,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -752,60 +773,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/lv.po webbrowser-app-0.23+16.04.20160413/po/lv.po --- webbrowser-app-0.23+16.04.20151124/po/lv.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/lv.po 2016-04-13 15:22:01.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-11-22 19:13+0000\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" @@ -16,8 +16,8 @@ "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 != 0 ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2015-11-23 05:27+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" "Language: lv\n" #: src/app/AlertDialog.qml:23 @@ -50,16 +50,18 @@ msgstr "Parole" #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 -#: src/app/ContentDownloadDialog.qml:110 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Atcelt" @@ -103,21 +105,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript apstiprinājums" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Izvēlieties lietotni, lai atvērtu šo datni vai pievienojiet to lejupielāžu " -"mapei." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Izvēlieties lietotni" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Lejupielādēt" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Tīkla kļūda" @@ -136,10 +123,6 @@ msgid "Refresh page" msgstr "Atsvaidzināt lapu" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Ludzu, izvēlieties datni" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Atļaujas pieprasījums" @@ -334,6 +317,36 @@ "Jūs mēģinājāt sasniegt %1, bet serveris uzrādīja drošības sertifikātu, kurš " "nezināmu iemeslu dēļ neizturēja mūsu drošības pārbaudes." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Ļaut šim domēnam piekļūt jūsu kamerai un mikrofonam?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Ļaut šim domēnam piekļūt jūsu kamerai?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Ļaut šim domēnam piekļūt jūsu mikrofonam?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (iegults iekš %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Jā" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nē" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript uzvedne" @@ -402,7 +415,7 @@ msgid "Erase" msgstr "Dzēst" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:426 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Meklēt lapā" @@ -432,8 +445,8 @@ msgid "Address;URL;www" msgstr "Adrese;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:692 -#: src/app/webbrowser/TabsBar.qml:85 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Jauna cilne" @@ -455,6 +468,10 @@ msgid "Open link in new tab" msgstr "Atvērt saiti jaunā cilnē" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Ielīmēt" @@ -464,7 +481,7 @@ msgstr "Atatsaukt" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:90 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Pārlādēt" @@ -482,13 +499,17 @@ msgid "Save link" msgstr "Saglabāt saiti" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:83 -#: src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Izvēlēties visu" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:390 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Dalīties" @@ -497,16 +518,16 @@ msgstr "Atsaukt" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:204 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:240 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "meklēt lapā" -#: src/app/webbrowser/AddressBar.qml:241 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "meklējiet vai ievadiet adresi" @@ -525,8 +546,8 @@ msgstr "Saglabāt mapē" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Visas grāmatzīmes" @@ -540,93 +561,112 @@ msgstr "Izveidot jaunu mapi" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Saglabāt" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Mājas lapa" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:397 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Grāmatzīmes" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:678 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Pabeigts" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:419 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:148 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Jauna cilne" -#: src/app/webbrowser/Browser.qml:403 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Vēsture" -#: src/app/webbrowser/Browser.qml:409 -msgid "Open tabs" -msgstr "Atvērt cilnes" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Lejupielādes" -#: src/app/webbrowser/Browser.qml:436 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Pamest privāto režīmu" -#: src/app/webbrowser/Browser.qml:436 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privātais režīms" -#: src/app/webbrowser/Browser.qml:454 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Iestatījumi" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:786 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1258 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Velciet uz augšu, lai izietu no pilnekrāna" -#: src/app/webbrowser/Browser.qml:1259 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Spiediet ESC, lai izietu no pilnekrāna" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Izvēlieties lietotni, lai atvērtu šo datni vai pievienojiet to lejupielāžu " +"mapei." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Izvēlieties lietotni" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Lejupielādēt" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Apstiprināt izvēli" -#: src/app/webbrowser/DownloadsPage.qml:99 -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Dzēst" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Nav pieejamu lejupielāžu" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -634,8 +674,8 @@ msgstr[1] "%1 lapas" msgstr[2] "%1 lapu" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Mazāk" @@ -644,20 +684,20 @@ msgstr "Pēdējās apmeklētās" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Vakar" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Visa vēsture" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Šodien" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "meklēt vēsturē" @@ -665,32 +705,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Pāreja uz publisko režīmu aizvērs visas privātās cilnes" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Ļaut šim domēnam piekļūt jūsu kamerai un mikrofonam?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Ļaut šim domēnam piekļūt jūsu kamerai?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Ļaut šim domēnam piekļūt jūsu mikrofonam?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (iegults iekš %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Jā" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nē" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Šī ir privāta cilne" @@ -703,16 +717,16 @@ "Lapas, ko apmeklējat šajā cilnē, neparādīsies jūsu pārlūka vēsturē.\n" "Bet tiks saglabātas šeit veidotās grāmatzīmes." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Vairāk" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Labākās vietnes" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Jūs vēl neesat apmeklējuši nevienu vietni" @@ -791,8 +805,12 @@ msgid "Which is run by" msgstr "Ko darbina" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Meklēšanas dzinis" @@ -801,60 +819,56 @@ msgstr "Palaižot atjaunot iepriekšējo sesiju" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Atļaut fonā atvērt jaunas cilnes" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privātums un atļaujas" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Atstatīt pārlūka iestatījumus" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Kamera un mikrofons" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Attīrīt pārlūka vēsturi" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Attīrīt pārlūka vēsturi?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Attīrīt kešatmiņu" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Attīrīt kešatmiņu?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Attīrīt" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Mikrofons" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Uzsitiet, lai skatītu" -#: src/app/webbrowser/TabsBar.qml:96 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Aizvērt cilni" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Izņemt" @@ -962,6 +976,9 @@ #~ msgid "see less" #~ msgstr "redzēt mazāk" +#~ msgid "Open tabs" +#~ msgstr "Atvērt cilnes" + #~ msgid "Add" #~ msgstr "Pievienot" @@ -972,6 +989,9 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "Ubuntu iesaka pārbaudīt tīkla iestatījums un mēģināt pārlādēt lapu." +#~ msgid "Please choose a file" +#~ msgstr "Ludzu, izvēlieties datni" + #~ msgid "Share…" #~ msgstr "Dalīties…" @@ -983,3 +1003,6 @@ #~ msgid "Privacy" #~ msgstr "Privātums" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Atļaut fonā atvērt jaunas cilnes" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ml.po webbrowser-app-0.23+16.04.20160413/po/ml.po --- webbrowser-app-0.23+16.04.20151124/po/ml.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ml.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-11-22 04:38+0000\n" "Last-Translator: ST Alfas \n" "Language-Team: Malayalam \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "റദ്ദാക്കുക" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "ജാവാസ്ക്രിപ്റ്റ് സ്ഥിരീകരണം" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "പുതിയ ടാബ്" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "കണ്ണി പുതിയ ടാബില്‍ തുറക്കുക" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "പുനഃശേഖരിക്കുക" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "സൂചിതസ്ഥാനങ്ങള്‍" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "ഇന്നലെ" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/mr.po webbrowser-app-0.23+16.04.20160413/po/mr.po --- webbrowser-app-0.23+16.04.20151124/po/mr.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/mr.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-09-09 11:02+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Marathi \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "रद्द करा" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ms.po webbrowser-app-0.23+16.04.20160413/po/ms.po --- webbrowser-app-0.23+16.04.20151124/po/ms.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ms.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-12-14 06:00+0000\n" "Last-Translator: abuyop \n" "Language-Team: Malay \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Batal" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Pengesahan Skrip Java" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Pilih satu aplikasi untuk membuka fail ini atau tambah ia ke dalam folder " -"muat turun." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Pilih satu aplikasi" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Muat Turun" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Ralat Rangkaian" @@ -127,16 +115,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "Sila semak tetapan rangkaian anda dan cuba segarkan semula halaman." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Segar semula halaman" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Sila pilih fail" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Permintaan Keizinan" @@ -329,6 +313,36 @@ "Anda cuba mencapai %1 tetapai pelayan memberi sijil keselamatan yang tidak " "menepati semakan keselamatan kami atas sebab tidak diketahui." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Benarkan domain ini mencapai kamera dan mikrofon anda?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Benarkan domain ini mencapai kamera anda?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Benarkan domain ini mencapai mikrofon anda?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (terbenam dalam %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ya" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Tidak" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Makluman Skrip Java" @@ -397,7 +411,7 @@ msgid "Erase" msgstr "Padam" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Cari dalam halaman" @@ -427,8 +441,8 @@ msgid "Address;URL;www" msgstr "Alamat;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Tab Baharu" @@ -450,6 +464,10 @@ msgid "Open link in new tab" msgstr "Buka pautan dalam tab baharu" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Buka video dalam tab baharu" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Tampal" @@ -459,7 +477,7 @@ msgstr "Buat Semula" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Muat Semula" @@ -477,12 +495,17 @@ msgid "Save link" msgstr "Simpan pautan" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Simpan video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Pilih semua" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Kongsi" @@ -491,16 +514,16 @@ msgstr "Buat Asal" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "cari dalam halaman" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "gelintar atau masukkan alamat" @@ -519,8 +542,8 @@ msgstr "Simpan dalam" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Semua Tanda Buku" @@ -534,100 +557,120 @@ msgstr "Cipta folder baharu" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Simpan" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Laman Rumah" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Tanda Buku" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Selesai" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Tab baharu" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Sejarah" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Buka tab" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Muat Turun" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Tinggalkan Mod Persendirian" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Mod Persendirian" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Tetapan" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Leret Ke Atas Untuk Keluar Dari Skrin Penuh" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Tekan ESC Untuk Keluar Dari Skrin Penuh" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Pilih satu aplikasi untuk membuka fail ini atau tambah ia ke dalam folder " +"muat turun." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Pilih satu aplikasi" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Muat Turun" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Muat turun gagal" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Sambung semula" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Sahkan pemilihan" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Hapus" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Tiada muat turun tersedia" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 halaman" msgstr[1] "%1 halaman" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Kurang" @@ -636,20 +679,20 @@ msgstr "Terakhir Dilawati" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Semalam" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Semua Sejarah" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Hari Ini" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "gelintar sejarah" @@ -657,32 +700,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Pergi ke mod awam akan menutup semua tab persendirian" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ya" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Tidak" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Ini adalah tab persendirian" @@ -695,16 +712,16 @@ "Halaman yang anda lihat dalam tab ini tidak akan muncul dalam sejarah\n" "pelayar anda. Sebaliknya, tanda buku yang anda cipta akan dikekalkan." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Lagi" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Laman terbaik" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Anda tidak melawat mana-mana laman lagi" @@ -784,8 +801,12 @@ msgid "Which is run by" msgstr "Yang dijalankan oleh" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Lalai" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Enjin gelintar" @@ -794,62 +815,58 @@ msgstr "Pulih sesi terdahulu ketika permulaan" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Benarkan pembukaan tab baharu di sebalik tabir" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Kerahsiaan & keizinan" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Tetap semula tetapan pelayar" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera & mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Kosongkan Sejarah Pelayaran" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Kosongkan Sejarah Pelayaran?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Kosongkan Cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Kosongkan Cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Kosongkan" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Ketuk untuk lihat" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Tutup Tab" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Buang" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -928,7 +945,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Alamak, ada masalah telah berlaku." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -961,6 +978,9 @@ #~ msgid "see less" #~ msgstr "kurang" +#~ msgid "Please choose a file" +#~ msgstr "Sila pilih fail" + #~ msgid "Select an account" #~ msgstr "Pilih satu akaun" @@ -970,6 +990,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Langkau langkah penciptaan akaun" +#~ msgid "Open tabs" +#~ msgstr "Buka tab" + #~ msgid "Add" #~ msgstr "Tambah" @@ -978,3 +1001,6 @@ #~ msgid "Privacy" #~ msgstr "Kerahsiaan" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Benarkan pembukaan tab baharu di sebalik tabir" diff -Nru webbrowser-app-0.23+16.04.20151124/po/my.po webbrowser-app-0.23+16.04.20160413/po/my.po --- webbrowser-app-0.23+16.04.20151124/po/my.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/my.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-05-11 07:38+0000\n" "Last-Translator: Pyae Sone \n" "Language-Team: Burmese \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "ပယ်ဖျက်မည်" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript အတည်ပြုခြင်း" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "နတ်ဝေါ့ချို့ယွင်းချက်" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "စာမျက်နှာကိုပြန်ဖွင့်မည်" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "ဖိုင်တစ်ခုကိုရွေးပါ။" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "ခွင့်ပြုချက်တောင်းခံခြင်း" @@ -294,9 +280,39 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" -msgstr "" +msgstr "JavaScript တိုက်တွန်းချက်" #: src/app/ProxyAuthenticationDialog.qml:22 msgid "Proxy authentication required." @@ -356,21 +372,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "ဖြတ်ထုတ်မည်" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "ဖြတ်ထုတ်မည်" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "စာမျက်နှာတွင်ရှာပါ" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "စာမျက်နှာတွင်ရှာဖွေပါ" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -392,8 +408,8 @@ msgid "Address;URL;www" msgstr "လိပ်စာ;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Tab အသစ်" @@ -415,6 +431,10 @@ msgid "Open link in new tab" msgstr "Tab အသစ်တွင် Link ကိုဖွင့်မည်" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "စာမျက်နှာအသစ်တွင် ဗွီဒီယိုကိုဖွင့်ပါ" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -424,7 +444,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "ပြန်ဖွင့်မည်" @@ -436,18 +456,23 @@ #: src/app/actions/SaveImage.qml:22 msgid "Save image" -msgstr "" +msgstr "ရုပ်ပုံ သိမ်းမည်" #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "link သိမ်းမည်" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "ဗီဒီယို သိမ်းမည်" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -456,18 +481,18 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "စာမျက်နှာတွင်ရှာပါ" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" -msgstr "" +msgstr "ရှာဖွေပါ သို့မဟုတ် လိပ်စာတစ်ခုထည့်ပါ" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" @@ -481,13 +506,13 @@ #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "ထဲတွင် သိမ်းပါ" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" -msgstr "" +msgstr "မှတ်တမ်းများအားလုံး" #: src/app/webbrowser/BookmarkOptions.qml:93 #: src/app/webbrowser/BookmarkOptions.qml:133 @@ -496,103 +521,121 @@ #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "" +msgstr "ဖိုင်တွဲအသစ် ပြုလုပ်ပါ" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" -msgstr "" +msgstr "သိမ်းဆည်းမည်" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "မှတ်သားချက်များ" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" -msgstr "" +msgstr "ပြီးပီ" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" +msgstr "မျက်နှာပြင်အပြည့်မှထွက်ရန်ESCကိုနှိပ်ပါ" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 -msgid "Confirm selection" +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "အသုံးချပရိုဂရမ်တစ်ခုရွေးပါ" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "ရွေးချယ်မူအတည်ပြုသည်" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -601,53 +644,27 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "မနေ့က" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "မှတ်တမ်းများအားလုံး" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "မှတ်တမ်း ရှာပါ" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -658,16 +675,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -679,7 +696,7 @@ #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "%1 ကိုပြနေချိန်မှာ တစ်ခုခုမှားသွားခဲ့ပါတယ်" #: src/app/webbrowser/SadTab.qml:67 msgid "" @@ -737,76 +754,76 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:126 msgid "You are connected to" -msgstr "" +msgstr "ကို သင်ချိတ်ဆက်နေပါသည်" #: src/app/webbrowser/SecurityCertificatePopover.qml:148 msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" -msgstr "" +msgstr "ရှာဖွေရေး အင်ဂျင်" #: src/app/webbrowser/SettingsPage.qml:100 msgid "Restore previous session at startup" msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "ကင်မရာ နှင့် မိုက်ခရိုဖုန်း" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" -msgstr "" +msgstr "ကြည့်ရူ့ထားသော မှတ်တမ်းများကို ရှင်းလင်းပါ" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "မိုက်ခရိုဖုန်း" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -834,7 +851,7 @@ #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "အကောင့်တစ်ခုကို မသုံးပါ" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" @@ -869,7 +886,7 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "ပရိုဂရမ်ကိုပိတ်ပါ" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" @@ -877,7 +894,7 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "အကောင့်ရွေးပါ" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." @@ -905,6 +922,9 @@ #~ "ဦးဘန္တုမှ သင့်ကို သင်၏အင်တာနက် setting ကိုစစ်ကြည့်ပြီး " #~ "စာမျက်နှာကိုပြန်ဖွင့်ဖို့ကြိုးစားရန်အကြံပေးလိုသည်" +#~ msgid "Please choose a file" +#~ msgstr "ဖိုင်တစ်ခုကိုရွေးပါ။" + #~ msgid "Select an account" #~ msgstr "Account တစ်ခု ကိုရွေးချယ်ပါ။" diff -Nru webbrowser-app-0.23+16.04.20151124/po/nb.po webbrowser-app-0.23+16.04.20160413/po/nb.po --- webbrowser-app-0.23+16.04.20151124/po/nb.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/nb.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-26 13:50+0000\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-17 09:33+0000\n" "Last-Translator: Åka Sikrom \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Avbryt" @@ -100,20 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript-bekreftelse" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Velg et program som fila skal åpnes i, eller lagre den i nedlastingsmappa." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Velg et program" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Last ned" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Nettverksfeil" @@ -132,10 +121,6 @@ msgid "Refresh page" msgstr "Oppdater side" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Velg en fil" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Spørsmål om tillatelse" @@ -329,6 +314,36 @@ "Du prøvde å koble til %1, men tjeneren bruker et sikkerhetssertifikat som av " "ukjent grunn ikke oppfyller sikkerhetskravene." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Vil du la dette domenet bruke kameraet og mikrofonen din?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Vil du la dette domenet bruke kameraet ditt?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Vil duVil du la dette domenet bruke mikrofonen din?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (innebygd i %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ja" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nei" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript-forespørsel" @@ -397,7 +412,7 @@ msgid "Erase" msgstr "Slett" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Søk på siden" @@ -427,8 +442,8 @@ msgid "Address;URL;www" msgstr "Adresse;Nettadresse;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Ny fane" @@ -450,6 +465,10 @@ msgid "Open link in new tab" msgstr "Åpne lenke i ny fane" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Åpne video i ny fane" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Lim inn" @@ -459,7 +478,7 @@ msgstr "Gjør om" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Last på nytt" @@ -477,12 +496,17 @@ msgid "Save link" msgstr "Lagre lenke" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Lagre video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Velg alle" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Del" @@ -491,16 +515,16 @@ msgstr "Angre" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "søk på siden" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "søk eller oppgi en adresse" @@ -519,8 +543,8 @@ msgstr "Lagre i" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Alle bokmerker" @@ -534,100 +558,119 @@ msgstr "Lag ny mappe" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Lagre" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Hjemmeside" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Bokmerker" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Ferdig" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Ny fane" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historikk" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Åpne faner" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Nedlastinger" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Gå ut av privatmodus" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privatmodus" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Innstillinger" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Dra opp for å gå ut av fullskjerm" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Trykk ESC for å gå ut av fullskjerm" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Velg et program som fila skal åpnes i, eller lagre den i nedlastingsmappa." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Velg et program" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Last ned" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Nedlasting mislyktes" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Fortsett" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Bekreft valg" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Slett" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Ingen nedlastinger tilgjengelig" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 side" msgstr[1] "%1 sider" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Færre" @@ -636,20 +679,20 @@ msgstr "Sist besøkt" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "I går" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "All historikk" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "I dag" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "søkehistorikk" @@ -657,32 +700,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Hvis du går i offentlig modus, blir alle private faner lukket" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Vil du la dette domenet bruke kameraet og mikrofonen din?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Vil du la dette domenet bruke kameraet ditt?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Vil duVil du la dette domenet bruke mikrofonen din?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (innebygd i %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ja" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nei" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Dette er en privat fane" @@ -695,16 +712,16 @@ "Sider du ser på i denne fanen, lagres ikke i nettleser-historikken.\n" "Bokmerker du lager, blir imidlertid lagret." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Mer" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Mest populære sider" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Du har ikke besøkt noen sider ennå" @@ -782,8 +799,12 @@ msgid "Which is run by" msgstr "Som drives av" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Standard" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Søkemotor" @@ -792,60 +813,56 @@ msgstr "Gjenopprett forrige økt ved oppstart" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Tillat åpning av nye faner i bakgrunnen" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Personvern og tillatelser" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Tilbakestill nettleseroppsett" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Kamera og mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Tøm nettleser-historikk" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Vil du tømme nettleser-historikken?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Tøm hurtiglager" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Vil du tømme hurtiglageret?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Tøm" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Trykk for å vise" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Lukk fane" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Fjern" @@ -944,6 +961,9 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "Internett;WWW;Nettleser;Web;Utforsker" +#~ msgid "Please choose a file" +#~ msgstr "Velg en fil" + #~ msgid "Select an account" #~ msgstr "Velg en konto" @@ -962,6 +982,9 @@ #~ msgid "see more" #~ msgstr "vis flere" +#~ msgid "Open tabs" +#~ msgstr "Åpne faner" + #~ msgid "Add" #~ msgstr "Legg til" @@ -971,6 +994,9 @@ #~ msgid "Privacy" #~ msgstr "Personvern" +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Tillat åpning av nye faner i bakgrunnen" + #~ msgid "" #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ne.po webbrowser-app-0.23+16.04.20160413/po/ne.po --- webbrowser-app-0.23+16.04.20151124/po/ne.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ne.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-11-04 14:10+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-23 06:50+0000\n" +"Last-Translator: Sanjog Sigdel \n" "Language-Team: Nepali \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -37,7 +37,7 @@ #: src/app/AuthenticationDialog.qml:26 #, qt-format msgid "The website %1 requires authentication." -msgstr "" +msgstr "वेबसाइट %1 लाई प्रमाणिकरण चाहिन्छ" #: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 msgid "Username" @@ -50,19 +50,22 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "रद्द गर्ने" #: src/app/BeforeUnloadDialog.qml:23 msgid "Confirm Navigation" -msgstr "" +msgstr "नेभिगेसन गर्न निश्चित गर्नुहोस्" #: src/app/BeforeUnloadDialog.qml:26 msgid "Leave" @@ -70,7 +73,7 @@ #: src/app/BeforeUnloadDialog.qml:31 msgid "Stay" -msgstr "" +msgstr "यहीँ रहनुहोस्" #: src/app/CertificateVerificationDialog.qml:24 msgid "This connection is untrusted" @@ -83,6 +86,8 @@ "You are trying to securely reach %1, but the security certificate of this " "website is not trusted." msgstr "" +"तपाईं सुरक्षित %1 पुग्न खोज्रनुभयेका छन्, तर यो वेबसाइटको सुरक्षा प्रमाणपत्र " +"विश्वसनीय छैन।" #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 @@ -92,26 +97,11 @@ #: src/app/CertificateVerificationDialog.qml:35 #: src/app/InvalidCertificateErrorSheet.qml:173 msgid "Back to safety" -msgstr "" +msgstr "सुरक्षित ठाउँमा फर्कने" #: src/app/ConfirmDialog.qml:23 msgid "JavaScript Confirmation" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"यो फाइल खोल्न एउटा अनुप्रयोग छनौट गर्नुहोस वा यसलाई डाउनलोडस् फोल्डरमा " -"थप्नुहोस।" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" +msgstr "जाबास्क्रिप्ट निश्चित" #: src/app/ErrorSheet.qml:36 msgid "Network Error" @@ -121,43 +111,41 @@ #: src/app/ErrorSheet.qml:42 #, qt-format msgid "It appears you are having trouble viewing: %1." -msgstr "" +msgstr "तपाईंलाईं %1 हेर्न समस्या भैरहेको देखिन्छ।" #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"क्रिपया आफ्नो नेटवर्क सेटिङहरू जाँच गर्नुहोस् र पृष्ठ रिफ्रेस गर्न प्रयास " +"गर्नुहोस्।" #: src/app/ErrorSheet.qml:53 msgid "Refresh page" -msgstr "" - -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" +msgstr "पाना पुनःलोड गर्नुहोस्" #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" -msgstr "" +msgstr "अनुमति अनुरोध" #: src/app/GeolocationPermissionRequest.qml:29 msgid "This page wants to know your device’s location." -msgstr "" +msgstr "यो पृष्ठ तपाइँको उपकरणको स्थान जान्न चाहनुहुन्छ।" #: src/app/GeolocationPermissionRequest.qml:33 msgid "Deny" -msgstr "" +msgstr "अस्वीकार गर्नुहोस्" #: src/app/GeolocationPermissionRequest.qml:43 msgid "Allow" -msgstr "" +msgstr "अनुमति दिनुहोस्" #: src/app/InvalidCertificateErrorSheet.qml:55 msgid "This site security certificate is not trusted.\n" -msgstr "" +msgstr "यो साइट सुरक्षा प्रमाणपत्र विश्वसनीय छैन।\n" #: src/app/InvalidCertificateErrorSheet.qml:63 msgid "Learn more" -msgstr "" +msgstr "अझै जानौ" #. TRANSLATORS: %1 refers to the SSL certificate's serial number #: src/app/InvalidCertificateErrorSheet.qml:87 @@ -166,6 +154,8 @@ "Serial number:\n" "%1" msgstr "" +"क्रम संख्या:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's subject display name #: src/app/InvalidCertificateErrorSheet.qml:94 @@ -174,6 +164,8 @@ "Subject:\n" "%1" msgstr "" +"विषय:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's subject's address #: src/app/InvalidCertificateErrorSheet.qml:102 @@ -182,6 +174,8 @@ "Subject address:\n" "%1" msgstr "" +"विषय ठेगाना:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's issuer display name #: src/app/InvalidCertificateErrorSheet.qml:113 @@ -190,6 +184,8 @@ "Issuer:\n" "%1" msgstr "" +"जारी कर्ता:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's issuer's address #: src/app/InvalidCertificateErrorSheet.qml:121 @@ -198,6 +194,8 @@ "Issuer address:\n" "%1" msgstr "" +"जारी कर्ताको ठेगाना :\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's start date #: src/app/InvalidCertificateErrorSheet.qml:132 @@ -206,6 +204,8 @@ "Valid from:\n" "%1" msgstr "" +"मान्य सुरु अवधि:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's expiry date #: src/app/InvalidCertificateErrorSheet.qml:139 @@ -214,6 +214,8 @@ "Valid until:\n" "%1" msgstr "" +"मान्य अवधि:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's SHA1 fingerprint #: src/app/InvalidCertificateErrorSheet.qml:146 @@ -222,12 +224,16 @@ "Fingerprint (SHA1):\n" "%1" msgstr "" +"फिङ्गरप्रिन्ट (SHA1):\n" +"%1" #: src/app/InvalidCertificateErrorSheet.qml:153 msgid "" "You should not proceed, especially if you have never seen this warning " "before for this site." msgstr "" +"यदि विशेष गरी तपाईंले यो सायिटको लागी यो चेतावनी कहिल्यै देख्नुभयेको छैन " +"भने, तपाईं अगाडी बड्नु हुँदैन" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:187 @@ -236,6 +242,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which does not match the identity of the site." msgstr "" +"तपाईँले %1 मा पुग्न प्रयास गर्नु भयो तर सर्भरले सुरक्षा प्रमाणपत्र प्रस्तुत " +"गर्‍यो जुन साइट को पहिचानसँग मेल खाँदैन।" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:190 @@ -244,6 +252,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which has expired." msgstr "" +"तपाईंले %1 पुग्न प्रयास गर्नु भयो तर सर्भरले समाप्त भैसकेको एक सुरक्षा " +"प्रमाणपत्र प्रस्तुत गरेको छ​।" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:193 @@ -252,6 +262,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which contains invalid dates." msgstr "" +"तपाईंले %1 पुग्न प्रयास गर्नु भयो तर सर्भरले अमान्य मिति समावेश भएको एक " +"सुरक्षा प्रमाणपत्र प्रस्तुत गरेको छ​।" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:196 @@ -260,6 +272,8 @@ "You attempted to reach %1 but the server presented a security certificate " "issued by an entity that is not trusted." msgstr "" +"तपाईंले %1 पुग्न प्रयास गर्नु भयो तर सर्भरले विश्वसनीय छैन भनेर एक इकाइ " +"द्वारा जारी एक सुरक्षा प्रमाणपत्र प्रस्तुत गरेको छ​।" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:199 @@ -268,6 +282,8 @@ "You attempted to reach %1 but the server presented a security certificate " "that has been revoked." msgstr "" +"तपाईंले %1 पुग्न प्रयास गर्नु भयो तर सर्भरले खारेज भैसकेको सुरक्षा " +"प्रमाणपत्र प्रस्तुत गरेको छ​।" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:202 @@ -276,6 +292,8 @@ "You attempted to reach %1 but the server presented an invalid security " "certificate." msgstr "" +"तपाईंले %1 पुग्न प्रयास गर्नु भयो तर सर्भरले एक अमान्य सुरक्षा प्रमाणपत्र " +"प्रस्तुत गरेको छ​।" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:205 @@ -284,6 +302,8 @@ "You attempted to reach %1 but the server presented an insecure security " "certificate." msgstr "" +"तपाईंले %1 पुग्न प्रयास गर्नु भयो तर सर्भरले एक असुरक्षित सुरक्षा प्रमाणपत्र " +"प्रस्तुत गरेको छ​।" #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:208 @@ -293,608 +313,668 @@ "You attempted to reach %1 but the server presented a security certificate " "which failed our security checks for an unknown reason." msgstr "" +"यो साइटको सुरक्षा प्रमाणपत्र विश्वसनीय छैन\n" +"तपाईंले %1 पुग्न प्रयास गर्नु भयो तर सर्भरले एक सुरक्षा प्रमाणपत्र प्रस्तुत " +"गर्यो जस्ले अज्ञात कारणले हाम्रो सुरक्षा जाँच असफल भएको छ​।" + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "यस डोमेनलाई तपाईँको क्यामेरा र माइक्रोफोन पहुँच अनुमति दिने हो?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "यस डोमेनलाई तपाईँको क्यामेरा पहुँच अनुमति दिने हो?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "यस डोमेनलाई तपाईँको माइक्रोफोन पहुँच अनुमति दिने हो?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 ( %2 मा इम्बेडे गरिएको छ)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "हो" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "होइन" #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" -msgstr "" +msgstr "जाभास्क्रिप्ट प्रोम्ट" #: src/app/ProxyAuthenticationDialog.qml:22 msgid "Proxy authentication required." -msgstr "" +msgstr "प्रोक्सी प्रमाणिकरण आवश्यक" #. TRANSLATORS: %1 refers to the proxy address, %2 refers to the proxy port #: src/app/ProxyAuthenticationDialog.qml:24 #, qt-format msgid "The website %1:%2 requires authentication." -msgstr "" +msgstr "वेबसाइट %1:%2 लाई प्रमाणीकरण आवश्यक छ।" #: src/app/actions/Back.qml:23 msgid "Back" -msgstr "" +msgstr "पछाडि" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Back' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Back.qml:26 msgid "Older Page" -msgstr "" +msgstr "पुरानो पाना" #: src/app/actions/Bookmark.qml:23 msgid "Bookmark" -msgstr "" +msgstr "पुस्तकचिनो" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Bookmark' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Bookmark.qml:26 msgid "Add This Page to Bookmarks" -msgstr "" +msgstr "यो पानालाई पुस्तकचिनोमा थप्नुहोस्" #: src/app/actions/BookmarkLink.qml:22 msgid "Bookmark link" -msgstr "" +msgstr "पुस्तकचिनो लिङ्क" #: src/app/actions/ClearHistory.qml:23 msgid "Clear History" -msgstr "" +msgstr "इतिहास खाली गर्नुहोस्" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Clear History' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/ClearHistory.qml:26 msgid "Clear Navigation History" -msgstr "" +msgstr "नेभिगेसन इतिहास हटाउनुहोस्" #: src/app/actions/Copy.qml:22 msgid "Copy" -msgstr "" +msgstr "प्रतिलिपि गर्नुहोस्" #: src/app/actions/CopyImage.qml:22 msgid "Copy image" -msgstr "" +msgstr "तस्वित प्रतिलिपी गर्नुहोस्" #: src/app/actions/CopyLink.qml:22 msgid "Copy link" -msgstr "" +msgstr "लिङ्क प्रतिलिपी गर्नुहोस्" #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "काट्नुहोस्" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "मेटनुहोस्" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "पानामा खोज्नुहोस्" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "पानामा खोज्नुहोस्" #: src/app/actions/Forward.qml:23 msgid "Forward" -msgstr "" +msgstr "अगाडि" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Forward' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Forward.qml:26 msgid "Newer Page" -msgstr "" +msgstr "नयाँ पाना" #: src/app/actions/GoTo.qml:23 msgid "Goto" -msgstr "" +msgstr "जानुहोस्" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Goto' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/GoTo.qml:26 msgid "Address;URL;www" -msgstr "" +msgstr "ठेगाना; URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" -msgstr "" +msgstr "नयाँ ट्याब" #. TRANSLATORS: This is a free-form list of keywords associated to the 'New Tab' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/NewTab.qml:26 msgid "Open a New Tab" -msgstr "" +msgstr "नयाँ ट्याब खोल्नुहोस्" #: src/app/actions/OpenImageInNewTab.qml:22 msgid "Open image in new tab" -msgstr "" +msgstr "तस्विर नयाँ ट्याबमा खोल्नुहोस्" #: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 msgid "Open link in new background tab" -msgstr "" +msgstr "लिङ्कलाई नयाँ पृष्ठभूमि ट्याबमा खोल्नुहोस्" #: src/app/actions/OpenLinkInNewTab.qml:22 msgid "Open link in new tab" -msgstr "" +msgstr "लिङ्कलाई नयाँ ट्याबमा खोल्नुहोस्" + +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "भिडियो नया ट्याबमा खोल्नुहोस" #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "टाँस्नुहोस्" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "फेरि गर्नुहोस्" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" -msgstr "" +msgstr "पुन:लोड गर्नुहोस्" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Reload' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Reload.qml:26 msgid "Leave Page" -msgstr "" +msgstr "पानालाई छोड्नुहोस्" #: src/app/actions/SaveImage.qml:22 msgid "Save image" -msgstr "" +msgstr "तस्विर सङ्ग्रह गर्नुहोस्" #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "लिङ्क सङ्ग्रह गर्नुहोस्" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "भिडियो संग्र्ह गर्नुहोस" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" -msgstr "" +msgstr "सबै चयन गर्नुहोस्" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" -msgstr "" +msgstr "सेयर गर्नुहोस्" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "पुर्वस्थितिमा फर्काउनुहोस्" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "पानामा खोज्नुहोस्" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" -msgstr "" +msgstr "ठेगाना लेख्नुहोस् या खोज्नुहोस्" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" -msgstr "" +msgstr "पुस्तकचिनो थपियो" #. TRANSLATORS: Field where the title of bookmarked URL can be changed #: src/app/webbrowser/BookmarkOptions.qml:53 msgid "Name" -msgstr "" +msgstr "नाम" #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "यहाँ सङ्ग्रह गर्नुहोस्" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" -msgstr "" +msgstr "सबै पुस्तकचिनोहरू" #: src/app/webbrowser/BookmarkOptions.qml:93 #: src/app/webbrowser/BookmarkOptions.qml:133 msgid "New Folder" -msgstr "" +msgstr "नयाँ फोल्डर" #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "" +msgstr "नयाँ फोल्डर बनाउनुहोस्" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" -msgstr "" +msgstr "सङ्ग्रह गर्नुहोस्" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" -msgstr "" +msgstr "गृह पृष्ठ" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" -msgstr "" +msgstr "पुस्तकचिनोहरू" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" -msgstr "" +msgstr "सम्पन्न भयो" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" -msgstr "" +msgstr "नयाँ ट्याब" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" -msgstr "" +msgstr "इतिहास" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "डाउनलोडहरू" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "" +msgstr "निजी मोड छोड्नुहोस्" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" -msgstr "" +msgstr "निजी मोड" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" -msgstr "" +msgstr "सेटिङ्" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" -msgstr "" +msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "" +msgstr "पुरा स्क्रिन छोड्न माथि स्वाइप गर्नुहोस्" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" +msgstr "पुरा स्क्रिन छोड्न ESC थिच्नुहोस्" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"यो फाइल खोल्न एउटा अनुप्रयोग छनौट गर्नुहोस वा यसलाई डाउनलोडस् फोल्डरमा " +"थप्नुहोस।" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "अनुप्रयोग छान्नुहोस्" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "डाउनलोड" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "डाउनलोड असफल भयो" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "पुन: निरन्तरता दिनुहोस्" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "चयन निश्चित गर्नुहोस्" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" -msgstr "" +msgstr "मेट्नुहोस्" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "डाउनलोड उपलब्ध छैन" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1 पाना" +msgstr[1] "%1 पाना" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" -msgstr "" +msgstr "कम" #: src/app/webbrowser/HistorySectionDelegate.qml:26 msgid "Last Visited" -msgstr "" +msgstr "पछिल्लो पटक भ्रमण गरिएको" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" -msgstr "" +msgstr "हिजो" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "सबै इतिहास" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "आज" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "खोज इतिहास" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" +msgstr "सार्वजनिक मोडमा जाँदै सबै निजी ट्याबहरू बन्द हुनेछन्" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "" +msgstr "यो निजी ट्याब हो" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" +"यस ट्याबमा हेर्नु भएको पृष्ठ आफ्नो ब्राउजर इतिहासमा देखा पर्दैन।\n" +"बनाउनु भएको बुक्मर्क​ तथापि, संरक्षित हुनेछ।" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "" +msgstr "बढि" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" -msgstr "" +msgstr "शिर्ष साइटहरू" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "" +msgstr "तपाईँले अहिलेसम्म कुनै साइट भ्रमण गर्नुभएको छैन" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "यो ट्याबको लागि प्रतिपादन प्रक्रिया बन्द गरिएको छ।" #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "%1 देखाउने बेलामा केही त्रुटी भयो।" #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"सिस्टम्को मेमोरी कम छ र वेबपेज प्रदर्शन गर्न सक्दैन। नचाहिने ट्याबहरू बन्द " +"गर्नुहोस् र पुन: लोड गर्ने प्रयास गर्नुहोस्।" #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "ट्याब बन्द गर्नुहोस्" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" -msgstr "" +msgstr "यो साइटमा असुरक्षित सामग्री" #: src/app/webbrowser/SecurityCertificatePopover.qml:70 msgid "Identity Not Verified" -msgstr "" +msgstr "परिचय प्रमाणिकरण गर्न सकिएन" #: src/app/webbrowser/SecurityCertificatePopover.qml:78 msgid "The identity of this website has not been verified." -msgstr "" +msgstr "यो वेबसाइट को पहिचान प्रमाणित भैसकेको छैन।" #: src/app/webbrowser/SecurityCertificatePopover.qml:89 msgid "Server certificate does not match the identity of the site." -msgstr "" +msgstr "सर्भर सर्टिफिकेट र साइटको परिचय मिल्दैन ।" #: src/app/webbrowser/SecurityCertificatePopover.qml:91 msgid "Server certificate has expired." -msgstr "" +msgstr "सर्भर सर्टिफिकेटको समय सकिएको छ" #: src/app/webbrowser/SecurityCertificatePopover.qml:93 msgid "Server certificate contains invalid dates." -msgstr "" +msgstr "सर्भर सर्टिफिकेटमा अमान्य मितिहरू छन्" #: src/app/webbrowser/SecurityCertificatePopover.qml:95 msgid "Server certificate is issued by an entity that is not trusted." -msgstr "" +msgstr "सर्भर प्रमाणपत्र एक अविश्वसनीय इकाइद्वारा जारी गरिएको छ।" #: src/app/webbrowser/SecurityCertificatePopover.qml:97 msgid "Server certificate has been revoked." -msgstr "" +msgstr "सर्भर प्रमाणपत्र खारेज गरिएको छ।" #: src/app/webbrowser/SecurityCertificatePopover.qml:99 msgid "Server certificate is invalid." -msgstr "" +msgstr "सर्भर सर्टिफिकेट अमान्य छ ।" #: src/app/webbrowser/SecurityCertificatePopover.qml:101 msgid "Server certificate is insecure." -msgstr "" +msgstr "सर्भर सर्टिफिकेट असुरक्षित छ ।" #: src/app/webbrowser/SecurityCertificatePopover.qml:103 msgid "Server certificate failed our security checks for an unknown reason." -msgstr "" +msgstr "एक अज्ञात कारण सर्भर प्रमाणपत्रमा हाम्रो सुरक्षा जाँच असफल भयो।" #: src/app/webbrowser/SecurityCertificatePopover.qml:126 msgid "You are connected to" -msgstr "" +msgstr "तपाईँ जोडिएको हुनुहुन्छ" #: src/app/webbrowser/SecurityCertificatePopover.qml:148 msgid "Which is run by" -msgstr "" +msgstr "यसका सञ्चालनकर्ता" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "पूर्वनिर्धारित" #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" -msgstr "" +msgstr "खोज इन्जिन" #: src/app/webbrowser/SettingsPage.qml:100 msgid "Restore previous session at startup" -msgstr "" +msgstr "स्टार्टअपमा अघिल्लो सत्र पुनर्स्थापित गर्नुहोस्" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "गोपनीयता र अनुमतिहरू" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" -msgstr "" +msgstr "ब्राउजर सेटिङहरू पूर्वस्थितीमा फर्काउनुहोस्" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "क्यामेरा र माइक्रोफोन" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" -msgstr "" +msgstr "ब्राउजिङ इतिहास हटाउनुहोस्" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "ब्राउजिङ इतिहास हटाउने हो?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" -msgstr "" +msgstr "क्यास खाली गर्नुहोस्" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "क्यास खाली गर्ने हो ?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" -msgstr "" +msgstr "खाली गर्नुहोस्" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "माइक्रोफोन" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "क्यामेरा" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" -msgstr "" +msgstr "हेर्न ट्याप गर्नुहोस्" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "ट्याब बन्द गर्नुहोस्" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "हटाउनुहोस्" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 #: src/app/webcontainer/webapp-container.qml:67 #, qt-format msgid "%1 - Ubuntu Web Browser" -msgstr "" +msgstr "%1 - उबुन्टु वेब ब्राउजर" #: src/app/webbrowser/webbrowser-app.qml:37 #: src/app/webcontainer/webapp-container.qml:69 msgid "Ubuntu Web Browser" -msgstr "" +msgstr "उबुन्टु वेब ब्राउजर" #: src/app/webcontainer/AccountChooserDialog.qml:62 msgid "" "No accounts have been linked to this webapp; press the item below to add an " "account." -msgstr "" +msgstr "कुनै खाता यस वेबएपमा जोडिएको छैन; खाता थप्न तलको वस्तु थिच्नुहोस्।" #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" -msgstr "" +msgstr "खाता थप्नुहोस्" #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "खाता प्रयोग नगर्नुहोस्" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "खाता त्रुटि" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "बन्दगर्नुहोस्" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" +"खाता विन्डो खोल्न सकिएन। मात्र एक समयमा एउटा खाता सिर्जना गर्न सक्नुहुन्छ; " +"सबै अन्य खाता विन्डोज् बन्द गरिसके पछि फेरि प्रयास गर्नुहोस्।" #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 लाई तपाईँको %2 अनलाइन खाता पहुँच आवश्यक छ" #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." msgstr "" +"Copy text \t\r\n" +"%1तपाईँको %2 अनलाइन खाता पहुँच गर्न चाहन्छ" #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" "Choose an account now, or skip this step and choose an online account later." msgstr "" +"अहिले खाता छान्नुहोस् या यो भाग छोडेर पछि अनलाइन खाता छान्न पनि सक्नुहुनेछ ।" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "अनुप्रयोगलाई बन्द गर्नुहोस्" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "छोड्नुहोस्" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "खाता छान्नुहोस्" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "ओहो, केही गलत भयो।" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" -msgstr "" +msgstr "ब्राउजर" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:2 msgid "Web Browser" -msgstr "" +msgstr "वेब ब्राउजर" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:3 msgid "Browse the World Wide Web" -msgstr "" +msgstr "वर्ल्ड वाइड वेब ब्राउज गर्नुहोस्" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" -msgstr "" +msgstr "इन्टरनेट;WWW; ब्राउजर; वेब; एक्सप्लोरर" + +#~ msgid "Please choose a file" +#~ msgstr "एक फाइल छान्नुहोस्" + +#~ msgid "Open tabs" +#~ msgstr "खुल्ला ट्याबहरू" + +#~ msgid "" +#~ "Ubuntu suggests you check your network settings and try refreshing the page." +#~ msgstr "" +#~ "उबुन्टु तपाईं आफ्नो नेटवर्क सेटिङहरू जाँच गर्न र पृष्ठ रिफ्रेस गर्न सुझाव " +#~ "दिन्छ।" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "पृष्ठभूमिमा नयाँ ट्याबहरू खोल्न अनुमति दिनुहोस्" diff -Nru webbrowser-app-0.23+16.04.20151124/po/nl.po webbrowser-app-0.23+16.04.20160413/po/nl.po --- webbrowser-app-0.23+16.04.20151124/po/nl.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/nl.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-10-18 08:52+0000\n" "Last-Translator: Hannie Dumoleyn \n" "Language-Team: Dutch \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Annuleren" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript-confirmatie" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Kies een toepassing om dit bestand te openen of plaats het in de map " -"Downloads." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Kies een toepassing" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Downloaden" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Netwerkfout" @@ -134,10 +122,6 @@ msgid "Refresh page" msgstr "Pagina vernieuwen" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Selecteer een bestand" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Verzoek om toestemming" @@ -335,6 +319,38 @@ "beveiligingscertificaat dat niet door onze veiligheidscontrole kwam door een " "onbekende reden." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Dit domein toestemming geven om toegang te krijgen tot uw camera en " +"microfoon?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Dit domein toestemming geven om toegang te krijgen tot uw camera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Dit domein toestemming geven om toegang te krijgen tot uw microfoon?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (ingebed in %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ja" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nee" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript-prompt" @@ -403,7 +419,7 @@ msgid "Erase" msgstr "Wissen" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "In pagina zoeken" @@ -433,8 +449,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www;Adres" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nieuw tabblad" @@ -456,6 +472,10 @@ msgid "Open link in new tab" msgstr "Koppeling openen in nieuw tabblad" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Video openen in nieuw tabblad" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Plakken" @@ -465,7 +485,7 @@ msgstr "Opnieuw doen" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Herladen" @@ -483,12 +503,17 @@ msgid "Save link" msgstr "Koppeling opslaan" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Video opslaan" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Alles selecteren" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Delen" @@ -497,16 +522,16 @@ msgstr "Ongedaan maken" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "in pagina zoeken" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Voer zoekterm of adres in" @@ -525,8 +550,8 @@ msgstr "Opslaan in" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Alle bladwijzers" @@ -540,100 +565,120 @@ msgstr "Nieuwe map aanmaken" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Opslaan" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Startpagina" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Bladwijzers" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Klaar" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nieuw tabblad" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Geschiedenis" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Tabbladen openen" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Binnengehaalde bestanden" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Privémodus verlaten" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privémodus" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Instellingen" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Veeg omhoog om de modus Schermvullend te sluiten" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Druk op ESC om de modus Schermvullend te sluiten" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Kies een toepassing om dit bestand te openen of plaats het in de map " +"Downloads." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Kies een toepassing" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Downloaden" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Downloaden is mislukt" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Hervatten" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Selectie bevestigen" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Wissen" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Er zijn geen binnengehaalde bestanden beschikbaar" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 pagina" msgstr[1] "%1 pagina's" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Minder" @@ -642,20 +687,20 @@ msgstr "Laatst bezocht" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Gisteren" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Alle geschiedenis" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Vandaag" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "Zoekgeschiedenis" @@ -665,34 +710,6 @@ "Door over te gaan naar openbare modus, zullen alle privétabbladen gesloten " "worden" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" -"Dit domein toestemming geven om toegang te krijgen tot uw camera en " -"microfoon?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Dit domein toestemming geven om toegang te krijgen tot uw camera?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Dit domein toestemming geven om toegang te krijgen tot uw microfoon?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (ingebed in %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ja" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nee" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Dit is een privétabblad" @@ -706,16 +723,16 @@ "opgenomen worden.\n" "Maar bladwijzers die u maakt worden wel bewaard." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Meer" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Topwebsites" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "U heeft nog geen site bezocht" @@ -796,8 +813,12 @@ msgid "Which is run by" msgstr "Hetgeen wordt gedraaid door" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Standaard" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Zoekmachine" @@ -806,60 +827,56 @@ msgstr "Vorige sessie herstellen bij opstarten" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Openen nieuwe tabbladen op de achtergrond toestaan" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privacy en machtigingen" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Browserinstellingen herstellen" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Camera & microfoon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Browsegeschiedenis wissen" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Bladergeschiedenis wissen?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Buffergeheugen wissen" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Cache wissen?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Wissen" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Microfoon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Camera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tik om te bekijken" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Tabblad sluiten" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Verwijderen" @@ -966,6 +983,9 @@ #~ msgid "Select an account" #~ msgstr "Selecteer een account" +#~ msgid "Please choose a file" +#~ msgstr "Selecteer een bestand" + #~ msgid "Share…" #~ msgstr "Delen…" @@ -984,8 +1004,14 @@ #~ msgid "Delete all history?" #~ msgstr "Alle geschiedenis wissen?" +#~ msgid "Open tabs" +#~ msgstr "Tabbladen openen" + #~ msgid "Add" #~ msgstr "Toevoegen" #~ msgid "Privacy" #~ msgstr "Privacy" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Openen nieuwe tabbladen op de achtergrond toestaan" diff -Nru webbrowser-app-0.23+16.04.20151124/po/oc.po webbrowser-app-0.23+16.04.20160413/po/oc.po --- webbrowser-app-0.23+16.04.20151124/po/oc.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/oc.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-09-20 11:44+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Occitan (post 1500) \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Abandonar" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmacion JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Error Ret" @@ -126,15 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Verificatz vòstras preferéncias de ret e ensajatz de reactualizar la pagina." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Actualizar la pagina" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Causissètz un fichièr" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Demanda d'autorizacion" @@ -330,6 +317,37 @@ "seguretat qu'a pas capitat nòstres tèsts de seguretat per una rason " "desconeguda." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Autorizar aqueste domeni a accedir a vòstra camèra e a vòstre microfòn ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Autorizar aqueste domeni a accedir a vòstra camèra ?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Autorizar aqueste domeni a accedir a vòstre microfòn ?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (integrat dins %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Òc" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Non" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Convit JavaScript" @@ -392,21 +410,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Talhar" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Escafar" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Trobar dins la pagina" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Recercar dins la pagina" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -428,8 +446,8 @@ msgid "Address;URL;www" msgstr "Adreça;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Onglet novèl" @@ -445,22 +463,26 @@ #: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 msgid "Open link in new background tab" -msgstr "Dobrir lo ligam dins un novèl onglet en rèire plan" +msgstr "Dobrir lo ligam dins un novèl onglet en rèireplan" #: src/app/actions/OpenLinkInNewTab.qml:22 msgid "Open link in new tab" msgstr "Dobrir lo ligam dins un onglet novèl" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Dobrir la vidèo dins un novèl onglet" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Pegar" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Restablir" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Actualizar" @@ -476,159 +498,184 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "Enregistrar lo ligam" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Enregistrar la vidèo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Seleccionar tot" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Partejar" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Anullar" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "trobar dins la pagina" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "recercar o picar una adreça" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" -msgstr "" +msgstr "Marcapagina creat" #. TRANSLATORS: Field where the title of bookmarked URL can be changed #: src/app/webbrowser/BookmarkOptions.qml:53 msgid "Name" -msgstr "" +msgstr "Nom" #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "Salvar dins" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" -msgstr "" +msgstr "Totes los marcapaginas" #: src/app/webbrowser/BookmarkOptions.qml:93 #: src/app/webbrowser/BookmarkOptions.qml:133 msgid "New Folder" -msgstr "" +msgstr "Dorsièr novèl" #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "" +msgstr "Crear un dorsièr novèl" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Enregistrar" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Pagina d'acuèlh" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Marcapaginas" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Acabat" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Onglet novèl" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Istoric" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Onglets dobèrts" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Telecargaments" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "" +msgstr "Quitar lo mòde privat" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" -msgstr "" +msgstr "Mòde privat" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Reglatges" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" -msgstr "" +msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "" +msgstr "Fasètz lisar cap amont per sortir de l'ecran complet" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" +msgstr "Quichatz sus Escap per sortir de l'ecran complet" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Causissètz una aplicacion per dobrir aqueste fichièr o apondètz-lo dins lo " +"dorsièr Telecargaments." -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Causissètz una aplicacion" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Telecargar" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Fracàs del telecargament" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Contunhar" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "Confirmar la seleccion" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Suprimir" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Cap de telecargament pas disponible" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 pagina" msgstr[1] "%1 paginas" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Mens" @@ -637,56 +684,30 @@ msgstr "Visitats recentament" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ièr" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "Tot l'istoric" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Uèi" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "cercar dins l'istoric" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Òc" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Non" +msgstr "Bascular en mòde public tamparà totes los onglets privats" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "" +msgstr "Aquò es un onglet privat" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" @@ -694,16 +715,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "" +msgstr "Mai" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Sites populars" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -725,7 +746,7 @@ #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Tampar l'onglet" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -783,72 +804,72 @@ msgid "Which is run by" msgstr "Qu'es gerit per" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Per defaut" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de recèrca" #: src/app/webbrowser/SettingsPage.qml:100 msgid "Restore previous session at startup" -msgstr "Restablir la sesilha precedenta a l'aviada" +msgstr "Restablir la session precedenta a l'aviada" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Autorizar la dobertura d'onglets novèls en rèire plan" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Vida privada & permissions" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Reïnicializar los paramètres del navigador" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Camèra & microfòn" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Suprimir l’istoric de navigacion" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Escafar l'istoric de navigacion ?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Voidar l'escondedor" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Escafar l'escondedor ?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Escafar" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Microfòn" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Camèra" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Quichatz per veire" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Tampar l'onglet" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Levar" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -878,11 +899,11 @@ #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "Error de compte" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "Tampar" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" @@ -894,13 +915,13 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 a besonh d’accedir a vòstre compte %2." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 vòl accedir a vòstre compte %2." #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" @@ -909,19 +930,19 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "Tampar l’aplicacion" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "Ignorar" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "Causissètz un compte" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Ops, una error s'es producha." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -939,9 +960,15 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "Internet;WWW;Navigador;Web;Explorador" +#~ msgid "Please choose a file" +#~ msgstr "Causissètz un fichièr" + #~ msgid "Share…" #~ msgstr "Partejar..." +#~ msgid "Open tabs" +#~ msgstr "Onglets dobèrts" + #~ msgid "see more" #~ msgstr "Afichar mai" @@ -971,3 +998,6 @@ #~ msgid "Privacy" #~ msgstr "Vida privada" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Autorizar la dobertura d'onglets novèls en rèireplan" diff -Nru webbrowser-app-0.23+16.04.20151124/po/pa.po webbrowser-app-0.23+16.04.20160413/po/pa.po --- webbrowser-app-0.23+16.04.20151124/po/pa.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/pa.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-06-17 14:25+0000\n" "Last-Translator: Gursharnjit_Singh \n" "Language-Team: Punjabi \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "ਰੱਦ ਕਰੋ" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript ਪੁਸ਼ਟੀ" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "ਸਫ਼ਾ ਤਾਜ਼ਾ ਕਰੋ" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "ਫਾਈਲ ਚੁਣੋ" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "ਮਨਜ਼ੂਰੀ ਲਈ ਬੇਨਤੀ" @@ -329,6 +315,36 @@ "ਤੁਸੀਂ %1 ਤੇ ਪਹੁੰਚਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਪਰ ਸਰਵਰ ਨੇ ਇੱਕ ਸੁਰੱਖਿਆ ਸਰਟੀਫ਼ਿਕੇਟ ਪੇਸ਼ ਕੀਤਾ " "ਜੋ ਅਣਜਾਣ ਕਾਰਨ ਕਰਕੇ ਸਾਡੀਆਂ ਸੁਰੱਖਿਆ ਪੜਤਾਲਾਂ ਵਿੱਚ ਫ਼ੇਲ੍ਹ ਹੋਇਆ।" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "ਹਾਂ" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "ਨਹੀਂ" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript ਪਰਾਉਟ" @@ -397,7 +413,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -427,8 +443,8 @@ msgid "Address;URL;www" msgstr "ਸਿਰਨਾਵਾਂ;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "ਨਵੀਂ ਟੈਬ" @@ -450,6 +466,10 @@ msgid "Open link in new tab" msgstr "ਲਿੰਕ ਨਵੀਂ ਟੈਬ ਵਿੱਚ ਖੋਲ੍ਹੋ" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -459,7 +479,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "ਮੁੜ-ਲੋਡ" @@ -477,12 +497,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "ਸਾਰੇ ਚੁਣੋ" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "ਸਾਂਝਾ ਕਰੋ" @@ -491,16 +516,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "ਖੋਜੋ ਜਾਂ ਸਿਰਨਾਵਾਂ ਦਿਓ" @@ -519,8 +544,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -534,100 +559,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "ਸੰਭਾਲ੍ਹੋ" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "ਮੁੱਖ ਸਫਾ" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "ਬੁੱਕਮਾਰਕ" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "ਮੁਕੰਮਲ" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "ਨਵੀਂ ਟੈਬ" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "ਅਤੀਤ" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "ਟੈਬਾਂ ਖੋਲ੍ਹੋ" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "ਨਿੱਜੀ ਮੋਡ ਤੋਂ ਵਿਦਾ ਲਓ" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "ਨਿੱਜੀ ਮੋਡ" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "ਸੈਟਿੰਗ" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "ਪੂਰੀ ਸਕਰੀਨ ਤੋਂ ਬਾਹਰ ਆਉਣ ਲਈ ਉੱਪਰ ਖਿੱਚੋ" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "ਪੂਰੀ ਸਕਰੀਨ ਤੋਂ ਬਾਹਰ ਆਉਣ ਲਈ ESC ਦੱਬੋ" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "ਹਟਾਓ" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 ਸਫ਼ਾ" msgstr[1] "%1 ਸਫ਼ੇ" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "ਘੱਟ" @@ -636,20 +679,20 @@ msgstr "ਆਖਰੀ ਵਾਰ ਖੋਲ੍ਹੇ" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "ਕੱਲ੍ਹ" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -657,32 +700,6 @@ msgid "Going to public mode will close all private tabs" msgstr "ਜਨਤਕ ਮੋਡ ਵਿੱਚ ਜਾਣਾ ਸਾਰੇ ਨਿੱਜੀ ਟੈਬ ਬੰਦ ਕਰ ਦੇਵੇਗਾ" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "ਹਾਂ" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "ਨਹੀਂ" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "ਇਹ ਇੱਕ ਨਿੱਜੀ ਟੈਬ ਹੈ" @@ -696,16 +713,16 @@ "ਦੇਣਗੇ।\n" "ਫਿਰ ਵੀ, ਤੁਹਾਡੇ ਵੱਲੋਂ ਰਚੇ ਬੁੱਕਮਾਰਕ ਸੰਭਾਲੇ ਜਾਣਗੇ।" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "ਹੋਰ" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "ਚੋਟੀ ਦੀਆਂ ਸਾਈਟਾਂ" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "ਤੁਸੀਂ ਹੁਣ ਤੱਕ ਕਿਸੇ ਵੀ ਸਾਈਟ ਤੇ ਨਹੀਂ ਗਏ" @@ -782,8 +799,12 @@ msgid "Which is run by" msgstr "ਜਿਹੜਾ ਚਲਾਇਆ ਜਾਂਦਾ ਵੱਲੋਂ" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "ਖੋਜ ਇੰਜਨ" @@ -792,60 +813,56 @@ msgstr "ਸ਼ੁਰੂ ਹੋਣ ਤੇ ਪਿਛਲਾ ਸ਼ੈਸਨ ਮੁੜ ਚਲਾਓ" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "ਬੈਕਗਰਾਂਊਡ ਵਿੱਚ ਨਵੀਆਂ ਟੈਬਾਂ ਖੋਲ੍ਹਣ ਦੀ ਪ੍ਰਵਾਨਗੀ ਦਿਓ" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "ਬਰਾਊਜ਼ਰ ਸੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ ਕਰੋ" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "ਬਰਾਊਜ਼ਿੰਗ ਇਤਿਹਾਸ ਸਾਫ਼ ਕਰੋ" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "ਕੈਸ਼ ਸਾਫ਼ ਕਰੋ" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "ਸਾਫ਼ ਕਰੋ" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "ਵੇਖਣ ਲਈ ਛੂਹੋ" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -938,9 +955,15 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "ਇੰਟਰਨੈੱਟ;WWW;ਬਰਾਊਜ਼ਰ;ਵੈੱਬ;ਅੈਕਸਪਲੋਰਰ" +#~ msgid "Please choose a file" +#~ msgstr "ਫਾਈਲ ਚੁਣੋ" + #~ msgid "Share…" #~ msgstr "...ਸਾਂਝਾ ਕਰੋ" +#~ msgid "Open tabs" +#~ msgstr "ਟੈਬਾਂ ਖੋਲ੍ਹੋ" + #~ msgid "see less" #~ msgstr "ਘੱਟ ਵੇਖੋ" @@ -970,3 +993,6 @@ #~ msgid "Privacy" #~ msgstr "ਪਰਦੇਦਾਰੀ" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "ਬੈਕਗਰਾਂਊਡ ਵਿੱਚ ਨਵੀਆਂ ਟੈਬਾਂ ਖੋਲ੍ਹਣ ਦੀ ਪ੍ਰਵਾਨਗੀ ਦਿਓ" diff -Nru webbrowser-app-0.23+16.04.20151124/po/pl.po webbrowser-app-0.23+16.04.20160413/po/pl.po --- webbrowser-app-0.23+16.04.20151124/po/pl.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/pl.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-11-07 09:38+0000\n" -"Last-Translator: Krzysztof Tataradziński \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2015-12-01 08:12+0000\n" +"Last-Translator: Piotr Strębski \n" "Language-Team: Polish \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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Anuluj" @@ -101,20 +104,6 @@ msgid "JavaScript Confirmation" msgstr "Potwierdzenie JavaScriptu" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Wybierz aplikację do otwarcia tego pliku albo umieścić go w folderze Pobrane." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Wybierz aplikację" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Pobierz" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Brak połączenia" @@ -133,10 +122,6 @@ msgid "Refresh page" msgstr "Odśwież stronę" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Proszę wybrać plik" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Wymagane zezwolenie" @@ -331,6 +316,36 @@ "Próbujesz wejść na %1, ale serwer przedstawił certyfikat bezpieczeństwa, " "który z nieznanej przyczyny nie przeszedł kontroli bezpieczeństwa." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Zezwolić tej domenie na dostęp do aparatu i mikrofonu?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Zezwolić tej domenie na dostęp do aparatu?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Zezwolić tej domenie na dostęp do mikrofonu?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (zawarty w %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Tak" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nie" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Powiadomienie JavaScript" @@ -399,7 +414,7 @@ msgid "Erase" msgstr "Wyczyść" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Znajdź na stronie" @@ -429,8 +444,8 @@ msgid "Address;URL;www" msgstr "Adres;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nowa karta" @@ -452,6 +467,10 @@ msgid "Open link in new tab" msgstr "Otwórz w nowej karcie" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Otwórz wideo w nowej karcie" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Wklej" @@ -461,7 +480,7 @@ msgstr "Ponów" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Odśwież" @@ -477,14 +496,19 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "Zapisz link" +msgstr "Zapisz odnośnik" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Zapisz wideo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Zaznacz wszystko" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Udostępnij" @@ -493,16 +517,16 @@ msgstr "Cofnij" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "znajdź na stronie" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "wyszukaj lub wprowadź adres" @@ -521,8 +545,8 @@ msgstr "Zapisz w" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Wszystkie zakładki" @@ -536,92 +560,111 @@ msgstr "Utwórz nowy katalog" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Zapisz" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Strona domowa" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Zakładki" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Gotowe" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nowa karta" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historia" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Otwarte karty" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Pobrane" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Opuść tryb prywatny" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Tryb prywatny" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Ustawienia" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Przeciągnij w górę, aby opuścić tryb pełnoekranowy" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Naciśnij ESC, by opuścić tryb pełnoekranowy" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Wybierz program do otwarcia tego pliku albo umieścić go w katalogu Pobrane." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Wybierz program" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Pobierz" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Nieudane pobieranie" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Wznów" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Potwierdź zaznaczenie" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" -msgstr "Kasuj" +msgstr "Usuń" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Brak pobranych plików" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -629,8 +672,8 @@ msgstr[1] "%1 strony" msgstr[2] "%1 stron" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Mniej" @@ -639,20 +682,20 @@ msgstr "Ostatnio odwiedzone" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Wczoraj" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Cała historia" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Dzisiaj" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "Historia wyszukiwania" @@ -662,32 +705,6 @@ "Przejście do trybu publicznego, spowoduje zamknięcie wszystkich prywatnych " "kart" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Zezwolić tej domenie na dostęp do aparatu i mikrofonu?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Zezwolić tej domenie na dostęp do aparatu?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Zezwolić tej domenie na dostęp do mikrofonu?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Tak" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nie" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "To jest karta prywatna" @@ -701,16 +718,16 @@ "przeglądarki.\n" "Zakładki, które stworzysz zostaną jednak zachowane." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Więcej" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Najczęściej odwiedzane" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Nie odwiedziłeś jeszcze żadnych stron" @@ -788,10 +805,14 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:148 msgid "Which is run by" -msgstr "Która just uruchomiona przez" +msgstr "Administrowana przez" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Domyślny" #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Wyszukiwarka" @@ -800,60 +821,56 @@ msgstr "Przywróć poprzednią sesję przy starcie" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Pozwala otwierać nowe karty w tle" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Prywatność i zezwolenia" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Zresetuj ustawienia przeglądarki" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Aparat i mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Wyczyść historię przeglądania" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Usunąć historię przeglądania?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Wyczyść pamięć podręczną" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Wyczyścić pamięć podręczną?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Wyczyść" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Aparat" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Dotknij, by wyświetlić" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Zamknij kartę" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Usuń" @@ -920,7 +937,7 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "Zamknij aplikację" +msgstr "Zamknij program" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" @@ -965,12 +982,18 @@ #~ msgid "see less" #~ msgstr "pokaż mniej" +#~ msgid "Open tabs" +#~ msgstr "Otwarte karty" + #~ msgid "Add" #~ msgstr "Dodaj" #~ msgid "Delete all history?" #~ msgstr "Wyczyścić historię?" +#~ msgid "Please choose a file" +#~ msgstr "Proszę wybrać plik" + #~ msgid "Privacy" #~ msgstr "Prywatność" @@ -980,5 +1003,8 @@ #~ "Zalecane jest sprawdzenie połączenia sieciowego oraz ponowne wczytanie " #~ "strony." +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Pozwala otwierać nowe karty w tle" + #~ msgid "No local account found for " #~ msgstr "Nie odnaleziono konta dla " diff -Nru webbrowser-app-0.23+16.04.20151124/po/pt_BR.po webbrowser-app-0.23+16.04.20160413/po/pt_BR.po --- webbrowser-app-0.23+16.04.20151124/po/pt_BR.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/pt_BR.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-08-05 04:42+0000\n" "Last-Translator: Julio Alexander Sieg \n" "Language-Team: Brazilian Portuguese \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancelar" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmação JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Escolha um aplicativo" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Baixar" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Erro de conexão" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "Atualizar a página" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Por favor, escolha um arquivo" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Requisição de permissão" @@ -329,6 +315,36 @@ "Você tentou acessar %1 mas o servidor apresentou um certificado de segurança " "que falhou no nosso teste de segurança por uma razão desconhecida." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Sim" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Não" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Prompt do JavaScript" @@ -397,7 +413,7 @@ msgid "Erase" msgstr "Apagar" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -427,8 +443,8 @@ msgid "Address;URL;www" msgstr "Endereço;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nova aba" @@ -450,6 +466,10 @@ msgid "Open link in new tab" msgstr "Abrir link em nova aba" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Colar" @@ -459,7 +479,7 @@ msgstr "Refazer" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Recarregar" @@ -477,12 +497,17 @@ msgid "Save link" msgstr "Salvar link" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Selecionar todos" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Compartilhar" @@ -491,16 +516,16 @@ msgstr "Desfazer" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "procurar ou digitar um endereço" @@ -519,8 +544,8 @@ msgstr "Salvar em" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -534,100 +559,118 @@ msgstr "Criar novo diretório" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Salvar" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Página inicial" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Favoritos" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Concluído" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nova aba" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Histórico" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Abrir abas" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Downloads" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Sair do modo privado" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Modo privado" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Configurações" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Deslize para cima para sair da tela cheia" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Pressione ESC para sair da tela cheia" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Escolha um aplicativo" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Baixar" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirmar seleção" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Deletar" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 página" msgstr[1] "%1 páginas" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menos" @@ -636,20 +679,20 @@ msgstr "Último visitado" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ontem" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Hoje" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -657,32 +700,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Ir ao modo público irá fechar todas as abas privadas" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Sim" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Não" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Esta é uma aba privada" @@ -693,16 +710,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Mais" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Sites mais visitados" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Você não visitou nenhum site ainda" @@ -781,8 +798,12 @@ msgid "Which is run by" msgstr "Que é executado por" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Mecanismo de busca" @@ -791,60 +812,56 @@ msgstr "Restaurar sessão anterior ao iniciar" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permitir a abertura de novas abas em segundo plano" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Redefinir as configurações do navegador" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Limpar histórico de navegação" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Limpar cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Limpar cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Limpar" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Toque para visualizar" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Fechar aba" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -952,6 +969,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Pular a etapa de criação de conta" +#~ msgid "Please choose a file" +#~ msgstr "Por favor, escolha um arquivo" + #~ msgid "Share…" #~ msgstr "Compartilhar..." @@ -961,6 +981,9 @@ #~ msgid "see more" #~ msgstr "ver mais" +#~ msgid "Open tabs" +#~ msgstr "Abrir abas" + #~ msgid "Add" #~ msgstr "Adicionar" @@ -969,3 +992,6 @@ #~ msgid "Privacy" #~ msgstr "Privacidade" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permitir a abertura de novas abas em segundo plano" diff -Nru webbrowser-app-0.23+16.04.20151124/po/pt.po webbrowser-app-0.23+16.04.20160413/po/pt.po --- webbrowser-app-0.23+16.04.20151124/po/pt.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/pt.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-26 09:59+0000\n" -"Last-Translator: Ivo Xavier \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-02-18 08:20+0000\n" +"Last-Translator: Ivo Xavier \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Cancelar" @@ -89,7 +92,7 @@ #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 msgid "Proceed anyway" -msgstr "Prosseguir de qualquer maneira" +msgstr "Prosseguir" #: src/app/CertificateVerificationDialog.qml:35 #: src/app/InvalidCertificateErrorSheet.qml:173 @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmação do JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Escolha uma app para abrir este ficheiro ou adicione-o à pasta de " -"transferências." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Escolha uma app" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Transferir" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Erro de rede" @@ -131,11 +119,7 @@ #: src/app/ErrorSheet.qml:53 msgid "Refresh page" -msgstr "Recarregar página" - -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Por favor, escolha um ficheiro" +msgstr "Atualizar página" #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" @@ -329,6 +313,36 @@ "Tentou acessar %1, mas o servidor apresentou um certificado de segurança que " "não passou no teste de segurança." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Permitir a este domínio aceder à sua câmara e ao microfone?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Permitir a este domínio aceder à sua câmara?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Permitir a este domínio aceder ao seu microfone?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (embutido em %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Sim" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Não" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Pedido do JavaScript" @@ -397,9 +411,9 @@ msgid "Erase" msgstr "Apagar" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "Encontrar na página" +msgstr "Procurar na página" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. @@ -427,8 +441,8 @@ msgid "Address;URL;www" msgstr "Endereço;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Novo separador" @@ -450,6 +464,10 @@ msgid "Open link in new tab" msgstr "Abrir link num novo separador" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Abrir vídeo em novo separador" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Colar" @@ -459,7 +477,7 @@ msgstr "Refazer" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Recarregar" @@ -477,12 +495,17 @@ msgid "Save link" msgstr "Guardar link" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Guardar vídeo" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Marcar todos" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Partilhar" @@ -491,16 +514,16 @@ msgstr "Desfazer" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "procurar na página" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "procurar ou introduzir endereço" @@ -519,8 +542,8 @@ msgstr "Guardar em" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Todos os marcadores" @@ -534,100 +557,120 @@ msgstr "Criar nova pasta" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Gravar" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Página inicial" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Marcadores" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Concluído" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Novo separador" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Histórico" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Separadores abertos" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Transferências" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "Sair de modo privado" +msgstr "Sair do modo privado" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Modo privado" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Definições" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Deslize para cima para sair do ecrã inteiro" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Carregue no ESC para sair do ecrã inteiro" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Escolha uma app para abrir este ficheiro ou adicione-o à pasta de " +"transferências." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Escolha uma app" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Transferir" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Transferência falhou" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Retomar" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Confirme seleção" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Eliminar" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Sem transferências disponíveis" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 página" msgstr[1] "%1 páginas" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menos" @@ -636,52 +679,26 @@ msgstr "Última visitada" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ontem" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Todo histórico" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Hoje" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "procurar histórico" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "Ir para o modo público vai fechar todos os separadores privados" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Permitir a este domínio aceder à sua câmara e ao microfone?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Permitir a este domínio aceder à sua câmara?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Permitir a este domínio aceder ao seu microfone?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (embutido em %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Sim" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Não" +msgstr "Sair do modo privado fecha todos separadores privados" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" @@ -695,18 +712,18 @@ "As páginas que visualizar neste separador não aparecem no histórico\n" "No entanto, os marcadores criados serão mantidos." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Mais" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Top sites" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "Ainda não visitou nenhuma página" +msgstr "Sem páginas visitadas" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." @@ -785,8 +802,12 @@ msgid "Which is run by" msgstr "Que é dirigido por" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Padrão" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de busca" @@ -795,60 +816,56 @@ msgstr "Restaurar sessão anterior ao iniciar" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permitir abrir novos separadores no fundo" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Privacidade e permissões" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Repor as definições do navegador" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Câmara e microfone" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Limpar histórico de pesquisa" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Limpar histórico?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" -msgstr "Limpar a Cache" +msgstr "Limpar cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Limpar cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Limpar" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Microfone" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Câmara" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Toque para ver" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Fechar separador" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Remover" @@ -961,18 +978,27 @@ #~ msgid "see less" #~ msgstr "ver menos" +#~ msgid "Open tabs" +#~ msgstr "Separadores abertos" + #~ msgid "Add" #~ msgstr "Adicionar" #~ msgid "Delete all history?" #~ msgstr "Apagar todo o histórico?" +#~ msgid "Please choose a file" +#~ msgstr "Por favor, escolha um ficheiro" + #~ msgid "Select an account" #~ msgstr "Selecionar uma conta" #~ msgid "Privacy" #~ msgstr "Privacidade" +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permitir abrir novos separadores no fundo" + #~ msgid "" #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ro.po webbrowser-app-0.23+16.04.20160413/po/ro.po --- webbrowser-app-0.23+16.04.20151124/po/ro.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ro.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-09-04 16:19+0000\n" "Last-Translator: Meriuță Cornel \n" "Language-Team: Romanian \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Anulează" @@ -101,19 +104,6 @@ msgid "JavaScript Confirmation" msgstr "Confirmare script Java" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Eroare de rețea" @@ -132,10 +122,6 @@ msgid "Refresh page" msgstr "Reîmprospătare pagină" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Alegeți un fișier" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Se solicită permisiunea" @@ -331,6 +317,36 @@ "securitate care dintr-un motiv necunoscut nu a trecut de verificările " "noastre de securitate." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Da" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nu" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Afișare script Java" @@ -399,7 +415,7 @@ msgid "Erase" msgstr "Șterge" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Găseşte în pagină" @@ -429,8 +445,8 @@ msgid "Address;URL;www" msgstr "Adresă;URL:www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Filă nouă" @@ -452,6 +468,10 @@ msgid "Open link in new tab" msgstr "Deschide legătura într-o filă nouă" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Lipeşte" @@ -461,7 +481,7 @@ msgstr "Refă ultima acțiune" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Reîncarcă" @@ -479,12 +499,17 @@ msgid "Save link" msgstr "Salvează legatura" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Selectați tot" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Partajare" @@ -493,16 +518,16 @@ msgstr "Anulează" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "găseşte în pagină" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "căutați sau introduceți o adresă" @@ -521,8 +546,8 @@ msgstr "Salvează în" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Toate semnele de carte" @@ -536,92 +561,110 @@ msgstr "Creează dosar nou" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Salvați" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Pagina de start" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Semne de carte" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Finalizat" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Filă nouă" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Istoric" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "File deschise" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Părasiți modul privat" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Mod privat" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Configurări" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Glisați în sus pentru a ieși din ecranul complet" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Apăsați ESC pentru a ieși din ecranul complet" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Ştergeţi" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -629,8 +672,8 @@ msgstr[1] "%1 pagini" msgstr[2] "%1 de pagini" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Mai puțin" @@ -639,20 +682,20 @@ msgstr "Ultima vizită" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Ieri" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Tot istoricul" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Astăzi" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -660,32 +703,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Trecerea la modul publlic va închide toate ferestrele private" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Da" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nu" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Aceasta este o fereastră privată" @@ -699,16 +716,16 @@ "istoricul navigatorului dumneavoastră.\n" "Semnele de carte pe care le creați vor fi păstrate, oricum." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Mai mult" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Site-uri de top" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Nu aveți vizitat încă niciun site." @@ -788,8 +805,12 @@ msgid "Which is run by" msgstr "Care este rulat de" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Motor de căutare" @@ -798,60 +819,56 @@ msgstr "Restabiliți sesiunea anterioară la pornire" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Permiteți deschiderea noilor file în fundal" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Resetați setările navigatorului" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Curățați istoricul de navigare" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Ştergeţi istoricul de navigare?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Curățați cache-ul" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Goliţi memoria cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Șterge" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Apăsați pentru vizualizare" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -950,6 +967,9 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "Internet;WWW;Browser;Web;Explorer;Navigator" +#~ msgid "Please choose a file" +#~ msgstr "Alegeți un fișier" + #~ msgid "Share…" #~ msgstr "Partajează..." @@ -962,6 +982,9 @@ #~ msgid "Delete all history?" #~ msgstr "Ștergeți tot istoricul?" +#~ msgid "Open tabs" +#~ msgstr "File deschise" + #~ msgid "see more" #~ msgstr "arată mai mult" @@ -982,3 +1005,6 @@ #~ msgid "Privacy" #~ msgstr "Confidențialitate" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Permiteți deschiderea noilor file în fundal" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ru.po webbrowser-app-0.23+16.04.20160413/po/ru.po --- webbrowser-app-0.23+16.04.20151124/po/ru.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ru.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-07-06 09:31+0000\n" "Last-Translator: ☠Jay ZDLin☠ \n" "Language-Team: Russian \n" @@ -16,8 +16,8 @@ "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" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -38,7 +38,7 @@ #: src/app/AuthenticationDialog.qml:26 #, qt-format msgid "The website %1 requires authentication." -msgstr "Сайт %1 требует авторизироваться." +msgstr "Для сайта %1 требуется авторизация." #: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 msgid "Username" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Отменить" @@ -101,21 +104,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript подтверждение" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Выберите приложение, чтобы открыть данный файл или добавить его в папку " -"загрузок." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Выберите приложение" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Загрузка" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Ошибка сети" @@ -124,7 +112,7 @@ #: src/app/ErrorSheet.qml:42 #, qt-format msgid "It appears you are having trouble viewing: %1." -msgstr "Похоже на то, что возникли проблемы с просмотром: %1." +msgstr "Похоже, возникли проблемы с просмотром: %1." #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." @@ -134,10 +122,6 @@ msgid "Refresh page" msgstr "Обновить страницу" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Выберите файл" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Запрос привилегий" @@ -331,6 +315,36 @@ "Вы обратились к %1, но сервер предоставил сертификат безопасности, который " "по неизвестной причине не прошёл наши проверки безопасности." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Разрешить домену доступ к камере и микрофону?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Разрешить домену доступ к камере?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Разрешить домену доступ к микрофону?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (размещённый на %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Да" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Нет" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript напоминание" @@ -399,7 +413,7 @@ msgid "Erase" msgstr "Удалить" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Найти на странице" @@ -429,8 +443,8 @@ msgid "Address;URL;www" msgstr "Адрес;URL;www;ссылка" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Новая вкладка" @@ -452,6 +466,10 @@ msgid "Open link in new tab" msgstr "Открыть ссылку в новой вкладке" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Открыть видео в новой вкладке" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Вставить" @@ -461,7 +479,7 @@ msgstr "Повторить" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Обновить" @@ -479,12 +497,17 @@ msgid "Save link" msgstr "Сохранить ссылку" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Сохранить видео" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Выделить всё" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Поделиться" @@ -493,16 +516,16 @@ msgstr "Отменить" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "найти на странице" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Введите поисковый запрос или адрес" @@ -521,8 +544,8 @@ msgstr "Сохранить в" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Все закладки" @@ -536,92 +559,112 @@ msgstr "Создать новую папку" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Сохранить" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Домашняя страница" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Закладки" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Готово" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Новая вкладка" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "История" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Открытые вкладки" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Загрузки" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Выйти из режима инкогнито" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Режим инкогнито" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Настройки" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Смахните вверх для выхода из полноэкранного режима" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Нажмите ESC для выхода из полноэкранного режима" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Выберите приложение, чтобы открыть данный файл или добавить его в папку " +"загрузок." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Выберите приложение" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Загрузка" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Сбой при загрузке" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Подтвердить выбор" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Удалить" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Нет доступных загрузок" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -629,8 +672,8 @@ msgstr[1] "%1 страницы" msgstr[2] "%1 страниц" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Свернуть" @@ -639,20 +682,20 @@ msgstr "Последние посещённые" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Вчера" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "За всё время" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Сегодня" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "история поиска" @@ -662,32 +705,6 @@ "При переключении в обычный режим все вкладки, открытые в режиме инкогнито, " "будут закрыты." -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Разрешить домену доступ к камере и микрофону?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Разрешить домену доступ к камере?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Разрешить домену доступ к микрофону?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (размещённый на %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Да" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Нет" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Данная вкладка открыта в режиме инкогнито." @@ -701,16 +718,16 @@ "браузера.\n" "Однако созданные закладки будут сохранены." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Ещё" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Популярные сайты" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Посещённые веб-сайты отсутствуют" @@ -789,8 +806,12 @@ msgid "Which is run by" msgstr "Обслуживается" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "По умолчанию" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Поисковая система" @@ -799,60 +820,56 @@ msgstr "Восстановить предыдущий сеанс при запуске" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Открывать новые вкладки в фоне" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Конфиденциальность и разрешения" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Сбросить настройки браузера" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Камера и микрофон" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Очистить историю" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Очистить историю?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Очистить кэш" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Очистить кэш?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Очистить" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Микрофон" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Камера" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Нажать для просмотра" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Закрыть вкладку" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Удалить" @@ -965,6 +982,9 @@ #~ msgid "Skip account creation step" #~ msgstr "Пропустить процедуру создания учётной записи" +#~ msgid "Please choose a file" +#~ msgstr "Выберите файл" + #~ msgid "Share…" #~ msgstr "Поделиться..." @@ -980,5 +1000,11 @@ #~ msgid "Add" #~ msgstr "Добавить" +#~ msgid "Open tabs" +#~ msgstr "Открытые вкладки" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Открывать новые вкладки в фоне" + #~ msgid "Privacy" #~ msgstr "Конфиденциальность" diff -Nru webbrowser-app-0.23+16.04.20151124/po/sa.po webbrowser-app-0.23+16.04.20160413/po/sa.po --- webbrowser-app-0.23+16.04.20151124/po/sa.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/sa.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-07-16 12:19+0000\n" "Last-Translator: उज्ज्वल राजपूत \n" "Language-Team: Sanskrit \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "निवर्त्यताम्" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "जालदोषः" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "एका सञ्चिका चीयताम्" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -896,3 +913,6 @@ #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" msgstr "" + +#~ msgid "Please choose a file" +#~ msgstr "एका सञ्चिका चीयताम्" diff -Nru webbrowser-app-0.23+16.04.20151124/po/sco.po webbrowser-app-0.23+16.04.20160413/po/sco.po --- webbrowser-app-0.23+16.04.20151124/po/sco.po 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/sco.po 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,929 @@ +# Scots translation for webbrowser-app +# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016 +# This file is distributed under the same license as the webbrowser-app package. +# FIRST AUTHOR , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: webbrowser-app\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-01-30 19:49+0000\n" +"Last-Translator: Marco Cafolla \n" +"Language-Team: Scots \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" + +#: src/app/AlertDialog.qml:23 +msgid "JavaScript Alert" +msgstr "JavaScript Alert" + +#: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 +#: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 +#: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101 +#: src/app/webbrowser/LeavePrivateModeDialog.qml:39 +msgid "OK" +msgstr "Awricht" + +#: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 +msgid "Authentication required." +msgstr "Authentication required." + +#. TRANSLATORS: %1 refers to the URL of the current website +#: src/app/AuthenticationDialog.qml:26 +#, qt-format +msgid "The website %1 requires authentication." +msgstr "The wabsteid %1 requires authentication." + +#: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 +msgid "Username" +msgstr "Uisername" + +#: src/app/AuthenticationDialog.qml:41 src/app/HttpAuthenticationDialog.qml:49 +msgid "Password" +msgstr "Trystwird" + +#: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 +#: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 +#: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 +#: src/app/webbrowser/ContextMenuMobile.qml:139 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 +#: src/app/webbrowser/LeavePrivateModeDialog.qml:32 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 +#: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 +msgid "Cancel" +msgstr "Elide" + +#: src/app/BeforeUnloadDialog.qml:23 +msgid "Confirm Navigation" +msgstr "Confirm Navigation" + +#: src/app/BeforeUnloadDialog.qml:26 +msgid "Leave" +msgstr "Leave" + +#: src/app/BeforeUnloadDialog.qml:31 +msgid "Stay" +msgstr "Stey" + +#: src/app/CertificateVerificationDialog.qml:24 +msgid "This connection is untrusted" +msgstr "This connection is untrystit" + +#. TRANSLATORS: %1 refers to the hostname +#: src/app/CertificateVerificationDialog.qml:26 +#, qt-format +msgid "" +"You are trying to securely reach %1, but the security certificate of this " +"website is not trusted." +msgstr "" + +#: src/app/CertificateVerificationDialog.qml:29 +#: src/app/InvalidCertificateErrorSheet.qml:160 +msgid "Proceed anyway" +msgstr "Proceed onywey" + +#: src/app/CertificateVerificationDialog.qml:35 +#: src/app/InvalidCertificateErrorSheet.qml:173 +msgid "Back to safety" +msgstr "Back tae sauftie" + +#: src/app/ConfirmDialog.qml:23 +msgid "JavaScript Confirmation" +msgstr "JavaScript Confirmation" + +#: src/app/ErrorSheet.qml:36 +msgid "Network Error" +msgstr "" + +#. TRANSLATORS: %1 refers to the URL of the current page +#: src/app/ErrorSheet.qml:42 +#, qt-format +msgid "It appears you are having trouble viewing: %1." +msgstr "It compears that ye're hivin tribble viewin: %1." + +#: src/app/ErrorSheet.qml:48 +msgid "Please check your network settings and try refreshing the page." +msgstr "Please chack yer netwirk settins an try refreshin the page." + +#: src/app/ErrorSheet.qml:53 +msgid "Refresh page" +msgstr "Refresh page" + +#: src/app/GeolocationPermissionRequest.qml:28 +msgid "Permission Request" +msgstr "Permeesion Speir" + +#: src/app/GeolocationPermissionRequest.qml:29 +msgid "This page wants to know your device’s location." +msgstr "This page wants tae ken yer device's location." + +#: src/app/GeolocationPermissionRequest.qml:33 +msgid "Deny" +msgstr "Denee" + +#: src/app/GeolocationPermissionRequest.qml:43 +msgid "Allow" +msgstr "Allou" + +#: src/app/InvalidCertificateErrorSheet.qml:55 +msgid "This site security certificate is not trusted.\n" +msgstr "This steid security certificate isna trystit.\n" + +#: src/app/InvalidCertificateErrorSheet.qml:63 +msgid "Learn more" +msgstr "Lear mair" + +#. TRANSLATORS: %1 refers to the SSL certificate's serial number +#: src/app/InvalidCertificateErrorSheet.qml:87 +#, qt-format +msgid "" +"Serial number:\n" +"%1" +msgstr "" +"Serial numer:\n" +"%1" + +#. TRANSLATORS: %1 refers to the SSL certificate's subject display name +#: src/app/InvalidCertificateErrorSheet.qml:94 +#, qt-format +msgid "" +"Subject:\n" +"%1" +msgstr "" +"Subject:\n" +"%1" + +#. TRANSLATORS: %1 refers to the SSL certificate's subject's address +#: src/app/InvalidCertificateErrorSheet.qml:102 +#, qt-format +msgid "" +"Subject address:\n" +"%1" +msgstr "" +"Subject address:\n" +"%1" + +#. TRANSLATORS: %1 refers to the SSL certificate's issuer display name +#: src/app/InvalidCertificateErrorSheet.qml:113 +#, qt-format +msgid "" +"Issuer:\n" +"%1" +msgstr "" +"Issuer:\n" +"%1" + +#. TRANSLATORS: %1 refers to the SSL certificate's issuer's address +#: src/app/InvalidCertificateErrorSheet.qml:121 +#, qt-format +msgid "" +"Issuer address:\n" +"%1" +msgstr "" +"Issuer address:\n" +"%1" + +#. TRANSLATORS: %1 refers to the SSL certificate's start date +#: src/app/InvalidCertificateErrorSheet.qml:132 +#, qt-format +msgid "" +"Valid from:\n" +"%1" +msgstr "" +"Habile frae:\n" +"%1" + +#. TRANSLATORS: %1 refers to the SSL certificate's expiry date +#: src/app/InvalidCertificateErrorSheet.qml:139 +#, qt-format +msgid "" +"Valid until:\n" +"%1" +msgstr "" +"Habile until:\n" +"%1" + +#. TRANSLATORS: %1 refers to the SSL certificate's SHA1 fingerprint +#: src/app/InvalidCertificateErrorSheet.qml:146 +#, qt-format +msgid "" +"Fingerprint (SHA1):\n" +"%1" +msgstr "" + +#: src/app/InvalidCertificateErrorSheet.qml:153 +msgid "" +"You should not proceed, especially if you have never seen this warning " +"before for this site." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:187 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which does not match the identity of the site." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:190 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which has expired." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:193 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"which contains invalid dates." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:196 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"issued by an entity that is not trusted." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:199 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented a security certificate " +"that has been revoked." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:202 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented an invalid security " +"certificate." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:205 +#, qt-format +msgid "" +"You attempted to reach %1 but the server presented an insecure security " +"certificate." +msgstr "" + +#. TRANSLATORS: %1 refers to the domain name of the SSL certificate +#: src/app/InvalidCertificateErrorSheet.qml:208 +#, qt-format +msgid "" +"This site security certificate is not trusted\n" +"You attempted to reach %1 but the server presented a security certificate " +"which failed our security checks for an unknown reason." +msgstr "" + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + +#: src/app/PromptDialog.qml:23 +msgid "JavaScript Prompt" +msgstr "" + +#: src/app/ProxyAuthenticationDialog.qml:22 +msgid "Proxy authentication required." +msgstr "Proxy authentication required." + +#. TRANSLATORS: %1 refers to the proxy address, %2 refers to the proxy port +#: src/app/ProxyAuthenticationDialog.qml:24 +#, qt-format +msgid "The website %1:%2 requires authentication." +msgstr "The wabsteid %1:%2 requires authentication." + +#: src/app/actions/Back.qml:23 +msgid "Back" +msgstr "Back" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Back' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Back.qml:26 +msgid "Older Page" +msgstr "Aulder page" + +#: src/app/actions/Bookmark.qml:23 +msgid "Bookmark" +msgstr "Beukmerk" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Bookmark' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Bookmark.qml:26 +msgid "Add This Page to Bookmarks" +msgstr "Add this page tae beukmerks" + +#: src/app/actions/BookmarkLink.qml:22 +msgid "Bookmark link" +msgstr "Beukmerk airtin" + +#: src/app/actions/ClearHistory.qml:23 +msgid "Clear History" +msgstr "Clear History" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Clear History' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/ClearHistory.qml:26 +msgid "Clear Navigation History" +msgstr "" + +#: src/app/actions/Copy.qml:22 +msgid "Copy" +msgstr "Copy" + +#: src/app/actions/CopyImage.qml:22 +msgid "Copy image" +msgstr "Copy eemage" + +#: src/app/actions/CopyLink.qml:22 +msgid "Copy link" +msgstr "Copy airtin" + +#: src/app/actions/Cut.qml:22 +msgid "Cut" +msgstr "Cut" + +#: src/app/actions/Erase.qml:22 +msgid "Erase" +msgstr "Erase" + +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 +msgid "Find in page" +msgstr "Find in page" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/FindInPage.qml:26 +msgid "Search in Page" +msgstr "Rake in page" + +#: src/app/actions/Forward.qml:23 +msgid "Forward" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Forward' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Forward.qml:26 +msgid "Newer Page" +msgstr "Newer Page" + +#: src/app/actions/GoTo.qml:23 +msgid "Goto" +msgstr "" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Goto' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/GoTo.qml:26 +msgid "Address;URL;www" +msgstr "Address;URL;www" + +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 +msgid "New Tab" +msgstr "New Tab" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'New Tab' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/NewTab.qml:26 +msgid "Open a New Tab" +msgstr "Appen a new tab" + +#: src/app/actions/OpenImageInNewTab.qml:22 +msgid "Open image in new tab" +msgstr "Appen eemage in new tab" + +#: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 +msgid "Open link in new background tab" +msgstr "" + +#: src/app/actions/OpenLinkInNewTab.qml:22 +msgid "Open link in new tab" +msgstr "Appen airtin in new tab" + +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + +#: src/app/actions/Paste.qml:22 +msgid "Paste" +msgstr "" + +#: src/app/actions/Redo.qml:22 +msgid "Redo" +msgstr "" + +#: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 +msgid "Reload" +msgstr "Reload" + +#. TRANSLATORS: This is a free-form list of keywords associated to the 'Reload' action. +#. Keywords may actually be sentences, and must be separated by semi-colons. +#: src/app/actions/Reload.qml:26 +msgid "Leave Page" +msgstr "Leave Page" + +#: src/app/actions/SaveImage.qml:22 +msgid "Save image" +msgstr "Hain eemage" + +#: src/app/actions/SaveLink.qml:22 +msgid "Save link" +msgstr "Hain airtin" + +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 +msgid "Select all" +msgstr "Select aw" + +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 +msgid "Share" +msgstr "Skare" + +#: src/app/actions/Undo.qml:22 +msgid "Undo" +msgstr "" + +#. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result +#: src/app/webbrowser/AddressBar.qml:210 +#, qt-format +msgid "%1/%2" +msgstr "%1/%2" + +#: src/app/webbrowser/AddressBar.qml:246 +msgid "find in page" +msgstr "find in page" + +#: src/app/webbrowser/AddressBar.qml:247 +msgid "search or enter an address" +msgstr "Rake or pit in an address" + +#: src/app/webbrowser/BookmarkOptions.qml:48 +msgid "Bookmark Added" +msgstr "Bookmerk addit" + +#. TRANSLATORS: Field where the title of bookmarked URL can be changed +#: src/app/webbrowser/BookmarkOptions.qml:53 +msgid "Name" +msgstr "Name" + +#. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in +#: src/app/webbrowser/BookmarkOptions.qml:71 +msgid "Save in" +msgstr "Hain in" + +#: src/app/webbrowser/BookmarkOptions.qml:78 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 +msgid "All Bookmarks" +msgstr "Aw bookmerks" + +#: src/app/webbrowser/BookmarkOptions.qml:93 +#: src/app/webbrowser/BookmarkOptions.qml:133 +msgid "New Folder" +msgstr "New Folder" + +#: src/app/webbrowser/BookmarkOptions.qml:115 +msgid "Create new folder" +msgstr "Creaut new folder" + +#: src/app/webbrowser/BookmarkOptions.qml:153 +#: src/app/webbrowser/SettingsPage.qml:339 +msgid "Save" +msgstr "Hain" + +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 +msgid "Homepage" +msgstr "Hamepage" + +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 +msgid "Bookmarks" +msgstr "Bookmerks" + +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 +msgid "Done" +msgstr "Duin" + +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 +msgid "New tab" +msgstr "New tab" + +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 +msgid "History" +msgstr "History" + +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 +msgid "Downloads" +msgstr "" + +#: src/app/webbrowser/Browser.qml:566 +msgid "Leave Private Mode" +msgstr "" + +#: src/app/webbrowser/Browser.qml:566 +msgid "Private Mode" +msgstr "" + +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 +msgid "Settings" +msgstr "" + +#. TRANSLATORS: %1 refers to the current number of tabs opened +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 +#, qt-format +msgid "(%1)" +msgstr "" + +#: src/app/webbrowser/Browser.qml:1345 +msgid "Swipe Up To Exit Full Screen" +msgstr "" + +#: src/app/webbrowser/Browser.qml:1346 +msgid "Press ESC To Exit Full Screen" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 +msgid "Confirm selection" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 +msgid "Delete" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:252 +msgid "No downloads available" +msgstr "" + +#: src/app/webbrowser/ExpandedHistoryView.qml:121 +#, qt-format +msgid "%1 page" +msgid_plural "%1 pages" +msgstr[0] "" +msgstr[1] "" + +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 +msgid "Less" +msgstr "" + +#: src/app/webbrowser/HistorySectionDelegate.qml:26 +msgid "Last Visited" +msgstr "" + +#: src/app/webbrowser/HistorySectionDelegate.qml:48 +#: src/app/webbrowser/HistoryViewWide.qml:212 +msgid "Yesterday" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:196 +msgid "All History" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 +msgid "Today" +msgstr "" + +#: src/app/webbrowser/HistoryViewWide.qml:462 +msgid "search history" +msgstr "" + +#: src/app/webbrowser/LeavePrivateModeDialog.qml:24 +msgid "Going to public mode will close all private tabs" +msgstr "" + +#: src/app/webbrowser/NewPrivateTabView.qml:41 +msgid "This is a private tab" +msgstr "" + +#: src/app/webbrowser/NewPrivateTabView.qml:56 +msgid "" +"Pages that you view in this tab won't appear in your browser history.\n" +"Bookmarks you create will be preserved, however." +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:148 +msgid "More" +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 +msgid "Top sites" +msgstr "" + +#: src/app/webbrowser/NewTabView.qml:366 +msgid "You haven't visited any site yet" +msgstr "" + +#: src/app/webbrowser/SadTab.qml:48 +msgid "The rendering process has been closed for this tab." +msgstr "" + +#. TRANSLATORS: %1 is the URL of the page that crashed the renderer process +#: src/app/webbrowser/SadTab.qml:65 +#, qt-format +msgid "Something went wrong while displaying %1." +msgstr "" + +#: src/app/webbrowser/SadTab.qml:67 +msgid "" +"The system is low on memory and can't display this webpage. Try closing " +"unneeded tabs and reloading." +msgstr "" + +#: src/app/webbrowser/SadTab.qml:80 +msgid "Close tab" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:69 +msgid "This site has insecure content" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:70 +msgid "Identity Not Verified" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:78 +msgid "The identity of this website has not been verified." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:89 +msgid "Server certificate does not match the identity of the site." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:91 +msgid "Server certificate has expired." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:93 +msgid "Server certificate contains invalid dates." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:95 +msgid "Server certificate is issued by an entity that is not trusted." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:97 +msgid "Server certificate has been revoked." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:99 +msgid "Server certificate is invalid." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:101 +msgid "Server certificate is insecure." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:103 +msgid "Server certificate failed our security checks for an unknown reason." +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:126 +msgid "You are connected to" +msgstr "" + +#: src/app/webbrowser/SecurityCertificatePopover.qml:148 +msgid "Which is run by" +msgstr "" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:80 +#: src/app/webbrowser/SettingsPage.qml:156 +msgid "Search engine" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:100 +msgid "Restore previous session at startup" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:118 +#: src/app/webbrowser/SettingsPage.qml:208 +msgid "Privacy & permissions" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:126 +msgid "Reset browser settings" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 +msgid "Camera & microphone" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:235 +msgid "Clear Browsing History" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:238 +msgid "Clear Browsing History?" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:245 +msgid "Clear Cache" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:247 +msgid "Clear Cache?" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:282 +msgid "Clear" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:387 +msgid "Microphone" +msgstr "" + +#: src/app/webbrowser/SettingsPage.qml:406 +msgid "Camera" +msgstr "" + +#: src/app/webbrowser/TabPreview.qml:86 +msgid "Tap to view" +msgstr "" + +#: src/app/webbrowser/TabsBar.qml:102 +msgid "Close Tab" +msgstr "" + +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 +msgid "Remove" +msgstr "" + +#. TRANSLATORS: %1 refers to the current page’s title +#: src/app/webbrowser/webbrowser-app.qml:35 +#: src/app/webcontainer/webapp-container.qml:67 +#, qt-format +msgid "%1 - Ubuntu Web Browser" +msgstr "" + +#: src/app/webbrowser/webbrowser-app.qml:37 +#: src/app/webcontainer/webapp-container.qml:69 +msgid "Ubuntu Web Browser" +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:62 +msgid "" +"No accounts have been linked to this webapp; press the item below to add an " +"account." +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:78 +msgid "Add account" +msgstr "" + +#: src/app/webcontainer/AccountChooserDialog.qml:87 +msgid "Don't use an account" +msgstr "" + +#: src/app/webcontainer/AccountErrorScreen.qml:39 +msgid "Account error" +msgstr "" + +#: src/app/webcontainer/AccountErrorScreen.qml:50 +msgid "Close" +msgstr "" + +#: src/app/webcontainer/AccountsLogic.qml:63 +msgid "" +"Account window could not be opened. You can only create one account at a " +"time; please try again after closing all other account windows." +msgstr "" + +#. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider +#: src/app/webcontainer/AccountsSplashScreen.qml:45 +#, qt-format +msgid "%1 needs to access your %2 online account." +msgstr "" + +#. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider +#: src/app/webcontainer/AccountsSplashScreen.qml:55 +#, qt-format +msgid "%1 would like to access your %2 online account." +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:64 +msgid "" +"Choose an account now, or skip this step and choose an online account later." +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:77 +msgid "Close the app" +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:77 +msgid "Skip" +msgstr "" + +#: src/app/webcontainer/AccountsSplashScreen.qml:84 +msgid "Choose account" +msgstr "" + +#: src/app/webcontainer/SadPage.qml:45 +msgid "Oops, something went wrong." +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 +msgid "Browser" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:2 +msgid "Web Browser" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:3 +msgid "Browse the World Wide Web" +msgstr "" + +#: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 +msgid "Internet;WWW;Browser;Web;Explorer" +msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/shn.po webbrowser-app-0.23+16.04.20160413/po/shn.po --- webbrowser-app-0.23+16.04.20151124/po/shn.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/shn.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-07-14 08:39+0000\n" "Last-Translator: Sai Mawn Kham \n" "Language-Team: Shan \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "လူတ်းပႅတ်ႈ" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "လူတ်ႇလူင်း" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "ၵွင့်သၢၼ် ၽိတ်းပိူင်ႈဝႆ့" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "ၶိုၼ်းယုၵ့် ၼႃႈလိၵ်ႈ" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "ႁဵင်းလိၵ်ႈ;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "ထႅပ့်ဢၼ်မႂ်ႇ" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "ၶိုၼ်းၼဵင်ႇပိုတ်ႇ" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "လူတ်ႇလူင်း" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -871,7 +888,7 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "ၶၢမ်ႈၵႂႃႇ" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" diff -Nru webbrowser-app-0.23+16.04.20151124/po/si.po webbrowser-app-0.23+16.04.20160413/po/si.po --- webbrowser-app-0.23+16.04.20151124/po/si.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/si.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-02-21 05:30+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Sinhalese \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "අවලංගු කරන්න" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "ජාලයේ දෝෂය" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "කරුණාකර ගොනුවක් තෝරන්න" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -298,6 +284,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -366,7 +382,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -396,8 +412,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -419,6 +435,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -428,7 +448,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -446,12 +466,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -460,16 +485,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -488,8 +513,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -503,100 +528,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "අවසානයි" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "මකන්න" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -605,20 +648,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "ඊයේ" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -626,32 +669,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -662,16 +679,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -747,8 +764,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -757,60 +778,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -903,5 +920,8 @@ msgid "Internet;WWW;Browser;Web;Explorer" msgstr "" +#~ msgid "Please choose a file" +#~ msgstr "කරුණාකර ගොනුවක් තෝරන්න" + #~ msgid "Select an account" #~ msgstr "ගිණුමක් තෝරන්න" diff -Nru webbrowser-app-0.23+16.04.20151124/po/sk.po webbrowser-app-0.23+16.04.20160413/po/sk.po --- webbrowser-app-0.23+16.04.20151124/po/sk.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/sk.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-14 00:45+0000\n" -"Last-Translator: Ján Dráb \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-04-13 04:22+0000\n" +"Last-Translator: P_E_T_O \n" "Language-Team: Slovak \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==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Zrušiť" @@ -100,21 +103,6 @@ msgid "JavaScript Confirmation" msgstr "Potvrdenie JavaScriptu" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Vyberte aplikáciu na otvorenie súboru alebo ho pridajte do priečinka na " -"stiahnutie." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Vyberte aplikáciu" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Stiahnuť" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Chyba siete" @@ -127,16 +115,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "Skontrolujte nastavenia siete a skúste stránku obnoviť." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Obnoviť stránku" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Prosím vyberte súbor" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Žiadosť o povolenie" @@ -329,7 +313,37 @@ msgstr "" "Certifikát zabezpečenia nie je dôveryhodný,\n" "pokúsili ste sa prejsť na %1, ale server predložil certifikát zabezpečenia, " -"ktorý z neznámeho dôvodu nevyhovuje bezpečnostným kritériam." +"ktorý z neznámeho dôvodu nevyhovuje bezpečnostným kritériám." + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "Oprávnenie" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Povoliť tejto doméne používať fotoaparát a mikrofón?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Povoliť tejto doméne prístup k fotoaparátu?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Povoliť tejto doméne prístup k mikrofónu?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (vložená do %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Áno" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nie" #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" @@ -367,7 +381,7 @@ #: src/app/actions/BookmarkLink.qml:22 msgid "Bookmark link" -msgstr "Link na záložku" +msgstr "Adresa na záložku" #: src/app/actions/ClearHistory.qml:23 msgid "Clear History" @@ -399,7 +413,7 @@ msgid "Erase" msgstr "Vymazať" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Nájsť na stránke" @@ -429,8 +443,8 @@ msgid "Address;URL;www" msgstr "Adresa;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nová karta" @@ -452,6 +466,10 @@ msgid "Open link in new tab" msgstr "Otvoriť odkaz na novej karte" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Otvoriť video na novej karte" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Prilepiť" @@ -461,7 +479,7 @@ msgstr "Znova" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Obnoviť" @@ -479,12 +497,17 @@ msgid "Save link" msgstr "Uložiť odkaz" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Uložiť video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Vybrať všetko" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Zdieľať" @@ -493,18 +516,18 @@ msgstr "Späť" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1 z %2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "nájsť na stránke" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" -msgstr "hľadať alebo zajte adresu" +msgstr "hľadať alebo zadajte adresu" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" @@ -521,8 +544,8 @@ msgstr "Uložiť do" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Všetky záložky" @@ -536,101 +559,121 @@ msgstr "Vytvoriť nový priečinok" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Uložiť" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Domovská stránka" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Záložky" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Hotovo" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nová karta" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "História" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Otvoriť karty" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Stiahnuté" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Opustiť súkromné prehliadanie" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Súkromné prehliadanie" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Nastavenia" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Prejdite prstom hore pre ukončenie režimu celej obrazovky" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Stlačte ESC pre ukončenie režimu celej obrazovky" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Vyberte aplikáciu na otvorenie súboru alebo ho pridajte do priečinka na " +"stiahnutie." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Vyberte aplikáciu" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Stiahnuť" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Sťahovanie zlyhalo" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Pokračovať" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Potvrdiť výber" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Odstrániť" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Žiadne stiahnuté súbory" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" -msgstr[0] "%1 stránka" -msgstr[1] "%1 stránky" -msgstr[2] "%1 stránok" +msgstr[0] "%1 stránok" +msgstr[1] "%1 stránka" +msgstr[2] "%1 stránky" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Menej" @@ -639,20 +682,20 @@ msgstr "Ostatne navštívené" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Včera" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Celá história" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Dnes" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "hľadať v histórii" @@ -660,32 +703,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Prechod do verejného režimu zavrie všetky súkromné karty" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Toto je súkromná karta" @@ -699,16 +716,16 @@ "prehliadania.\n" "Záložky, ktoré vytvoríte budú zachované." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Viac" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" -msgstr "Top stánky" +msgstr "Top stránky" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Nenavštívili ste ešte žiadnu stránku" @@ -786,8 +803,12 @@ msgid "Which is run by" msgstr "Ktorý prevádzkuje" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Predvolené" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Vyhľadávač" @@ -796,62 +817,58 @@ msgstr "Pri štarte obnoviť predchádzajúce sedenie" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Povoliť otváranie kariet na pozadí" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Súkromie a oprávnenia" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Obnovenie nastavení prehliadača" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Fotoaparát a mikrofón" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Vymazať históriu prehliadania" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Vymazať históriu prehliadania?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Vyčistiť vyrovnávaciu pamäť" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Vyčistiť vyrovnávaciu pamäť?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Vyčistiť" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofón" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Fotoaparát" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Kliknutím zobrazíte" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Zavrieť kartu" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Odstrániť" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -945,7 +962,10 @@ #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" -msgstr "Internet;WWW;Browser;Web;Explorer" +msgstr "Internet;WWW;Prehliadač;Web;Explorer" + +#~ msgid "Please choose a file" +#~ msgstr "Prosím vyberte súbor" #~ msgid "" #~ "Ubuntu suggests you check your network settings and try refreshing the page." @@ -953,5 +973,11 @@ #~ "Ubuntu vám odporúča skontrolovať vaše sieťové nastavenia a skúsiť obnoviť " #~ "stránku." +#~ msgid "Open tabs" +#~ msgstr "Otvoriť karty" + #~ msgid "Privacy" #~ msgstr "Súkromie" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Povoliť otváranie kariet na pozadí" diff -Nru webbrowser-app-0.23+16.04.20151124/po/sl.po webbrowser-app-0.23+16.04.20160413/po/sl.po --- webbrowser-app-0.23+16.04.20151124/po/sl.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/sl.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-08-19 17:11+0000\n" -"Last-Translator: Sasa Batistic \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-01-31 19:50+0000\n" +"Last-Translator: Bernard Banko \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || " "n%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Prekliči" @@ -101,20 +104,6 @@ msgid "JavaScript Confirmation" msgstr "Potrditev JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Izberite program za odpiranje te datoteka ali jo dodajte v mapo prejemov." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Izberite program" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Prejem" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Napaka omrežja" @@ -127,16 +116,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "Preverite nastavitve omrežje in nato poskusite osvežiti stran." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Osveži stran" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Izberite datoteko" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Zahteva za dovoljenje" @@ -178,7 +163,7 @@ "Subject:\n" "%1" msgstr "" -"Zadeva:\n" +"Nosilec:\n" "%1" #. TRANSLATORS: %1 refers to the SSL certificate's subject's address @@ -188,7 +173,7 @@ "Subject address:\n" "%1" msgstr "" -"Naslov zadeve:\n" +"Naslov nosilca:\n" "%1" #. TRANSLATORS: %1 refers to the SSL certificate's issuer display name @@ -332,6 +317,36 @@ "potrdilo, ki je spodletelo pri naših varnostnih preverjanjih iz neznanega " "razloga." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Dovolite tej domeni, da dostopa do vašega mikrofona in kamere?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Dovolite tej domeni, da dostopa do vaše kamere?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Dovolite tej domeni, da dostopa do vašega mikrofona?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (vdelana v %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Da" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Ne" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Poziv JavaScript" @@ -400,7 +415,7 @@ msgid "Erase" msgstr "Izbriši" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Najdi na strani" @@ -430,8 +445,8 @@ msgid "Address;URL;www" msgstr "Naslov;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Nov zavihek" @@ -453,6 +468,10 @@ msgid "Open link in new tab" msgstr "Odpri povezavo v novem zavihku" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Odpri videposnetek v novem zavihku" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Prilepi" @@ -462,7 +481,7 @@ msgstr "Ponovno uveljavi" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Ponovno naloži" @@ -480,12 +499,17 @@ msgid "Save link" msgstr "Shrani povezavo" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Shrani videoposnetek" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Izberi vse" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Deli" @@ -494,16 +518,16 @@ msgstr "Razveljavi" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "najdi na strani" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "poiščite ali vnesite naslov" @@ -522,8 +546,8 @@ msgstr "Shrani v" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Vsi zaznamki" @@ -537,92 +561,111 @@ msgstr "Ustvari novo mapo" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Shrani" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Domača stran" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Zaznamki" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Končano" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Nov zavihek" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Zgodovina" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Odpri zavihke" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Prejemi" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Zapusti Zasebni način" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Zasebni način" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Nastavitve" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Potegnite navzgor za izhod iz celozaslonskega načina" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Pritisnite ESC za izhod iz celozaslonskega načina" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Izberite program za odpiranje te datoteka ali jo dodajte v mapo prejemov." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Izberite program" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Prejem" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Prejemanje ni uspelo" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Nadaljuj" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Potrdite izbiro" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Izbriši" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Ni prejemov na voljo" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -631,8 +674,8 @@ msgstr[2] "%1 strani" msgstr[3] "%1 strani" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Manj" @@ -641,20 +684,20 @@ msgstr "Nazadnje obiskano" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Včeraj" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Celotna zgodovina" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Danes" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "zgodovina iskanja" @@ -662,32 +705,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Preklop na javni način bo zaprl vse zasebne zavihke" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Da" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Ne" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "To je zasebni zavihek" @@ -701,16 +718,16 @@ "brskalnika.\n" "Zaznamki, ki jih ustvarite, pa se bodo ohranili." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Več" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Najboljše strani" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Obiskali še niste nobene strani" @@ -790,8 +807,12 @@ msgid "Which is run by" msgstr "Katerega izvaja" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Privzeto" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Iskalnik" @@ -800,62 +821,58 @@ msgstr "Obnovi predhodne seje ob zagonu" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Dovoli odpiranje novih zavihkov v ozadju" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Zasebnost in dovoljenja" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Ponastavitev nastavitev brskalnika" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera in mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Izbriši zgodovino brskanja" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Počisti zgodovino brskanja?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Počisti predpomnilnik" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Počisti predpomnilnik?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Počisti" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tapnite za pogled" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Zapri zavihek" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Odstrani" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -934,7 +951,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Žal je prišlo do napake." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -969,12 +986,18 @@ #~ msgid "see more" #~ msgstr "oglejte si več" +#~ msgid "Please choose a file" +#~ msgstr "Izberite datoteko" + #~ msgid "No local account found for " #~ msgstr "Ni najdenih krajevnih računov za " #~ msgid "Skip account creation step" #~ msgstr "Preskoči korak ustvarjanja računa" +#~ msgid "Open tabs" +#~ msgstr "Odpri zavihke" + #~ msgid "Add" #~ msgstr "Dodaj" @@ -983,3 +1006,6 @@ #~ msgid "Privacy" #~ msgstr "Zasebnost" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Dovoli odpiranje novih zavihkov v ozadju" diff -Nru webbrowser-app-0.23+16.04.20151124/po/sq.po webbrowser-app-0.23+16.04.20160413/po/sq.po --- webbrowser-app-0.23+16.04.20151124/po/sq.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/sq.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-03-21 01:17+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Albanian \n" @@ -15,12 +15,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:30+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:39+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" -msgstr "" +msgstr "Paralajmërim i JavaScript" #: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 #: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 @@ -31,13 +31,13 @@ #: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 msgid "Authentication required." -msgstr "" +msgstr "Kërkohet identifikimi." #. TRANSLATORS: %1 refers to the URL of the current website #: src/app/AuthenticationDialog.qml:26 #, qt-format msgid "The website %1 requires authentication." -msgstr "" +msgstr "Faqja %1 kërkon identifikim." #: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 msgid "Username" @@ -50,27 +50,30 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Anulo" #: src/app/BeforeUnloadDialog.qml:23 msgid "Confirm Navigation" -msgstr "" +msgstr "Konfirmo Lundrimin" #: src/app/BeforeUnloadDialog.qml:26 msgid "Leave" -msgstr "" +msgstr "Largohu" #: src/app/BeforeUnloadDialog.qml:31 msgid "Stay" -msgstr "" +msgstr "Qëndro" #: src/app/CertificateVerificationDialog.qml:24 msgid "This connection is untrusted" @@ -83,59 +86,46 @@ "You are trying to securely reach %1, but the security certificate of this " "website is not trusted." msgstr "" +"Ti po përpiqesh të arish në mënyrë të sigurtë %1, por çertifikata e sigurisë " +"së kësaj faqeje të internetit nuk është e besueshme." #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 msgid "Proceed anyway" -msgstr "" +msgstr "Vazhdo gjithësesi" #: src/app/CertificateVerificationDialog.qml:35 #: src/app/InvalidCertificateErrorSheet.qml:173 msgid "Back to safety" -msgstr "" +msgstr "Ktheu tek siguria" #: src/app/ConfirmDialog.qml:23 msgid "JavaScript Confirmation" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" +msgstr "Konfirmim i JavaScript" #: src/app/ErrorSheet.qml:36 msgid "Network Error" -msgstr "" +msgstr "Gabim Rrjeti" #. TRANSLATORS: %1 refers to the URL of the current page #: src/app/ErrorSheet.qml:42 #, qt-format msgid "It appears you are having trouble viewing: %1." -msgstr "" +msgstr "Duket se keni problem në hapjen e: %1." #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Ju lutemi të kontrolloni parametrat e rrjetit tuaj dhe të përpiqeni ta " +"rifreskoni faqen." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" -msgstr "" - -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" +msgstr "Rifresko faqen" #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" -msgstr "" +msgstr "Kërkohet Leje" #: src/app/GeolocationPermissionRequest.qml:29 msgid "This page wants to know your device’s location." @@ -151,11 +141,11 @@ #: src/app/InvalidCertificateErrorSheet.qml:55 msgid "This site security certificate is not trusted.\n" -msgstr "" +msgstr "Çertifikata e sigurisë së kësaj faqeje nuk është e besueshme.\n" #: src/app/InvalidCertificateErrorSheet.qml:63 msgid "Learn more" -msgstr "" +msgstr "Mëso më tepër" #. TRANSLATORS: %1 refers to the SSL certificate's serial number #: src/app/InvalidCertificateErrorSheet.qml:87 @@ -164,6 +154,8 @@ "Serial number:\n" "%1" msgstr "" +"Numri i serisë:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's subject display name #: src/app/InvalidCertificateErrorSheet.qml:94 @@ -172,6 +164,8 @@ "Subject:\n" "%1" msgstr "" +"Subjekti:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's subject's address #: src/app/InvalidCertificateErrorSheet.qml:102 @@ -180,6 +174,8 @@ "Subject address:\n" "%1" msgstr "" +"Adresa e subjektit:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's issuer display name #: src/app/InvalidCertificateErrorSheet.qml:113 @@ -188,6 +184,8 @@ "Issuer:\n" "%1" msgstr "" +"Lëshuesi:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's issuer's address #: src/app/InvalidCertificateErrorSheet.qml:121 @@ -196,6 +194,8 @@ "Issuer address:\n" "%1" msgstr "" +"Adresa e lëshuesit:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's start date #: src/app/InvalidCertificateErrorSheet.qml:132 @@ -204,6 +204,8 @@ "Valid from:\n" "%1" msgstr "" +"E vlefshme nga:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's expiry date #: src/app/InvalidCertificateErrorSheet.qml:139 @@ -212,6 +214,8 @@ "Valid until:\n" "%1" msgstr "" +"E vlefshme deri në:\n" +"%1" #. TRANSLATORS: %1 refers to the SSL certificate's SHA1 fingerprint #: src/app/InvalidCertificateErrorSheet.qml:146 @@ -220,12 +224,16 @@ "Fingerprint (SHA1):\n" "%1" msgstr "" +"Gjurma e gishtërinjve (SHA1):\n" +"%1" #: src/app/InvalidCertificateErrorSheet.qml:153 msgid "" "You should not proceed, especially if you have never seen this warning " "before for this site." msgstr "" +"Ju nuk duhet të vazhdoni, sidomos nëse nuk e keni parë asnjëherë më parë " +"këtë paralajmërim për këtë faqe." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:187 @@ -234,6 +242,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which does not match the identity of the site." msgstr "" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që nuk përputhet me identitetin e faqes." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:190 @@ -242,6 +252,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which has expired." msgstr "" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që ka skaduar." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:193 @@ -250,6 +262,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which contains invalid dates." msgstr "" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që përmban data të pavlefshme." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:196 @@ -258,6 +272,8 @@ "You attempted to reach %1 but the server presented a security certificate " "issued by an entity that is not trusted." msgstr "" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që është lëshuar nga një njësi jo e besueshme." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:199 @@ -266,6 +282,8 @@ "You attempted to reach %1 but the server presented a security certificate " "that has been revoked." msgstr "" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që është pezulluar." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:202 @@ -274,6 +292,8 @@ "You attempted to reach %1 but the server presented an invalid security " "certificate." msgstr "" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që është e pavlefshme." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:205 @@ -282,6 +302,8 @@ "You attempted to reach %1 but the server presented an insecure security " "certificate." msgstr "" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që është e pasigurtë." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:208 @@ -291,608 +313,665 @@ "You attempted to reach %1 but the server presented a security certificate " "which failed our security checks for an unknown reason." msgstr "" +"Çertifikata e sigurisë së kësaj faqeje nuk është e besueshme\n" +"Ju u përpoqët të arrini %1 por serveri ju paraqiti një çertifikatë sigurie " +"që dështoi në kontrollin e sigurisë për një arsye të panjohur." + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Ta lejoj këtë domein që të ketë hyrje në kamerën dhe mikrofonin tënd?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Ta lejoj këtë domein të ketë hyrje në kamerën tënde?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Ta lejoj këtë domein të ketë hyrje në mikrofonin tënd?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (ngjitur në %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Po" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Jo" #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" -msgstr "" +msgstr "Lajmërim i JavaScript" #: src/app/ProxyAuthenticationDialog.qml:22 msgid "Proxy authentication required." -msgstr "" +msgstr "Kërkohet identifikimi i proxy." #. TRANSLATORS: %1 refers to the proxy address, %2 refers to the proxy port #: src/app/ProxyAuthenticationDialog.qml:24 #, qt-format msgid "The website %1:%2 requires authentication." -msgstr "" +msgstr "Faqja e internetit %1:%2 kërkon identifikim." #: src/app/actions/Back.qml:23 msgid "Back" -msgstr "" +msgstr "Prapa" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Back' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Back.qml:26 msgid "Older Page" -msgstr "" +msgstr "Faqe më e Vjetër" #: src/app/actions/Bookmark.qml:23 msgid "Bookmark" -msgstr "" +msgstr "Libërshënues" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Bookmark' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Bookmark.qml:26 msgid "Add This Page to Bookmarks" -msgstr "" +msgstr "Shtoje Këtë faqe tek Libërshënuesi" #: src/app/actions/BookmarkLink.qml:22 msgid "Bookmark link" -msgstr "" +msgstr "SHëno lidhjen" #: src/app/actions/ClearHistory.qml:23 msgid "Clear History" -msgstr "" +msgstr "Pastro Historinë" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Clear History' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/ClearHistory.qml:26 msgid "Clear Navigation History" -msgstr "" +msgstr "Pastro Historinë e Lundrimit" #: src/app/actions/Copy.qml:22 msgid "Copy" -msgstr "" +msgstr "Kopjo" #: src/app/actions/CopyImage.qml:22 msgid "Copy image" -msgstr "" +msgstr "Kopjo imazhin" #: src/app/actions/CopyLink.qml:22 msgid "Copy link" -msgstr "" +msgstr "Kopjo lidhjen" #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "Prije" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "Fshije" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "Gjej në faqe" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "Kërko në Faqe" #: src/app/actions/Forward.qml:23 msgid "Forward" -msgstr "" +msgstr "Përpara" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Forward' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Forward.qml:26 msgid "Newer Page" -msgstr "" +msgstr "Faqe më e Re" #: src/app/actions/GoTo.qml:23 msgid "Goto" -msgstr "" +msgstr "Shko tek" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Goto' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/GoTo.qml:26 msgid "Address;URL;www" -msgstr "" +msgstr "Adresa;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" -msgstr "" +msgstr "Tabelë e Re" #. TRANSLATORS: This is a free-form list of keywords associated to the 'New Tab' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/NewTab.qml:26 msgid "Open a New Tab" -msgstr "" +msgstr "Hap një Tabelë të Re" #: src/app/actions/OpenImageInNewTab.qml:22 msgid "Open image in new tab" -msgstr "" +msgstr "Hap imazhin në tabelë të re" #: src/app/actions/OpenLinkInNewBackgroundTab.qml:22 msgid "Open link in new background tab" -msgstr "" +msgstr "Hap lidhjen në tabelë të re në sfond" #: src/app/actions/OpenLinkInNewTab.qml:22 msgid "Open link in new tab" +msgstr "Hap lidhjen në tabelë të re" + +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" msgstr "" #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "Ngjite" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "Ribëje" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" -msgstr "" +msgstr "Ringarko" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Reload' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Reload.qml:26 msgid "Leave Page" -msgstr "" +msgstr "Largohu nga Faqja" #: src/app/actions/SaveImage.qml:22 msgid "Save image" -msgstr "" +msgstr "Ruaje imazhin" #: src/app/actions/SaveLink.qml:22 msgid "Save link" +msgstr "Ruaje lidhjen" + +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" -msgstr "" +msgstr "Përzgjidhi të gjitha" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" -msgstr "" +msgstr "Shpërndaje" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "Zhbëje" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "gjej në faqe" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" -msgstr "" +msgstr "kërko ose vendos një adresë" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" -msgstr "" +msgstr "Libërshënuesi i Shtua" #. TRANSLATORS: Field where the title of bookmarked URL can be changed #: src/app/webbrowser/BookmarkOptions.qml:53 msgid "Name" -msgstr "" +msgstr "Emri" #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in #: src/app/webbrowser/BookmarkOptions.qml:71 msgid "Save in" -msgstr "" +msgstr "Ruaje në" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" -msgstr "" +msgstr "Të Gjithë Libërshënuesit" #: src/app/webbrowser/BookmarkOptions.qml:93 #: src/app/webbrowser/BookmarkOptions.qml:133 msgid "New Folder" -msgstr "" +msgstr "Skedar i Ri" #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "" +msgstr "Krijo skedar të ri" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" -msgstr "" +msgstr "Ruaje" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" -msgstr "" +msgstr "Faqja Kryesore" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" -msgstr "" +msgstr "Libërshënues" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" -msgstr "" +msgstr "U Bë" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" -msgstr "" +msgstr "Tabelë e re" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" -msgstr "" +msgstr "Historia" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Shkarkimet" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" -msgstr "" +msgstr "Lëre Mënyrën Private" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" -msgstr "" +msgstr "Mënyrë Private" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" -msgstr "" +msgstr "Parametrat" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" -msgstr "" +msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" -msgstr "" +msgstr "Ngrije Lart Për të Dalë nga Ekrani i Plotë" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" +msgstr "Shtyp ESC për të Dalë nga Ekrani i Plotë" + +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." msgstr "" +"Zgjidh një program për ta hapur këtë skedar ose shtoja dosjes së shkarkimeve." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Zgjidh një program" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Shkarko" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Shkarkimi dështoi" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Rinise" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "Konfirmo përzgjedhjen" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" -msgstr "" +msgstr "Fshije" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Nuk ka shkarkime të disponueshme" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1 faqe" +msgstr[1] "%1 faqe" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" -msgstr "" +msgstr "Më Pak" #: src/app/webbrowser/HistorySectionDelegate.qml:26 msgid "Last Visited" -msgstr "" +msgstr "Vizituar e Fundit" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" -msgstr "" +msgstr "Dje" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "E Gjithë Historia" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "Sot" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "kërko historinë" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" +msgstr "Kalimi në mënyrë publike do ti mbyllë të gjitha tabelat private" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" -msgstr "" +msgstr "Kjo është një tabelë private" #: src/app/webbrowser/NewPrivateTabView.qml:56 msgid "" "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" +"Faqet që ju hapni në këtë tabelë nuk do të shfaqen në historinë e " +"shfletuesit tuaj.\n" +"Gjithësesi nëse krijoni Librashënues ato do të ruhen." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "" +msgstr "Më tepër" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" -msgstr "" +msgstr "Faqet kryesore" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "" +msgstr "Ju akoma nuk keni vizituar ndonjë faqe" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "Procesi i përpunimit është mbyllur për këtë tabelë." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "Diçka shkoi gabim gjatë shfaqjes së %1." #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" +"Sistemi ka pak kujtesë dhe nuk mund ta shfaqë këtë faqe. Provoni të mbyllni " +"tabelat e panevojshme dhe ringarkojeni." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "Mbylle tabelën" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" -msgstr "" +msgstr "Kjo faqe ka përmbajtje të pasigurtë" #: src/app/webbrowser/SecurityCertificatePopover.qml:70 msgid "Identity Not Verified" -msgstr "" +msgstr "Identiteti Nuk u Verifikua" #: src/app/webbrowser/SecurityCertificatePopover.qml:78 msgid "The identity of this website has not been verified." -msgstr "" +msgstr "Identiteti i kësaj faqeje të internetit nuk u verifikua." #: src/app/webbrowser/SecurityCertificatePopover.qml:89 msgid "Server certificate does not match the identity of the site." -msgstr "" +msgstr "Çertifikata e serverit nuk i përgjigjet identitetit të faqes." #: src/app/webbrowser/SecurityCertificatePopover.qml:91 msgid "Server certificate has expired." -msgstr "" +msgstr "Çertifikata e serverit ka skaduar." #: src/app/webbrowser/SecurityCertificatePopover.qml:93 msgid "Server certificate contains invalid dates." -msgstr "" +msgstr "Çertifikata e serverit përmban data të pavlefshme." #: src/app/webbrowser/SecurityCertificatePopover.qml:95 msgid "Server certificate is issued by an entity that is not trusted." msgstr "" +"Çertifikata e serverit është lëshuar nga një njësi që nuk është e besueshme." #: src/app/webbrowser/SecurityCertificatePopover.qml:97 msgid "Server certificate has been revoked." -msgstr "" +msgstr "Çertifikata e serverit është pezulluar." #: src/app/webbrowser/SecurityCertificatePopover.qml:99 msgid "Server certificate is invalid." -msgstr "" +msgstr "Çertifikata e serverit është e pavlefshme." #: src/app/webbrowser/SecurityCertificatePopover.qml:101 msgid "Server certificate is insecure." -msgstr "" +msgstr "Çertifikata e serverit është e pasigurtë." #: src/app/webbrowser/SecurityCertificatePopover.qml:103 msgid "Server certificate failed our security checks for an unknown reason." msgstr "" +"Çertifikata e serverit dështoi në kontrollin tonë të sigurisë për një arsye " +"të panjohur." #: src/app/webbrowser/SecurityCertificatePopover.qml:126 msgid "You are connected to" -msgstr "" +msgstr "Ju jeni lidhur me" #: src/app/webbrowser/SecurityCertificatePopover.qml:148 msgid "Which is run by" -msgstr "" +msgstr "Që drejtohet nga" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Parazgjedhje" #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" -msgstr "" +msgstr "Motori i kërkimit" #: src/app/webbrowser/SettingsPage.qml:100 msgid "Restore previous session at startup" -msgstr "" +msgstr "Rikthe seksionin e mëparshëm në nisje" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Privatësia dhe lejet" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" -msgstr "" +msgstr "Rikthe parametrat e shfletuesit" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera dhe mikrofoni" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" -msgstr "" +msgstr "Pastro Historinë e Shfletimit" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "Ta Pastroj Historinë e Shfletimit?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" -msgstr "" +msgstr "Pastro Kujtesën" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "Ta pastroj Kujtesën?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" -msgstr "" +msgstr "Pastro" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofoni" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" -msgstr "" +msgstr "Kliko për ta parë" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "Mbylle Tabelën" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Hiqe" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 #: src/app/webcontainer/webapp-container.qml:67 #, qt-format msgid "%1 - Ubuntu Web Browser" -msgstr "" +msgstr "%1 - Shfletues Interneti i Ubuntu" #: src/app/webbrowser/webbrowser-app.qml:37 #: src/app/webcontainer/webapp-container.qml:69 msgid "Ubuntu Web Browser" -msgstr "" +msgstr "Shfletues Interneti i Ubuntu" #: src/app/webcontainer/AccountChooserDialog.qml:62 msgid "" "No accounts have been linked to this webapp; press the item below to add an " "account." msgstr "" +"Nuk ka llogari të lidhura me këtë program të internetit; kliko në temën e " +"mëposhtme për të shtuar një llogari." #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" -msgstr "" +msgstr "Shto llogari" #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "Mos përdor një llogari" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "Gabim llogarie" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" -msgstr "" +msgstr "Mbylle" #: src/app/webcontainer/AccountsLogic.qml:63 msgid "" "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" +"Dritarja e llogarisë nuk mund të hapej. Ju mund të krijoni vetëm një llogari " +"në një kohë të caktuar; ju lutemi ta provoni përsëri pasi të keni mbyllur të " +"gjitha dritaret e llogarive të tjera." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 ka nevojë të hyjë në llogarinë tuaj në internet %2." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 ka nevojë të hyjë në llogarinë tuaj në internet %2." #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" "Choose an account now, or skip this step and choose an online account later." msgstr "" +"Zgjidhni një llogari tani, ose anashkalojeni këtë hap dhe zgjidhni një " +"llogari më vonë." #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "Mbylle programin" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" -msgstr "" +msgstr "Anashkaloje" #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "" +msgstr "Zgjidh llogarinë" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Oops, diçka nuk shkoi siç duhet." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" -msgstr "" +msgstr "Shfletuesi" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:2 msgid "Web Browser" -msgstr "" +msgstr "Shfletues Interneti" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:3 msgid "Browse the World Wide Web" -msgstr "" +msgstr "Shfleto Rrjetin Mbarë Botëror" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" -msgstr "" +msgstr "Internet;WWW;Browser;Web;Explorer" + +#~ msgid "Open tabs" +#~ msgstr "Hap tabelat" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Lejo hapjen e tabelave të reja në sfond" diff -Nru webbrowser-app-0.23+16.04.20151124/po/sr.po webbrowser-app-0.23+16.04.20160413/po/sr.po --- webbrowser-app-0.23+16.04.20151124/po/sr.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/sr.po 2016-04-13 15:22:01.000000000 +0000 @@ -2,26 +2,27 @@ # Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 # This file is distributed under the same license as the webbrowser-app package. # FIRST AUTHOR , 2013. -# +# Мирослав Николић , 2016. msgid "" msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" -"PO-Revision-Date: 2015-10-26 20:52+0000\n" -"Last-Translator: Данило Шеган \n" -"Language-Team: Serbian \n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" +"PO-Revision-Date: 2016-04-05 07:29+0000\n" +"Last-Translator: Мирослав Николић \n" +"Language-Team: Serbian \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" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" +"Language: sr\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" -msgstr "JavaScript обавештење" +msgstr "Обавештење скрипте Јаве" #: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47 #: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59 @@ -32,13 +33,13 @@ #: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25 msgid "Authentication required." -msgstr "Обавезна је аутентификација." +msgstr "Потребно је потврђивање идентитета." #. TRANSLATORS: %1 refers to the URL of the current website #: src/app/AuthenticationDialog.qml:26 #, qt-format msgid "The website %1 requires authentication." -msgstr "Веб страница на %1 захтева аутентификацију." +msgstr "Веб страница „%1“ захтева потврду идентитета." #: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39 msgid "Username" @@ -51,19 +52,22 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Откажи" #: src/app/BeforeUnloadDialog.qml:23 msgid "Confirm Navigation" -msgstr "Потврда навигације" +msgstr "Потврди навигацију" #: src/app/BeforeUnloadDialog.qml:26 msgid "Leave" @@ -84,8 +88,8 @@ "You are trying to securely reach %1, but the security certificate of this " "website is not trusted." msgstr "" -"Покушавате да безбедно дођете до %1, али сертификат ове веб странице није од " -"поверења." +"Покушавате безбедно да приступите „%1“, али безбедносно уверење ове веб " +"странице није поверљиво." #: src/app/CertificateVerificationDialog.qml:29 #: src/app/InvalidCertificateErrorSheet.qml:160 @@ -99,22 +103,7 @@ #: src/app/ConfirmDialog.qml:23 msgid "JavaScript Confirmation" -msgstr "ЈаваСкрипт потврда" - -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Изаберите програм да отворите овај тип датотеке или је додајте у фасциклу " -"Преузми." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Изаберите програм" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Преузми" +msgstr "Потврда скрипте Јаве" #: src/app/ErrorSheet.qml:36 msgid "Network Error" @@ -124,28 +113,23 @@ #: src/app/ErrorSheet.qml:42 #, qt-format msgid "It appears you are having trouble viewing: %1." -msgstr "Изгледа да имате проблема гледајући: %1." +msgstr "Изгледа да имате проблема са прегледањем: %1." #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" -"Молимо да проверите подешавање мреже и покушајте са освежавањем странице." +msgstr "Проверите подешавање мреже и покушајте да освежите страницу." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Освежи страницу" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Изаберите датотеку" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" -msgstr "Захтев за овлашћење" +msgstr "Захтев за дозволе" #: src/app/GeolocationPermissionRequest.qml:29 msgid "This page wants to know your device’s location." -msgstr "Ова страница жели да зна положај вашег уређаја." +msgstr "Ова страница жели да зна место вашег уређаја." #: src/app/GeolocationPermissionRequest.qml:33 msgid "Deny" @@ -157,7 +141,7 @@ #: src/app/InvalidCertificateErrorSheet.qml:55 msgid "This site security certificate is not trusted.\n" -msgstr "Потврда безбедности ове странице није од поверења.\n" +msgstr "Безбедносно уверење ове странице није од поверења.\n" #: src/app/InvalidCertificateErrorSheet.qml:63 msgid "Learn more" @@ -248,8 +232,8 @@ "You should not proceed, especially if you have never seen this warning " "before for this site." msgstr "" -"Не препоручује се да наставите, нарочито ако никад раније нисте видели ово " -"упозорење за ову страницу." +"Не препоручује вам се да наставите, нарочито ако никад раније нисте видели " +"ово упозорење за ову страницу." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:187 @@ -258,8 +242,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which does not match the identity of the site." msgstr "" -"Покушали сте да приступите %1 али је сервер понудио потврду безбедности која " -"се не поклапа са идентитетом странице." +"Покушали сте да приступите на „%1“ али је сервер приказао безбедносно " +"уверење које се не поклапа са идентитетом странице." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:190 @@ -268,8 +252,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which has expired." msgstr "" -"Покушали сте да приступите %1 али је сервер понудио потврду безбедности која " -"је истекла." +"Покушали сте да приступите на „%1“ али је сервер приказао безбедносно " +"уверење које је истекло." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:193 @@ -278,8 +262,8 @@ "You attempted to reach %1 but the server presented a security certificate " "which contains invalid dates." msgstr "" -"Покушали сте да приступите %1 али је сервер понудио потврду безбедности која " -"садржи неисправне датуме." +"Покушали сте да приступите „%1“ али је сервер приказао безбедносно уверење " +"које садржи неисправне датуме." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:196 @@ -288,8 +272,8 @@ "You attempted to reach %1 but the server presented a security certificate " "issued by an entity that is not trusted." msgstr "" -"Покушали сте да приступите %1 али је сервер понудио потврду безбедности која " -"је издата од стране организације која није од поверења." +"Покушали сте да приступите „%1“ али је сервер приказао безбедносно уверење " +"које је издато од стране организације која није од поверења." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:199 @@ -298,8 +282,8 @@ "You attempted to reach %1 but the server presented a security certificate " "that has been revoked." msgstr "" -"Покушали сте да приступите %1 али је сервер понудио потврду безбедности која " -"је повучена." +"Покушали сте да приступите „%1“ али је сервер приказао безбедносно уверење " +"које је повучено." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:202 @@ -308,8 +292,8 @@ "You attempted to reach %1 but the server presented an invalid security " "certificate." msgstr "" -"Покушали сте да приступите %1 али је сервер понудио неисправну потврду " -"безбедности." +"Покушали сте да приступите „%1“ али је сервер приказао неисправно " +"безбедносно уверење." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:205 @@ -318,8 +302,8 @@ "You attempted to reach %1 but the server presented an insecure security " "certificate." msgstr "" -"Покушали сте да приступите %1 али је сервер понудио небезбедну потврду " -"безбедности." +"Покушали сте да приступите „%1“ али је сервер приказао безбедносно уверење " +"које није безбедно." #. TRANSLATORS: %1 refers to the domain name of the SSL certificate #: src/app/InvalidCertificateErrorSheet.qml:208 @@ -329,23 +313,53 @@ "You attempted to reach %1 but the server presented a security certificate " "which failed our security checks for an unknown reason." msgstr "" -"Безбедносна потврда ове странице није од поверења\n" -"Покушали сте да приступите %1 али је сервер понудио потврду безбедности која " -"није прошла наше безбедносне провере из непознатих разлога." +"Безбедносно уверење ове странице није од поверења\n" +"Покушали сте да приступите „%1“ али је сервер приказао безбедносно уверење " +"које није прошло наше безбедносне провере из непознатих разлога." + +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Да дозволим овој веб страници да приступи вашој камери и микрофону?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Да дозволим овој веб страници да приступи вашој камери?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Да дозволим овој веб страници да приступи вашем микрофону?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (уметнут у %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Да" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Не" #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" -msgstr "Јаваскрипт питање" +msgstr "Питање скрипте Јаве" #: src/app/ProxyAuthenticationDialog.qml:22 msgid "Proxy authentication required." -msgstr "Посредник захтева аутентификацију." +msgstr "Посредник захтева потврду идентитета." #. TRANSLATORS: %1 refers to the proxy address, %2 refers to the proxy port #: src/app/ProxyAuthenticationDialog.qml:24 #, qt-format msgid "The website %1:%2 requires authentication." -msgstr "Веб страница %1:%2 захтева аутентификацију." +msgstr "Веб страница „%1:%2“ захтева потврду идентитета." #: src/app/actions/Back.qml:23 msgid "Back" @@ -355,7 +369,7 @@ #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Back.qml:26 msgid "Older Page" -msgstr "Старија страна" +msgstr "Старија страница" #: src/app/actions/Bookmark.qml:23 msgid "Bookmark" @@ -365,7 +379,7 @@ #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Bookmark.qml:26 msgid "Add This Page to Bookmarks" -msgstr "Додај ову страницу међу обележиваче" +msgstr "Додајте ову страницу међу обележиваче" #: src/app/actions/BookmarkLink.qml:22 msgid "Bookmark link" @@ -399,27 +413,27 @@ #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "Обришите" +msgstr "Обриши" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "Пронађи на страни" +msgstr "Пронађи на страници" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "Претражи страницу" +msgstr "Тражи на страници" #: src/app/actions/Forward.qml:23 msgid "Forward" -msgstr "вија" +msgstr "Напред" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Forward' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/Forward.qml:26 msgid "Newer Page" -msgstr "Новија страна" +msgstr "Новија страница" #: src/app/actions/GoTo.qml:23 msgid "Goto" @@ -429,10 +443,10 @@ #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/GoTo.qml:26 msgid "Address;URL;www" -msgstr "Адреса;УРЛ;веб" +msgstr "адреса;УРЛ;веб" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Нови лист" @@ -440,7 +454,7 @@ #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/NewTab.qml:26 msgid "Open a New Tab" -msgstr "Отвори нови лист" +msgstr "Отворите нови лист" #: src/app/actions/OpenImageInNewTab.qml:22 msgid "Open image in new tab" @@ -454,16 +468,20 @@ msgid "Open link in new tab" msgstr "Отвори везу у новом листу" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Отвори видео у новом листу" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "Налепи" +msgstr "Убаци" #: src/app/actions/Redo.qml:22 msgid "Redo" msgstr "Врати" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Учитај поново" @@ -481,12 +499,17 @@ msgid "Save link" msgstr "Сачувај везу" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Сачувај видео" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Означи све" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Подели" @@ -495,18 +518,18 @@ msgstr "Опозови" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "пронађи на страни" +msgstr "нађи на страници" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" -msgstr "тражи или унеси адресу" +msgstr "тражите или унесите адресу" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" @@ -523,8 +546,8 @@ msgstr "Сачувај у" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Сви обележивачи" @@ -535,95 +558,115 @@ #: src/app/webbrowser/BookmarkOptions.qml:115 msgid "Create new folder" -msgstr "Креирај нову фасциклу" +msgstr "Направи нову фасциклу" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Сачувај" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" -msgstr "Почетна страна" +msgstr "Матична страница" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Обележивачи" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Готово" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Нови лист" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" -msgstr "Историја" - -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Отворени листови" +msgstr "Историјат" -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Преузимања" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Напустите приватни режим" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Приватни режим" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Подешавања" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Превуците на горе да напустите пуни екран" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" -msgstr "Притисните ЕСЦ да напустите пуни екран" +msgstr "Притисните „ЕСЦ“ да напустите пуни екран" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Изаберите програм за отварање ове врсте датотеке или је додајте у фасциклу " +"преузимања." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Изаберите програм" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Преузми" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Преузимање није успело" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Настави" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Потврдите избор" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Обриши" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Нема доступних преузимања" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -631,8 +674,8 @@ msgstr[1] "%1 странице" msgstr[2] "%1 страница" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Сажетије" @@ -641,52 +684,26 @@ msgstr "Последње посећене" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Јуче" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "Комплетна историја" +msgstr "Сав историјат" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Данас" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "историја претраге" +msgstr "историјат претраге" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" -msgstr "Прелазак на јавни режим ће затворити све приватне листове" - -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "Дозволи овој веб страници приступ вашој камери и микрофону?" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "Дозволи овој веб страници приступ вашој камери?" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "Дозволи овој веб страници приступ вашем микрофону?" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "%1 (уметнут у %2)" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Да" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Не" +msgstr "Прелазак на јавни режим затвориће све приватне листове" #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" @@ -697,39 +714,40 @@ "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" -"Стране које посетите у овом листу неће се појавити у историји претраживача.\n" -"Међутим, обележивачи које креирате биће сачувани." +"Странице које посетите у овом листу неће се појавити у историјату " +"прегледника.\n" +"Међутим, обележивачи које направите биће сачувани." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" -msgstr "Више" +msgstr "Још" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Главне странице" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "Нисте посетили ни једну старницу до сада" +msgstr "До сада нисте посетили ни једну страницу" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "Процес рендеровања је затворен за овај лист." +msgstr "Процес исцртавања је затворен за овај лист." #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "Нешто је пошло лоше при приказивању %1." +msgstr "Нешто је пошло наопако приликом приказивања „%1“." #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." msgstr "" -"Систем је на минимуму меморије и не може приказати ову страницу. Покушајте " -"да затворите непотребне листове и освежите станицу." +"Систему недостаје меморије и не може приказати ову страницу. Покушајте да " +"затворите непотребне листове и освежите станицу." #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" @@ -737,49 +755,48 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" -msgstr "Ова страница има небезбедног садржаја" +msgstr "Ова страница има садржај који није безбедан" #: src/app/webbrowser/SecurityCertificatePopover.qml:70 msgid "Identity Not Verified" -msgstr "Идентитет није верификован" +msgstr "Идентитет није проверен" #: src/app/webbrowser/SecurityCertificatePopover.qml:78 msgid "The identity of this website has not been verified." -msgstr "Идентитет овог веб сајта није верификован." +msgstr "Идентитет овог веб сајта није проверен." #: src/app/webbrowser/SecurityCertificatePopover.qml:89 msgid "Server certificate does not match the identity of the site." -msgstr "Сертификат сервера се не поклапа са идентитетом странице." +msgstr "Уверење сервера се не поклапа са идентитетом странице." #: src/app/webbrowser/SecurityCertificatePopover.qml:91 msgid "Server certificate has expired." -msgstr "Сртификат сервера је истекао." +msgstr "Уверење сервера је истекло." #: src/app/webbrowser/SecurityCertificatePopover.qml:93 msgid "Server certificate contains invalid dates." -msgstr "Сертификат сервера садржи неисправне датуме." +msgstr "Уверење сервера садржи неисправне датуме." #: src/app/webbrowser/SecurityCertificatePopover.qml:95 msgid "Server certificate is issued by an entity that is not trusted." -msgstr "Сертификат сервера је издат од стране којој се не може веровати." +msgstr "Уверење сервера је издато од стране којој се не може веровати." #: src/app/webbrowser/SecurityCertificatePopover.qml:97 msgid "Server certificate has been revoked." -msgstr "Сертификат сервера је опозван." +msgstr "Уверење сервера је опозвано." #: src/app/webbrowser/SecurityCertificatePopover.qml:99 msgid "Server certificate is invalid." -msgstr "Сертификат сервера није валидан." +msgstr "Уверење сервера није исправно." #: src/app/webbrowser/SecurityCertificatePopover.qml:101 msgid "Server certificate is insecure." -msgstr "Сертификат сервера не несигуран." +msgstr "Уверење сервера није безбедно." #: src/app/webbrowser/SecurityCertificatePopover.qml:103 msgid "Server certificate failed our security checks for an unknown reason." msgstr "" -"Сертификат сервера је није прошао наше сигурносне провере из непознатог " -"разлога." +"Уверење сервера није прошао наше безбедносне провере из непознатог разлога." #: src/app/webbrowser/SecurityCertificatePopover.qml:126 msgid "You are connected to" @@ -787,72 +804,72 @@ #: src/app/webbrowser/SecurityCertificatePopover.qml:148 msgid "Which is run by" -msgstr "За који је задужен" +msgstr "Кога покреће" + +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Подразумевано" #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" -msgstr "Претраживач" +msgstr "Погон претраге" #: src/app/webbrowser/SettingsPage.qml:100 msgid "Restore previous session at startup" msgstr "Обнови претходну сесију при покретању" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Дозволи отварање нових листова у позадини" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "Приватност и дозволе" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" -msgstr "Враћање прегледача на почетна подешавања" +msgstr "Враћање подешавања прегледача" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "Камера и микрофон" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" -msgstr "Обриши историју претраге" +msgstr "Обриши историјат претраге" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "Обриши историју претраге?" +msgstr "Да обришем историјат претраге?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" -msgstr "Очисти кеш" +msgstr "Очисти оставу" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "Очисти кеш?" +msgstr "Да очистим оставу?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Очисти" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "Микрофон" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "Камера" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" -msgstr "Тапни да погледаш" +msgstr "Лупните за преглед" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Затворите лист" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "Уклони" @@ -861,19 +878,19 @@ #: src/app/webcontainer/webapp-container.qml:67 #, qt-format msgid "%1 - Ubuntu Web Browser" -msgstr "%1 — Убунту Прегледач веба" +msgstr "%1 — Убунтуов прегледник веба" #: src/app/webbrowser/webbrowser-app.qml:37 #: src/app/webcontainer/webapp-container.qml:69 msgid "Ubuntu Web Browser" -msgstr "Убунту Прегледач веба" +msgstr "Убунтуов прегледник веба" #: src/app/webcontainer/AccountChooserDialog.qml:62 msgid "" "No accounts have been linked to this webapp; press the item below to add an " "account." msgstr "" -"Ни један налог није повезан за ову веб апликацију; притисните ставку испод " +"Ни један налог није повезан са овом веб апликацијом; притисните ставку испод " "да додате налог." #: src/app/webcontainer/AccountChooserDialog.qml:78 @@ -882,7 +899,7 @@ #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "Немојте користити налог" +msgstr "Немој користити налог" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" @@ -897,15 +914,14 @@ "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." msgstr "" -"Прозор налога не може бити отворен. Можете креирати само један налог у исто " -"време; молимо да покушате поново када затворите све друге прозоре са " -"налозима." +"Прозор налога не може бити отворен. Можете направити само један налог " +"одједном; покушајте поново када затворите све друге прозоре са налозима." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "%1 мора да приступи вашем %2 налогу." +msgstr "%1 треба да приступи вашем %2 налогу." #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 @@ -917,7 +933,7 @@ msgid "" "Choose an account now, or skip this step and choose an online account later." msgstr "" -"Изаберите сада налог, или прескочите овај корак и изаберите налог касније." +"Сада изаберите налог, или прескочите овај корак и касније изаберите налог." #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" @@ -929,7 +945,7 @@ #: src/app/webcontainer/AccountsSplashScreen.qml:84 msgid "Choose account" -msgstr "Изаберите налог" +msgstr "Изабери налог" #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." @@ -937,11 +953,11 @@ #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" -msgstr "Прегледач" +msgstr "Прегледник" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:2 msgid "Web Browser" -msgstr "Прегледач веба" +msgstr "Прегледник веба" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:3 msgid "Browse the World Wide Web" @@ -949,7 +965,7 @@ #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:4 msgid "Internet;WWW;Browser;Web;Explorer" -msgstr "Интернет;WWW;Прегледач;Веб;Претраживач" +msgstr "интернет;прегледник;веб;претраживач;WWW" #~ msgid "" #~ "Ubuntu suggests you check your network settings and try refreshing the page." @@ -957,9 +973,15 @@ #~ "Убунту предлаже да проверите ваша подешавања за мрежу и да пробате да " #~ "освежите страницу." +#~ msgid "Please choose a file" +#~ msgstr "Изаберите датотеку" + #~ msgid "Share…" #~ msgstr "Подели..." +#~ msgid "Open tabs" +#~ msgstr "Отворени листови" + #~ msgid "see more" #~ msgstr "покажи више" @@ -983,3 +1005,6 @@ #~ msgid "Privacy" #~ msgstr "Приватност" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Дозволи отварање нових листова у позадини" diff -Nru webbrowser-app-0.23+16.04.20151124/po/sv.po webbrowser-app-0.23+16.04.20160413/po/sv.po --- webbrowser-app-0.23+16.04.20151124/po/sv.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/sv.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-08-05 08:32+0000\n" "Last-Translator: Josef Andersson \n" "Language-Team: Swedish\n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" "Language: sv\n" #: src/app/AlertDialog.qml:23 @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Avbryt" @@ -101,20 +104,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript-bekräftelse" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Välj ett program för att öppna filen eller lägg den i mappen för hämtningar." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Välj ett program" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Hämta" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Nätverksfel" @@ -128,15 +117,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Kontrollera dina nätverksinställningar och prova att uppdatera sidan." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Ladda om sidan" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Välj en fil" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Begär tillstånd" @@ -327,6 +313,36 @@ "Du försökte nå %1, men servern hade ett säkerhetscertifikat som av okänd " "anledning inte godkändes av vår säkerhetskontroll." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "Tillåt domänen att komma åt din kamera och mikrofon?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Tillåt domänen att komma åt din kamera?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Tillåt domänen att komma åt din mikrofon?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (inbäddad i %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Ja" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Nej" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript-prompt" @@ -395,7 +411,7 @@ msgid "Erase" msgstr "Radera" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Hitta på sida" @@ -425,8 +441,8 @@ msgid "Address;URL;www" msgstr "Adress;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Ny flik" @@ -448,6 +464,10 @@ msgid "Open link in new tab" msgstr "Öppna länk i ny flik" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Öppna video i ny flik" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Klistra in" @@ -457,7 +477,7 @@ msgstr "Gör om" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Läs om sidan" @@ -475,12 +495,17 @@ msgid "Save link" msgstr "Spara länk" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Spara video" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Markera alla" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Dela" @@ -489,16 +514,16 @@ msgstr "Ångra" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "hitta på sida" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "sök eller ange en adress" @@ -517,8 +542,8 @@ msgstr "Spara i" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Alla bokmärken" @@ -532,100 +557,119 @@ msgstr "Skapa ny mapp" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Spara" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Hemsida" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Bokmärken" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Klar" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Ny flik" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Historik" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Öppna flikar" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "Hämtningar" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Lämna privat läge" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Privat läge" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Inställningar" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Svep uppåt för att lämna helskärm" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Tryck Esc för att lämna helskärm" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Välj ett program för att öppna filen eller lägg den i mappen för hämtningar." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Välj ett program" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Hämta" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Hämtning misslyckades" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Återuppta" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Bekräfta val" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Ta bort" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "Inga hämtningar tillgängliga" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 sida" msgstr[1] "%1 sidor" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Färre" @@ -634,20 +678,20 @@ msgstr "Senast besökt" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Igår" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "All historik" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Idag" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "sökhistorik" @@ -655,32 +699,6 @@ msgid "Going to public mode will close all private tabs" msgstr "Att då till offentligt läge kommer stänga alla privata flikar" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Ja" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Nej" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Detta är en privat flik" @@ -694,16 +712,16 @@ "historik.\n" "Bokmärken som du skapar kommer dock bevaras." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Fler" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Favoritsidor" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Du har inte besökt någon webbsida än" @@ -784,8 +802,12 @@ msgid "Which is run by" msgstr "Som drivs av" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Förval" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Sökmotor" @@ -794,62 +816,58 @@ msgstr "Återställ tidigare session vid uppstart" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Tillåt att öppna nya flikar i bakgrunden" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Integritet & tillstånd" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Återställ webbläsarinställningarna" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Kamera & mikrofon" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Rensa webbläsarhistorik" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Rensa webbläsarhistorik?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Rensa cache" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Rensa cache?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Töm" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Mikrofon" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Kamera" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Tryck för att visa" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Stäng flik" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Ta bort" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -927,7 +945,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "Hoppsan, något gick snett!" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -951,6 +969,9 @@ #~ "Ubuntu föreslår att du kontrollerar dina nätverksinställningar och laddar om " #~ "sidan igen." +#~ msgid "Please choose a file" +#~ msgstr "Välj en fil" + #~ msgid "see more" #~ msgstr "se mer" @@ -969,6 +990,9 @@ #~ msgid "Share…" #~ msgstr "Dela…" +#~ msgid "Open tabs" +#~ msgstr "Öppna flikar" + #~ msgid "Add" #~ msgstr "Lägg till" @@ -977,3 +1001,6 @@ #~ msgid "Privacy" #~ msgstr "Sekretess" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Tillåt att öppna nya flikar i bakgrunden" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ta.po webbrowser-app-0.23+16.04.20160413/po/ta.po --- webbrowser-app-0.23+16.04.20151124/po/ta.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ta.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-01-18 17:47+0000\n" "Last-Translator: solomon sunder \n" "Language-Team: Tamil \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "ரத்துசெய்" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "ஜாவாஸ்கிரிப்ட்டை உறுதிப்படுத்து" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "பிணையத்தில் பிழை" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "பக்கத்தை மீளேற்று" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "அனுமதிக்கான கோரிக்கை" @@ -294,6 +280,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "ஜாவாஸ்கிரிப்ட் செயலிடம்" @@ -362,7 +378,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -392,8 +408,8 @@ msgid "Address;URL;www" msgstr "முகவரி;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "புதிய கீற்று" @@ -415,6 +431,10 @@ msgid "Open link in new tab" msgstr "தொணைப்பை புதிய கீற்றில் திற" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -424,7 +444,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "மீளேற்று" @@ -442,12 +462,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -456,16 +481,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -484,8 +509,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -499,100 +524,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "புத்தகக்குறிகள்" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -601,20 +644,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "நேற்று" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -622,32 +665,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -658,16 +675,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -743,8 +760,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -753,60 +774,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/te.po webbrowser-app-0.23+16.04.20160413/po/te.po --- webbrowser-app-0.23+16.04.20151124/po/te.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/te.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2014-07-19 09:49+0000\n" "Last-Translator: Praveen Illa \n" "Language-Team: Telugu \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "రద్దుచేయి" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/th.po webbrowser-app-0.23+16.04.20160413/po/th.po --- webbrowser-app-0.23+16.04.20151124/po/th.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/th.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-08-14 15:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Thai \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/tr.po webbrowser-app-0.23+16.04.20160413/po/tr.po --- webbrowser-app-0.23+16.04.20151124/po/tr.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/tr.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-03-22 15:37+0000\n" "Last-Translator: Arda Ünlü \n" "Language-Team: Turkish \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "İptal" @@ -100,20 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript Doğrulaması" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Bu dosyayı açmak için bir uygulama seçin ya da indirilenler dizinine ekleyin." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Bir uygulama seçin" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "İndir" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Ağ Hatası" @@ -132,10 +121,6 @@ msgid "Refresh page" msgstr "Sayfayı yenile" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Lütfen bir dosya seçin" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "İzin İsteği" @@ -330,6 +315,36 @@ "%1 adresine ulaşmaya çalıştınız fakat sunucu güvenlik kontrolümüzü " "bilinmeyen bir sebepten ötürü geçemeyen bir güvenlik sertifikası sunuyor." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Evet" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Hayır" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript İstemi" @@ -398,7 +413,7 @@ msgid "Erase" msgstr "Sil" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Sayfa içinde bul" @@ -428,8 +443,8 @@ msgid "Address;URL;www" msgstr "Adres;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Yeni Sekme" @@ -451,6 +466,10 @@ msgid "Open link in new tab" msgstr "Bağlantıyı yeni sekmede aç" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Yapıştır" @@ -460,7 +479,7 @@ msgstr "Yinele" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Yeniden yükle" @@ -478,12 +497,17 @@ msgid "Save link" msgstr "Bağlantıyı kaydet" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Tümünü seç" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Paylaş" @@ -492,16 +516,16 @@ msgstr "Geri al" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "sayfa içinde bul" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "Arayın ya da Adres Girin" @@ -520,8 +544,8 @@ msgstr "Kaydetme konumu" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Bütün Yer İmleri" @@ -535,100 +559,119 @@ msgstr "Yeni Klasör Oluştur" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Kaydet" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Anasayfa" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Yer İmleri" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Tamamlandı" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Yeni sekme" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Geçmiş" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Açık Sekmeler" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "İndirilenler" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Gizli Moddan Çık" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Gizli Mod" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Ayarlar" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Tam Ekrandan Çıkmak İçin Yukarı Sürükleyin" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Tam Ekrandan Çıkmak İçin ESC tuşuna Basınız" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Bu dosyayı açmak için bir uygulama seçin ya da indirilenler dizinine ekleyin." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Bir uygulama seçin" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "İndir" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Seçimi doğrula" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Sil" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "İndirilebilir içerik yok" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 sayfa" msgstr[1] "%1 sayfa" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Daha Az" @@ -637,20 +680,20 @@ msgstr "En Son Ziyaret Edilenler" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Dün" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Tüm Geçmiş" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Bugün" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "arama geçmişi" @@ -659,32 +702,6 @@ msgstr "" "Normal moda dönmek, gizli moddaki bütün açık pencereleri kapatacaktır." -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Evet" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Hayır" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Bu bir gizli sekmedir." @@ -697,16 +714,16 @@ "Bu sekmede görüntülenen sayfalar gezinme geçmişine kaydolmayacaktır.\n" "Oluşturuduğunuz yer imleri korunacaktır." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Daha Fazla" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "En çok tıklananlar" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Henüz hiçbir siteyi ziyaret etmediniz." @@ -785,8 +802,12 @@ msgid "Which is run by" msgstr "Çalıştıran:" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Arama motoru" @@ -795,60 +816,56 @@ msgstr "Başlagıçta bir önceki oturumu geri yükle" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Arkaplanda yeni sekmeler açılmasına izin ver" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Tarayıcı ayarlarını sıfırlayın" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Tarama Geçmişini Temizle" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Geçmiş Tarama Temizleme?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Önbelleği Temizle" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Önbellek Temizleme?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Temizle" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Görüntülemek için dokunun" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Sekmeyi Kapat" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" @@ -964,12 +981,18 @@ #~ msgid "see less" #~ msgstr "daha az göster" +#~ msgid "Please choose a file" +#~ msgstr "Lütfen bir dosya seçin" + #~ msgid "Skip account creation step" #~ msgstr "Hesap oluşturma adımını atla" #~ msgid "No local account found for " #~ msgstr "Şunun için yerel hesap bulunamadı: " +#~ msgid "Open tabs" +#~ msgstr "Açık Sekmeler" + #~ msgid "Add" #~ msgstr "Ekle" @@ -978,3 +1001,6 @@ #~ msgid "Privacy" #~ msgstr "Gizlilik" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Arkaplanda yeni sekmeler açılmasına izin ver" diff -Nru webbrowser-app-0.23+16.04.20151124/po/ug.po webbrowser-app-0.23+16.04.20160413/po/ug.po --- webbrowser-app-0.23+16.04.20151124/po/ug.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/ug.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-10-21 13:32+0000\n" "Last-Translator: Eltikin \n" "Language-Team: Uyghur Computer Science Association \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "ئەمەلدىن قالدۇر" @@ -100,19 +103,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript نى جەزملە" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "چۈشۈر" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "تور خاتالىقى" @@ -131,10 +121,6 @@ msgid "Refresh page" msgstr "بەتنى يېڭىلا" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "بىر ھۆججەت تاللاڭ" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "ئىمتىياز ئىلتىماسى" @@ -329,6 +315,36 @@ "سىز %1 گە كەلدىڭىز. بىراق مۇلازىمېتىر بىخەتەرلىك گۇۋاھنامىسىنى تەكشۈرۈش " "نامەلۇم خاتالىق سەۋەبىدىن مەغلۇپ بولدى دەۋاتىدۇ." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "ھەئە" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "ياق" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript كۆرسەتمىسى" @@ -397,7 +413,7 @@ msgid "Erase" msgstr "ئۆچۈر" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -427,8 +443,8 @@ msgid "Address;URL;www" msgstr "ئادرېس;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "يېڭى بەتكۈچ" @@ -450,6 +466,10 @@ msgid "Open link in new tab" msgstr "ئۇلانمىنى يېڭى بەتكۈچتە ئاچ" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "چاپلا" @@ -459,7 +479,7 @@ msgstr "قايتىلا" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "قايتا يۈكلە" @@ -477,12 +497,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "ھەممىنى تاللا" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "ھەمبەھىر" @@ -491,16 +516,16 @@ msgstr "يېنىۋال" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "ئىزدەڭ ياكى بىر ئادرېسنى كىرگۈزۈڭ" @@ -519,8 +544,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "بارلىق خەتكۈچلەر" @@ -534,99 +559,117 @@ msgstr "يېڭى قىسقۇچ قۇر" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "ساقلا" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "باش بەت" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "خەتكۈچلەر" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "تامام" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "يېڭى بەتكۈچ" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "ئىز" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "بەتكۈچلەرنى ئاچ" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "چۈشۈرۈلمىلەر" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "شەخسى مودېل" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "تەڭشەكلەر" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Up بېسىپ تۇلۇق ئىكىران قىلىش" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "ESC بېسىپ تۇلۇق ئىكىراندىن چېكىنىش" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "چۈشۈر" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "مۇقۇمداش" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "ئۆچۈر" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "ئىشلىتشكە بۇلىدىغان چۈشۈرۈلمىلەر يوق" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "%1 بەت" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "كىچىك" @@ -635,20 +678,20 @@ msgstr "ئەڭ ئاخىرقى قېتىم زىيارەت قىلغىنى" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "تۈنۈگۈن" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "تارىخ خاتىرىسى" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "بۈگۈن" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "ئىزدەش تاىخى" @@ -656,32 +699,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "ھەئە" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "ياق" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "بۇ بىر شەخسى خەتكۈچ" @@ -692,16 +709,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "تېخىمۇ كۆپ" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "داڭلىق تورتۇرالار" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -780,8 +797,12 @@ msgid "Which is run by" msgstr "بۇنى باشقۇرغۇچى" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "ئىزدەش ماتورى" @@ -790,60 +811,56 @@ msgstr "قوزغالغاندا ئالدىنقى قېتىملىق ئەڭگىمە ئەسلىگە كەلتۈرۈلسۇن" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "ئارقىدا يېڭى بەتكۈچ ئېچىشقا ئىجازەت" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "توركۆرگۈ تەڭشەكلىرىنى ئەسلىگە قايتۇر" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "كۆرۈش تارىخىنى تازىلا" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "غەملەكنى تازىلا" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "تازىلا" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "چەكسىڭىز كۆرەلەيسىز" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "بەتكۈچ ياپ" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "ئۆچۈر" @@ -942,6 +959,9 @@ #~ "ئۇبۇنتۇ سىستېمىسى تور تەڭشىكىڭىزنى تەكشۈرۈپ بەتنى يېڭىلاپ بېقىشىڭىزنى " #~ "تەۋسىيە قىلىدۇ." +#~ msgid "Please choose a file" +#~ msgstr "بىر ھۆججەت تاللاڭ" + #~ msgid "No local account found for " #~ msgstr "يەرلىك ھېسابات تېپىلمىدى " @@ -960,6 +980,9 @@ #~ msgid "Add" #~ msgstr "قوش" +#~ msgid "Open tabs" +#~ msgstr "بەتكۈچلەرنى ئاچ" + #~ msgid "Delete all history?" #~ msgstr "بارلىق ئىزنى ئۆچۈرسۇنمۇ؟" @@ -968,3 +991,6 @@ #~ msgid "Privacy" #~ msgstr "شەخسىيەت" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "ئارقىدا يېڭى بەتكۈچ ئېچىشقا ئىجازەت" diff -Nru webbrowser-app-0.23+16.04.20151124/po/uk.po webbrowser-app-0.23+16.04.20160413/po/uk.po --- webbrowser-app-0.23+16.04.20151124/po/uk.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/uk.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-07-03 18:15+0000\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -16,8 +16,8 @@ "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" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -51,13 +51,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "Скасувати" @@ -101,21 +104,6 @@ msgid "JavaScript Confirmation" msgstr "Підтвердження дій JavaScript" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" -"Виберіть програму для відкриття цього файла або додайте його до теки " -"отриманих файлів." - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "Виберіть проґраму" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "Отримати" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Помилка мережі" @@ -129,15 +117,13 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." msgstr "" +"Перевірте, чи правильно налаштовано мережу, і спробуйте перезавантажити " +"сторінку." #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "Перезавантажити" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "Будь ласка, виберіть файл" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "Запит щодо прав доступу" @@ -332,6 +318,37 @@ "Ви намагалися відкрити %1, але сайтом було надано сертифікат захисту, який " "не вдалося перевірити на надійність з невідомих причин." +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" +"Дозволити цьому домену доступ до відеокамери і мікрофона цього комп’ютера?" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "Дозволити цьому домену доступ до відеокамери комп’ютера?" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "Дозволити цьому домену доступ до мікрофона комп’ютера?" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (вбудовано до %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "Так" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "Ні" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "Запит JavaScript" @@ -400,7 +417,7 @@ msgid "Erase" msgstr "Витерти" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "Знайти на сторінці" @@ -430,8 +447,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www;адрес;інтернет" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Нова вкладка" @@ -453,6 +470,10 @@ msgid "Open link in new tab" msgstr "Відкрити посилання у новій вкладці" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "Відкрити відео у новій вкладці" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "Вставити" @@ -462,7 +483,7 @@ msgstr "Повторити" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Перезавантажити" @@ -480,12 +501,17 @@ msgid "Save link" msgstr "Зберегти посилання" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "Зберегти відео" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "Позначити все" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "Поділитися" @@ -494,16 +520,16 @@ msgstr "Скасувати" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1 з %2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "знайти на сторінці" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "пошук або введення адреси" @@ -522,8 +548,8 @@ msgstr "Зберегти до" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "Усі закладки" @@ -537,92 +563,112 @@ msgstr "Створити нову теку" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "Зберегти" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "Домашня сторінка" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "Закладки" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "Завершено" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "Нова вкладка" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "Журнал" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "Відкриті вкладки" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "Отримані" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "Вийти з конфіденційного режиму" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "Конфіденційний режим" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "Параметри" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "Проведіть пальцем вгору, щоб вийти з повноекранного режиму" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "Натисніть клавішу Esc, щоб вийти з повноекранного режиму" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" +"Виберіть програму для відкриття цього файла або додайте його до теки " +"отриманих файлів." + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "Виберіть проґраму" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "Отримати" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "Не вдалося завантажити" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "Поновити" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "Підтвердьте вибір" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "Вилучити" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "Немає доступних завантажень" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" @@ -630,8 +676,8 @@ msgstr[1] "%1 сторінки" msgstr[2] "%1 сторінок" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "Менше" @@ -640,20 +686,20 @@ msgstr "Останні відвідані" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "Вчора" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "Весь журнал" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "Сьогодні" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "пошук у журналі" @@ -662,32 +708,6 @@ msgstr "" "Перехід до відкритого режиму призведе до закриття усіх конфіденційних вкладок" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "Так" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "Ні" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "Це конфіденційна вкладка" @@ -701,16 +721,16 @@ "перегляду.\n" "Втім, закладки, які ви створите за її допомогою, буде збережено." -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "Більше" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "Найпопулярніші сайти" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "Ви ще не відвідали жодного сайта" @@ -789,8 +809,12 @@ msgid "Which is run by" msgstr "Що працює під керуванням" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "Типовий" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "Рушій пошуку" @@ -799,62 +823,58 @@ msgstr "Відновлювати попередній сеанс під час запуску" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "Дозволити відкриття нових вкладок у тлі" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "Конфіденційність і права доступу" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "Скинути налаштування веб-переглядача" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "Відеокамера і мікрофон" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "Спорожнити журнал перегляду" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "Очистити історію перегляду сайтів?" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "Спорожнити кеш" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "Очистити кеш?" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "Спорожнити" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "Мікрофон" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "Відеокамера" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "Натисніть, щоб переглянути" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "Закрити вкладку" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "Вилучити" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -936,7 +956,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "На жаль, сталася помилка." #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -961,6 +981,9 @@ #~ "Ubuntu пропонує перевірити параметри мережі та спробувати повторно " #~ "завантажити сторінку." +#~ msgid "Please choose a file" +#~ msgstr "Будь ласка, виберіть файл" + #~ msgid "Select an account" #~ msgstr "Вибір облікового запису" @@ -979,6 +1002,9 @@ #~ msgid "see less" #~ msgstr "менше" +#~ msgid "Open tabs" +#~ msgstr "Відкриті вкладки" + #~ msgid "Add" #~ msgstr "Додати" @@ -987,3 +1013,6 @@ #~ msgid "Privacy" #~ msgstr "Конфіденційність" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "Дозволити відкриття нових вкладок у тлі" diff -Nru webbrowser-app-0.23+16.04.20151124/po/uz.po webbrowser-app-0.23+16.04.20160413/po/uz.po --- webbrowser-app-0.23+16.04.20151124/po/uz.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/uz.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-05-17 16:24+0000\n" "Last-Translator: Akmal Xushvaqov \n" "Language-Team: Uzbek \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Тармоқ хатоси" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Янги ички ойна" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Қайта юклаш" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/vi.po webbrowser-app-0.23+16.04.20160413/po/vi.po --- webbrowser-app-0.23+16.04.20151124/po/vi.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/vi.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-05-18 09:32+0000\n" "Last-Translator: Vu Do Quynh \n" "Language-Team: Vietnamese \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "Lỗi mạng" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "Nạp lại trang" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "Địa chỉ;URL;www" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "Thẻ Mới" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "Tải lại" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/webbrowser-app.pot webbrowser-app-0.23+16.04.20160413/po/webbrowser-app.pot --- webbrowser-app-0.23+16.04.20151124/po/webbrowser-app.pot 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/webbrowser-app.pot 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Canonical Ltd. -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the webbrowser-app package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,16 +48,18 @@ msgstr "" #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 -#: src/app/ContentDownloadDialog.qml:110 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:114 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:382 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:297 +#: src/app/webbrowser/SettingsPage.qml:351 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "" @@ -99,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "" @@ -130,10 +119,6 @@ msgid "Refresh page" msgstr "" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "" @@ -293,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/MediaAccessDialog.qml:38 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/MediaAccessDialog.qml:39 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/MediaAccessDialog.qml:40 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/MediaAccessDialog.qml:48 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/MediaAccessDialog.qml:72 +msgid "Yes" +msgstr "" + +#: src/app/MediaAccessDialog.qml:83 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "" @@ -361,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:426 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:541 msgid "Find in page" msgstr "" @@ -391,8 +406,8 @@ msgid "Address;URL;www" msgstr "" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:692 -#: src/app/webbrowser/TabsBar.qml:85 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:424 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "" @@ -414,6 +429,10 @@ msgid "Open link in new tab" msgstr "" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -423,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:90 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "" @@ -441,13 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:83 -#: src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:86 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:407 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:390 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:521 msgid "Share" msgstr "" @@ -456,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:204 +#: src/app/webbrowser/AddressBar.qml:208 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:240 +#: src/app/webbrowser/AddressBar.qml:244 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:241 +#: src/app/webbrowser/AddressBar.qml:245 msgid "search or enter an address" msgstr "" @@ -484,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -499,101 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:361 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:96 +#: src/app/webbrowser/SettingsPage.qml:325 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:397 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:529 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:678 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:410 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:501 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:419 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:148 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:515 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:403 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:535 +#: src/app/webbrowser/HistoryViewWide.qml:366 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:409 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:548 src/app/webbrowser/DownloadsPage.qml:58 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:436 +#: src/app/webbrowser/Browser.qml:555 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:436 +#: src/app/webbrowser/Browser.qml:555 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:454 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:573 src/app/webbrowser/SettingsPage.qml:49 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:786 +#: src/app/webbrowser/Browser.qml:745 src/app/webbrowser/Browser.qml:783 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1258 +#: src/app/webbrowser/Browser.qml:1364 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1259 +#: src/app/webbrowser/Browser.qml:1365 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:83 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:89 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:102 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:62 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:99 -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:102 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:426 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:264 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -602,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:175 msgid "Yesterday" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:159 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 +#: src/app/webbrowser/HistoryViewWide.qml:173 #: src/app/webbrowser/HistoryViewWide.qml:282 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:447 msgid "search history" msgstr "" @@ -623,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -659,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -744,30 +758,30 @@ msgid "Which is run by" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 -msgid "Search engine" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:100 -msgid "Restore previous session at startup" +#: src/app/webbrowser/SettingsPage.qml:82 +#: src/app/webbrowser/SettingsPage.qml:167 +msgid "Search engine" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" +#: src/app/webbrowser/SettingsPage.qml:107 +msgid "Restore previous session at startup" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:126 +#: src/app/webbrowser/SettingsPage.qml:224 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:136 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:246 +#: src/app/webbrowser/SettingsPage.qml:389 msgid "Camera & microphone" msgstr "" @@ -775,51 +789,51 @@ msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:258 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:266 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:269 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:304 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:410 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:431 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:96 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 -#: src/app/webcontainer/webapp-container.qml:67 +#: src/app/webcontainer/webapp-container.qml:68 #, qt-format msgid "%1 - Ubuntu Web Browser" msgstr "" #: src/app/webbrowser/webbrowser-app.qml:37 -#: src/app/webcontainer/webapp-container.qml:69 +#: src/app/webcontainer/webapp-container.qml:70 msgid "Ubuntu Web Browser" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/zh_CN.po webbrowser-app-0.23+16.04.20160413/po/zh_CN.po --- webbrowser-app-0.23+16.04.20151124/po/zh_CN.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/zh_CN.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-07-23 03:56+0000\n" "Last-Translator: Ian Li \n" "Language-Team: Chinese (Simplified) \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:41+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "取消" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript 确认" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "网络错误" @@ -123,16 +113,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "请检查你的网络设置，并试着刷新本页面。" #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "刷新页面" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "请选择文件" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "权限请求" @@ -310,6 +296,36 @@ "此网站的安全证书不被信任 \n" "您尝试访问 %1 ，但服务器出示了因未知原因无法通过我们安全检查的证书。" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "是否允许这个网域使用本机的相机和麦克风？" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "是否允许这个网域使用本机的相机？" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "是否允许这个网域使用本机的麦克风？" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (嵌入在 %2 中)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "是" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "否" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript 提示" @@ -372,21 +388,21 @@ #: src/app/actions/Cut.qml:22 msgid "Cut" -msgstr "" +msgstr "剪切" #: src/app/actions/Erase.qml:22 msgid "Erase" -msgstr "" +msgstr "清除" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "在页面中查找" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "在页面中搜索" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -408,8 +424,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www;地址" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "新标签" @@ -431,16 +447,20 @@ msgid "Open link in new tab" msgstr "在新标签打开链接" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "在新标签页打开视频" + #: src/app/actions/Paste.qml:22 msgid "Paste" -msgstr "" +msgstr "粘贴" #: src/app/actions/Redo.qml:22 msgid "Redo" -msgstr "" +msgstr "重做" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "重新加载" @@ -456,32 +476,37 @@ #: src/app/actions/SaveLink.qml:22 msgid "Save link" -msgstr "" +msgstr "保存链接" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "保存视频" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "全选" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "分享" #: src/app/actions/Undo.qml:22 msgid "Undo" -msgstr "" +msgstr "撤消" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" -msgstr "" +msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "在页面中查找" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "搜索或输入一个地址" @@ -500,8 +525,8 @@ msgstr "保存在" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "全部书签" @@ -515,99 +540,117 @@ msgstr "创建新文件夹" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "保存" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "主页" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "书签" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "完成" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "新建标签" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "历史" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "打开的标签" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" -msgstr "" +msgstr "下载" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "退出匿名模式" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "匿名模式" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "设置" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "上划以退出全屏" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "按ESC退出全屏" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "选择一个应用来打开这个文件或者将它添加到下载文件夹中。" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "选择一个应用程序" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "下载" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "下载失败" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "继续" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "确定选择" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "删除" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "没有可用的下载" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "第 %1 页" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "收起" @@ -616,53 +659,27 @@ msgstr "最近访问" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "昨天" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" -msgstr "" +msgstr "全部历史" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" -msgstr "" +msgstr "今天" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "搜索历史" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" msgstr "使用公开模式将关闭所有匿名标签" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "是" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "否" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "这是一个匿名标签" @@ -675,38 +692,38 @@ "您在本标签内访问的页面将不会出现在浏览器历史中。\n" "但在这里创建的书签将会被保留。" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "更多" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "热门网站" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "您尚未访问任何站点" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "该标签的渲染过程已被关闭。" #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "在显示 %1 时发生错误。" #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." -msgstr "" +msgstr "系统内存不足不能显示网页。尝试关闭不需要的标签页并重新载入。" #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" -msgstr "" +msgstr "关闭标签页" #: src/app/webbrowser/SecurityCertificatePopover.qml:69 msgid "This site has insecure content" @@ -760,8 +777,12 @@ msgid "Which is run by" msgstr "运营方：" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "默认" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "搜索引擎" @@ -770,62 +791,58 @@ msgstr "在启动时恢复上次会话" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "允许在后台打开新标签页" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "隐私与许可" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "重置浏览器设置" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "相机与麦克风" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "清除浏览历史" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "清除浏览历史？" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "清除缓存" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "清除缓存？" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "清除" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "麦克风" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "相机" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "点击查看" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" -msgstr "" +msgstr "关闭标签页" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "移除" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -898,7 +915,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "糟糕，出了点问题。" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -920,6 +937,9 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "Ubuntu 建议您检查下网络设置并尝试刷新该页面。" +#~ msgid "Please choose a file" +#~ msgstr "请选择文件" + #~ msgid "Select an account" #~ msgstr "选择一个帐户" @@ -935,5 +955,11 @@ #~ msgid "Delete all history?" #~ msgstr "删除所有历史？" +#~ msgid "Allow opening new tabs in background" +#~ msgstr "允许在后台打开新标签页" + #~ msgid "Privacy" #~ msgstr "隐私设置" + +#~ msgid "Open tabs" +#~ msgstr "打开的标签" diff -Nru webbrowser-app-0.23+16.04.20151124/po/zh_HK.po webbrowser-app-0.23+16.04.20160413/po/zh_HK.po --- webbrowser-app-0.23+16.04.20151124/po/zh_HK.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/zh_HK.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2013-10-20 04:44+0000\n" "Last-Translator: Walter Cheuk \n" "Language-Team: Chinese (Hong Kong) \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:40+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "取消" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript 確認" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "網絡錯誤" @@ -129,10 +119,6 @@ msgid "Refresh page" msgstr "刷新頁面" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "請求權限" @@ -292,6 +278,36 @@ "which failed our security checks for an unknown reason." msgstr "" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript 提示" @@ -360,7 +376,7 @@ msgid "Erase" msgstr "" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" msgstr "" @@ -390,8 +406,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www;網址;網路" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "新分頁" @@ -413,6 +429,10 @@ msgid "Open link in new tab" msgstr "在新分頁開啟連結" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "" @@ -422,7 +442,7 @@ msgstr "" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "重新載入" @@ -440,12 +460,17 @@ msgid "Save link" msgstr "" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "" @@ -454,16 +479,16 @@ msgstr "" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" msgstr "" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "" @@ -482,8 +507,8 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "" @@ -497,100 +522,118 @@ msgstr "" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "書籤" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" msgstr "" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" msgstr "" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "" msgstr[1] "" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "" @@ -599,20 +642,20 @@ msgstr "" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "昨天" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" msgstr "" @@ -620,32 +663,6 @@ msgid "Going to public mode will close all private tabs" msgstr "" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "" @@ -656,16 +673,16 @@ "Bookmarks you create will be preserved, however." msgstr "" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" msgstr "" @@ -741,8 +758,12 @@ msgid "Which is run by" msgstr "" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "" @@ -751,60 +772,56 @@ msgstr "" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" msgstr "" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" msgstr "" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" msgstr "" diff -Nru webbrowser-app-0.23+16.04.20151124/po/zh_TW.po webbrowser-app-0.23+16.04.20160413/po/zh_TW.po --- webbrowser-app-0.23+16.04.20151124/po/zh_TW.po 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/po/zh_TW.po 2016-04-13 15:22:01.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-10-23 15:10+0200\n" +"POT-Creation-Date: 2016-04-12 19:16+0200\n" "PO-Revision-Date: 2015-03-01 11:27+0000\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (Traditional) \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2015-11-19 05:31+0000\n" -"X-Generator: Launchpad (build 17850)\n" +"X-Launchpad-Export-Date: 2016-04-13 05:41+0000\n" +"X-Generator: Launchpad (build 17990)\n" #: src/app/AlertDialog.qml:23 msgid "JavaScript Alert" @@ -50,13 +50,16 @@ #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38 #: src/app/webbrowser/BookmarkOptions.qml:143 +#: src/app/webbrowser/ContentDownloadDialog.qml:113 #: src/app/webbrowser/ContextMenuMobile.qml:139 -#: src/app/webbrowser/HistoryView.qml:159 -#: src/app/webbrowser/HistoryViewWide.qml:384 +#: src/app/webbrowser/DownloadDelegate.qml:187 +#: src/app/webbrowser/HistoryView.qml:175 +#: src/app/webbrowser/HistoryViewWide.qml:397 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32 -#: src/app/webbrowser/SettingsPage.qml:294 -#: src/app/webbrowser/SettingsPage.qml:348 +#: src/app/webbrowser/SettingsPage.qml:275 +#: src/app/webbrowser/SettingsPage.qml:329 #: src/app/webcontainer/AccountChooserDialog.qml:96 +#: src/app/webcontainer/ContextMenuMobile.qml:141 msgid "Cancel" msgstr "取消" @@ -98,19 +101,6 @@ msgid "JavaScript Confirmation" msgstr "JavaScript 確認" -#: src/app/ContentDownloadDialog.qml:79 -msgid "" -"Choose an application to open this file or add it to the downloads folder." -msgstr "" - -#: src/app/ContentDownloadDialog.qml:84 -msgid "Choose an application" -msgstr "選擇一個程式" - -#: src/app/ContentDownloadDialog.qml:97 -msgid "Download" -msgstr "下載" - #: src/app/ErrorSheet.qml:36 msgid "Network Error" msgstr "網路錯誤" @@ -123,16 +113,12 @@ #: src/app/ErrorSheet.qml:48 msgid "Please check your network settings and try refreshing the page." -msgstr "" +msgstr "請檢查網路設定，然後重刷頁面。" #: src/app/ErrorSheet.qml:53 msgid "Refresh page" msgstr "重新整理頁面" -#: src/app/FilePickerDialog.qml:28 -msgid "Please choose a file" -msgstr "請選取檔案" - #: src/app/GeolocationPermissionRequest.qml:28 msgid "Permission Request" msgstr "請求許可" @@ -310,6 +296,36 @@ "此網站的安全憑證不獲信任。\n" "您想去 %1，但伺服器展示的安全憑證由於不明原因未能通過安全檢查。" +#: src/app/MediaAccessDialog.qml:31 +msgid "Permission" +msgstr "" + +#: src/app/webbrowser/MediaAccessDialog.qml:28 +msgid "Allow this domain to access your camera and microphone?" +msgstr "是否允許此網域存取您的攝影機及麥克風？" + +#: src/app/webbrowser/MediaAccessDialog.qml:29 +msgid "Allow this domain to access your camera?" +msgstr "是否允許此網域存取您的攝影機？" + +#: src/app/webbrowser/MediaAccessDialog.qml:30 +msgid "Allow this domain to access your microphone?" +msgstr "是否允許此網域存取您的麥克風？" + +#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it +#: src/app/webbrowser/MediaAccessDialog.qml:39 +#, qt-format +msgid "%1 (embedded in %2)" +msgstr "%1 (內嵌於 %2)" + +#: src/app/webbrowser/MediaAccessDialog.qml:48 +msgid "Yes" +msgstr "是" + +#: src/app/webbrowser/MediaAccessDialog.qml:60 +msgid "No" +msgstr "否" + #: src/app/PromptDialog.qml:23 msgid "JavaScript Prompt" msgstr "JavaScript 提示" @@ -378,15 +394,15 @@ msgid "Erase" msgstr "擦除" -#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:430 +#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:552 msgid "Find in page" -msgstr "" +msgstr "在頁面尋找" #. TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action. #. Keywords may actually be sentences, and must be separated by semi-colons. #: src/app/actions/FindInPage.qml:26 msgid "Search in Page" -msgstr "" +msgstr "在頁面搜尋" #: src/app/actions/Forward.qml:23 msgid "Forward" @@ -408,8 +424,8 @@ msgid "Address;URL;www" msgstr "Address;URL;www;網址;網路;位址" -#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:693 -#: src/app/webbrowser/TabsBar.qml:86 +#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:435 +#: src/app/webbrowser/TabsBar.qml:91 msgid "New Tab" msgstr "新分頁" @@ -431,6 +447,10 @@ msgid "Open link in new tab" msgstr "在新分頁開啟連結" +#: src/app/actions/OpenVideoInNewTab.qml:22 +msgid "Open video in new tab" +msgstr "在新分頁開啟影片" + #: src/app/actions/Paste.qml:22 msgid "Paste" msgstr "貼上" @@ -440,7 +460,7 @@ msgstr "重做" #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86 -#: src/app/webbrowser/TabsBar.qml:91 src/app/webcontainer/SadPage.qml:51 +#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51 msgid "Reload" msgstr "重新載入" @@ -458,12 +478,17 @@ msgid "Save link" msgstr "儲存連結" -#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:173 -#: src/app/webbrowser/HistoryViewWide.qml:409 +#: src/app/actions/SaveVideo.qml:22 +msgid "Save video" +msgstr "儲存影片" + +#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:85 +#: src/app/webbrowser/HistoryView.qml:190 +#: src/app/webbrowser/HistoryViewWide.qml:422 msgid "Select all" msgstr "全選" -#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:394 +#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:532 msgid "Share" msgstr "分享" @@ -472,22 +497,22 @@ msgstr "復原" #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result -#: src/app/webbrowser/AddressBar.qml:209 +#: src/app/webbrowser/AddressBar.qml:210 #, qt-format msgid "%1/%2" msgstr "%1/%2" -#: src/app/webbrowser/AddressBar.qml:245 +#: src/app/webbrowser/AddressBar.qml:246 msgid "find in page" -msgstr "" +msgstr "在頁面尋找" -#: src/app/webbrowser/AddressBar.qml:246 +#: src/app/webbrowser/AddressBar.qml:247 msgid "search or enter an address" msgstr "搜尋或輸入位址" #: src/app/webbrowser/BookmarkOptions.qml:48 msgid "Bookmark Added" -msgstr "" +msgstr "已加入書籤" #. TRANSLATORS: Field where the title of bookmarked URL can be changed #: src/app/webbrowser/BookmarkOptions.qml:53 @@ -500,8 +525,8 @@ msgstr "儲存於" #: src/app/webbrowser/BookmarkOptions.qml:78 -#: src/app/webbrowser/BookmarksFoldersView.qml:119 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:111 +#: src/app/webbrowser/BookmarksFoldersView.qml:133 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105 msgid "All Bookmarks" msgstr "所有書籤" @@ -515,99 +540,117 @@ msgstr "建立新資料夾" #: src/app/webbrowser/BookmarkOptions.qml:153 -#: src/app/webbrowser/SettingsPage.qml:358 +#: src/app/webbrowser/SettingsPage.qml:339 msgid "Save" msgstr "儲存" -#: src/app/webbrowser/BookmarksFoldersView.qml:158 -#: src/app/webbrowser/BookmarksFoldersViewWide.qml:154 -#: src/app/webbrowser/SettingsPage.qml:91 -#: src/app/webbrowser/SettingsPage.qml:322 +#: src/app/webbrowser/BookmarksFoldersView.qml:191 +#: src/app/webbrowser/BookmarksFoldersViewWide.qml:159 +#: src/app/webbrowser/NewTabView.qml:258 src/app/webbrowser/SettingsPage.qml:91 +#: src/app/webbrowser/SettingsPage.qml:303 msgid "Homepage" msgstr "首頁" -#: src/app/webbrowser/BookmarksView.qml:80 -#: src/app/webbrowser/BookmarksViewWide.qml:78 -#: src/app/webbrowser/Browser.qml:401 src/app/webbrowser/NewTabView.qml:108 -#: src/app/webbrowser/NewTabViewWide.qml:154 +#: src/app/webbrowser/BookmarksView.qml:81 +#: src/app/webbrowser/BookmarksViewWide.qml:80 +#: src/app/webbrowser/Browser.qml:540 src/app/webbrowser/NewTabView.qml:135 +#: src/app/webbrowser/NewTabViewWide.qml:139 msgid "Bookmarks" msgstr "書籤" -#: src/app/webbrowser/BookmarksView.qml:112 -#: src/app/webbrowser/BookmarksViewWide.qml:110 -#: src/app/webbrowser/Browser.qml:679 src/app/webbrowser/HistoryView.qml:117 -#: src/app/webbrowser/HistoryViewWide.qml:504 +#: src/app/webbrowser/BookmarksView.qml:113 +#: src/app/webbrowser/BookmarksViewWide.qml:112 +#: src/app/webbrowser/Browser.qml:421 src/app/webbrowser/HistoryView.qml:131 +#: src/app/webbrowser/HistoryViewWide.qml:517 msgid "Done" msgstr "完成" -#: src/app/webbrowser/BookmarksView.qml:125 -#: src/app/webbrowser/BookmarksViewWide.qml:123 -#: src/app/webbrowser/Browser.qml:423 src/app/webbrowser/HistoryView.qml:130 -#: src/app/webbrowser/HistoryViewWide.qml:518 -#: src/app/webbrowser/TabsBar.qml:149 src/app/webbrowser/TabsList.qml:94 +#: src/app/webbrowser/BookmarksView.qml:127 +#: src/app/webbrowser/BookmarksViewWide.qml:126 +#: src/app/webbrowser/HistoryView.qml:145 +#: src/app/webbrowser/HistoryViewWide.qml:531 +#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99 msgid "New tab" msgstr "新分頁" -#: src/app/webbrowser/Browser.qml:407 -#: src/app/webbrowser/HistoryViewWide.qml:368 +#: src/app/webbrowser/Browser.qml:546 +#: src/app/webbrowser/HistoryViewWide.qml:381 msgid "History" msgstr "歷史" -#: src/app/webbrowser/Browser.qml:413 -msgid "Open tabs" -msgstr "開啟分頁" - -#: src/app/webbrowser/Browser.qml:412 src/app/webbrowser/DownloadsPage.qml:56 +#: src/app/webbrowser/Browser.qml:559 src/app/webbrowser/DownloadsPage.qml:57 msgid "Downloads" msgstr "下載" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Leave Private Mode" msgstr "離開私密模式" -#: src/app/webbrowser/Browser.qml:437 +#: src/app/webbrowser/Browser.qml:566 msgid "Private Mode" msgstr "私密模式" -#: src/app/webbrowser/Browser.qml:455 src/app/webbrowser/SettingsPage.qml:50 +#: src/app/webbrowser/Browser.qml:584 src/app/webbrowser/SettingsPage.qml:50 msgid "Settings" msgstr "設定" #. TRANSLATORS: %1 refers to the current number of tabs opened -#: src/app/webbrowser/Browser.qml:787 +#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:791 #, qt-format msgid "(%1)" msgstr "(%1)" -#: src/app/webbrowser/Browser.qml:1260 +#: src/app/webbrowser/Browser.qml:1345 msgid "Swipe Up To Exit Full Screen" msgstr "向上掃以結束全螢幕" -#: src/app/webbrowser/Browser.qml:1261 +#: src/app/webbrowser/Browser.qml:1346 msgid "Press ESC To Exit Full Screen" msgstr "按 ESC 以結束全螢幕" -#: src/app/webbrowser/DownloadsPage.qml:59 +#: src/app/webbrowser/ContentDownloadDialog.qml:82 +msgid "" +"Choose an application to open this file or add it to the downloads folder." +msgstr "選擇要開啟此檔案的應用程式，或將之放入「下載」資料夾" + +#: src/app/webbrowser/ContentDownloadDialog.qml:88 +msgid "Choose an application" +msgstr "選擇一個程式" + +#: src/app/webbrowser/ContentDownloadDialog.qml:101 +msgid "Download" +msgstr "下載" + +#: src/app/webbrowser/DownloadDelegate.qml:159 +msgid "Download failed" +msgstr "下載失敗" + +#: src/app/webbrowser/DownloadDelegate.qml:208 +msgid "Resume" +msgstr "恢復" + +#: src/app/webbrowser/DownloadsPage.qml:61 msgid "Confirm selection" -msgstr "" +msgstr "確認選擇" -#: src/app/webbrowser/HistoryView.qml:199 -#: src/app/webbrowser/HistoryViewWide.qml:428 +#: src/app/webbrowser/DownloadsPage.qml:101 +#: src/app/webbrowser/HistoryView.qml:217 +#: src/app/webbrowser/HistoryViewWide.qml:441 msgid "Delete" msgstr "刪除" -#: src/app/webbrowser/DownloadsPage.qml:207 +#: src/app/webbrowser/DownloadsPage.qml:252 msgid "No downloads available" -msgstr "" +msgstr "無下載提供" -#: src/app/webbrowser/ExpandedHistoryView.qml:104 +#: src/app/webbrowser/ExpandedHistoryView.qml:121 #, qt-format msgid "%1 page" msgid_plural "%1 pages" msgstr[0] "共 %1 頁" -#: src/app/webbrowser/ExpandedHistoryView.qml:119 -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/ExpandedHistoryView.qml:136 +#: src/app/webbrowser/NewTabView.qml:148 msgid "Less" msgstr "少" @@ -616,53 +659,27 @@ msgstr "最後到訪" #: src/app/webbrowser/HistorySectionDelegate.qml:48 -#: src/app/webbrowser/HistoryViewWide.qml:215 +#: src/app/webbrowser/HistoryViewWide.qml:212 msgid "Yesterday" msgstr "昨天" -#: src/app/webbrowser/HistoryViewWide.qml:199 +#: src/app/webbrowser/HistoryViewWide.qml:196 msgid "All History" msgstr "所有歷史" -#: src/app/webbrowser/HistoryViewWide.qml:213 -#: src/app/webbrowser/HistoryViewWide.qml:282 +#: src/app/webbrowser/HistoryViewWide.qml:210 +#: src/app/webbrowser/HistoryViewWide.qml:295 msgid "Today" msgstr "今天" -#: src/app/webbrowser/HistoryViewWide.qml:449 +#: src/app/webbrowser/HistoryViewWide.qml:462 msgid "search history" -msgstr "" +msgstr "搜尋歷史" #: src/app/webbrowser/LeavePrivateModeDialog.qml:24 msgid "Going to public mode will close all private tabs" msgstr "前往公開模式，會關閉所有私密分頁" -#: src/app/webbrowser/MediaAccessDialog.qml:28 -msgid "Allow this domain to access your camera and microphone?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:29 -msgid "Allow this domain to access your camera?" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:30 -msgid "Allow this domain to access your microphone?" -msgstr "" - -#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it -#: src/app/webbrowser/MediaAccessDialog.qml:39 -#, qt-format -msgid "%1 (embedded in %2)" -msgstr "" - -#: src/app/webbrowser/MediaAccessDialog.qml:48 -msgid "Yes" -msgstr "是" - -#: src/app/webbrowser/MediaAccessDialog.qml:60 -msgid "No" -msgstr "否" - #: src/app/webbrowser/NewPrivateTabView.qml:41 msgid "This is a private tab" msgstr "此為私密分頁" @@ -672,35 +689,37 @@ "Pages that you view in this tab won't appear in your browser history.\n" "Bookmarks you create will be preserved, however." msgstr "" +"在此分貢瀏覽的頁面不會記入「瀏覽器歷史」。\n" +"但建立的書籤會保存。" -#: src/app/webbrowser/NewTabView.qml:123 +#: src/app/webbrowser/NewTabView.qml:148 msgid "More" msgstr "詳細資訊" -#: src/app/webbrowser/NewTabView.qml:227 -#: src/app/webbrowser/NewTabViewWide.qml:153 +#: src/app/webbrowser/NewTabView.qml:335 +#: src/app/webbrowser/NewTabViewWide.qml:138 msgid "Top sites" msgstr "最常造訪" -#: src/app/webbrowser/NewTabView.qml:258 +#: src/app/webbrowser/NewTabView.qml:366 msgid "You haven't visited any site yet" -msgstr "" +msgstr "還未瀏覽過網站" #: src/app/webbrowser/SadTab.qml:48 msgid "The rendering process has been closed for this tab." -msgstr "" +msgstr "此分頁的編排繪製程序已經關閉。" #. TRANSLATORS: %1 is the URL of the page that crashed the renderer process #: src/app/webbrowser/SadTab.qml:65 #, qt-format msgid "Something went wrong while displaying %1." -msgstr "" +msgstr "顯示 %1 時發生了問題。" #: src/app/webbrowser/SadTab.qml:67 msgid "" "The system is low on memory and can't display this webpage. Try closing " "unneeded tabs and reloading." -msgstr "" +msgstr "系統記憶體不足，無法顯示此網頁。試試關閉不需要的分頁，再重新載入。" #: src/app/webbrowser/SadTab.qml:80 msgid "Close tab" @@ -758,8 +777,12 @@ msgid "Which is run by" msgstr "營運者：" +#: src/app/webbrowser/SettingsDeviceSelector.qml:43 +msgid "Default" +msgstr "預設" + #: src/app/webbrowser/SettingsPage.qml:80 -#: src/app/webbrowser/SettingsPage.qml:175 +#: src/app/webbrowser/SettingsPage.qml:156 msgid "Search engine" msgstr "搜尋引擎" @@ -768,62 +791,58 @@ msgstr "啟動時回復之前工作階段" #: src/app/webbrowser/SettingsPage.qml:118 -msgid "Allow opening new tabs in background" -msgstr "允許在背景開啟新分頁" - -#: src/app/webbrowser/SettingsPage.qml:137 -#: src/app/webbrowser/SettingsPage.qml:227 +#: src/app/webbrowser/SettingsPage.qml:208 msgid "Privacy & permissions" -msgstr "" +msgstr "隱私及權限" -#: src/app/webbrowser/SettingsPage.qml:145 +#: src/app/webbrowser/SettingsPage.qml:126 msgid "Reset browser settings" msgstr "重設瀏覽器設定" -#: src/app/webbrowser/SettingsPage.qml:248 -#: src/app/webbrowser/SettingsPage.qml:386 +#: src/app/webbrowser/SettingsPage.qml:229 +#: src/app/webbrowser/SettingsPage.qml:367 msgid "Camera & microphone" -msgstr "" +msgstr "攝影機及麥克風" -#: src/app/webbrowser/SettingsPage.qml:254 +#: src/app/webbrowser/SettingsPage.qml:235 msgid "Clear Browsing History" msgstr "清除瀏覽歷史" -#: src/app/webbrowser/SettingsPage.qml:257 +#: src/app/webbrowser/SettingsPage.qml:238 msgid "Clear Browsing History?" -msgstr "" +msgstr "是否清除瀏覽歷史？" -#: src/app/webbrowser/SettingsPage.qml:264 +#: src/app/webbrowser/SettingsPage.qml:245 msgid "Clear Cache" msgstr "清除快取" -#: src/app/webbrowser/SettingsPage.qml:266 +#: src/app/webbrowser/SettingsPage.qml:247 msgid "Clear Cache?" -msgstr "" +msgstr "是否清除網頁快取？" -#: src/app/webbrowser/SettingsPage.qml:301 +#: src/app/webbrowser/SettingsPage.qml:282 msgid "Clear" msgstr "清除" -#: src/app/webbrowser/SettingsPage.qml:406 +#: src/app/webbrowser/SettingsPage.qml:387 msgid "Microphone" -msgstr "" +msgstr "麥克風" -#: src/app/webbrowser/SettingsPage.qml:425 +#: src/app/webbrowser/SettingsPage.qml:406 msgid "Camera" -msgstr "" +msgstr "攝影機" -#: src/app/webbrowser/TabPreview.qml:81 +#: src/app/webbrowser/TabPreview.qml:86 msgid "Tap to view" msgstr "輕觸以檢視" -#: src/app/webbrowser/TabsBar.qml:97 +#: src/app/webbrowser/TabsBar.qml:102 msgid "Close Tab" msgstr "關閉分頁" -#: src/app/webbrowser/UrlPreviewDelegate.qml:124 +#: src/app/webbrowser/UrlPreviewDelegate.qml:135 msgid "Remove" -msgstr "" +msgstr "移除" #. TRANSLATORS: %1 refers to the current page’s title #: src/app/webbrowser/webbrowser-app.qml:35 @@ -841,7 +860,7 @@ msgid "" "No accounts have been linked to this webapp; press the item below to add an " "account." -msgstr "" +msgstr "尚未有連結至本網路 App 的帳號；請按下方的項目來加入帳號。" #: src/app/webcontainer/AccountChooserDialog.qml:78 msgid "Add account" @@ -849,11 +868,11 @@ #: src/app/webcontainer/AccountChooserDialog.qml:87 msgid "Don't use an account" -msgstr "" +msgstr "不使用帳號" #: src/app/webcontainer/AccountErrorScreen.qml:39 msgid "Account error" -msgstr "" +msgstr "帳號出錯" #: src/app/webcontainer/AccountErrorScreen.qml:50 msgid "Close" @@ -863,28 +882,28 @@ msgid "" "Account window could not be opened. You can only create one account at a " "time; please try again after closing all other account windows." -msgstr "" +msgstr "無法開啟帳號視窗。您一次只能建立一個帳號；請先關閉其他帳號視窗後再試一次。" #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:45 #, qt-format msgid "%1 needs to access your %2 online account." -msgstr "" +msgstr "%1 需要存取您的 %2 線上帳號。" #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider #: src/app/webcontainer/AccountsSplashScreen.qml:55 #, qt-format msgid "%1 would like to access your %2 online account." -msgstr "" +msgstr "%1 想要存取您的 %2 線上帳號。" #: src/app/webcontainer/AccountsSplashScreen.qml:64 msgid "" "Choose an account now, or skip this step and choose an online account later." -msgstr "" +msgstr "現在選擇一個帳號，或是略過此步驟稍候再選擇一個線上帳號。" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Close the app" -msgstr "" +msgstr "關閉程式" #: src/app/webcontainer/AccountsSplashScreen.qml:77 msgid "Skip" @@ -896,7 +915,7 @@ #: src/app/webcontainer/SadPage.qml:45 msgid "Oops, something went wrong." -msgstr "" +msgstr "糟糕... 發生了問題。" #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1 msgid "Browser" @@ -918,6 +937,9 @@ #~ "Ubuntu suggests you check your network settings and try refreshing the page." #~ msgstr "Ubuntu 建議您檢查網路設定，並嘗試重新整理該頁面。" +#~ msgid "Please choose a file" +#~ msgstr "請選取檔案" + #~ msgid "Share…" #~ msgstr "分享…" @@ -936,6 +958,9 @@ #~ msgid "Select an account" #~ msgstr "選取帳號" +#~ msgid "Open tabs" +#~ msgstr "開啟分頁" + #~ msgid "Add" #~ msgstr "加入" @@ -944,3 +969,6 @@ #~ msgid "Privacy" #~ msgstr "隱私" + +#~ msgid "Allow opening new tabs in background" +#~ msgstr "允許在背景開啟新分頁" diff -Nru webbrowser-app-0.23+16.04.20151124/README webbrowser-app-0.23+16.04.20160413/README --- webbrowser-app-0.23+16.04.20151124/README 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/README 2016-04-13 15:22:01.000000000 +0000 @@ -44,7 +44,8 @@ = Automated UI tests = webbrowser-app uses autopilot (https://launchpad.net/autopilot) to test its UI. -To run the tests, you will need to install python3-autopilot and autopilot-qt5. +To run the tests locally, you will need to install python3-autopilot and +autopilot-qt5. Then do the following: $ cd tests/autopilot/ @@ -54,6 +55,9 @@ $ autopilot3 list webbrowser_app +In order to run the tests in a virtual machine with an environment closer to +what a user will get in Ubuntu Touch, see the Dep8 tests section. + = Code coverage = @@ -69,6 +73,56 @@ interactive human-readable report in HTML format (coveragereport/index.html). += Dep8 tests = + +Dep8 tests exercise the package "as-installed". + +Currently, the webbrowser-app has one suite of dep8 tests that uses autopilot +(https://launchpad.net/autopilot) to test from the point of view of the user. + +To run the tests you will need autopkgtest: + + $ sudo apt-get install autopkgtest + +You can use multiple test beds to execute the tests. Below you will find +instructions to run them in a virtual machine +You can find more information with: + + $ man adt-run + +== Run dep8 tests == + +To run the tests in a qemu virtual machine, you will first have to create it +(see /usr/share/doc/autopkgtest/README.running-tests.rst.gz). We output the +image to ~/ rather than the current directory, so it will be in a safer +place to avoid rebuilding images every time. You can store it in any +directory you wish. This image is better consumed "fresh", building it daily +will avoid long updates/upgrades when running the tests. + + $ adt-buildvm-ubuntu-cloud -r $(lsb_release -c -s) -a amd64 -o ~/ + +Then run the tests using adt-run with the qemu virtualization host against +the current archive. + + $ adt-run -B -U --unbuilt-tree . \ + -o ~/adt-browser-test/$(date +%Y-%m-%d-%H-%M) \ + --- qemu ~/adt-$(lsb_release -c -s)-amd64-cloud.img + +The tests can also be run on a local phone. + + $ adt-run -B -U --unbuilt-tree . \ + -o ~/adt-browser-test/$(date +%Y-%m-%d-%H-%M) \ + --- ssh -s adb -- -p --serial + +== Examine the dep8 autopilot results == + +To examine the test results, which are in subunit format, additional tools are +required, such as trv (https://launchpad.net/trv). + +You can find the results file in the directory +~/adt-browser-test/$(date +%Y-%m-%d-%H-%M)/artifacts. + + = Settings = webbrowser-app supports a limited set of custom settings, persisted on disk in @@ -86,11 +140,5 @@ the OpenSearch document description format (http://www.opensearch.org/Specifications/OpenSearch/1.1) - - 'allowOpenInBackgroundTab': whether to offer an option to open a link in a - new background tab in the contextual menu. Possible values are "true", - "false", and "default" (which resolves to true on desktop and false on - mobile). - - restoreSession: whether to restore the previous browsing session at startup (defaults to true) - Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/screenshot.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/screenshot.png differ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/actions/OpenLinkInWebBrowser.qml webbrowser-app-0.23+16.04.20160413/src/app/actions/OpenLinkInWebBrowser.qml --- webbrowser-app-0.23+16.04.20151124/src/app/actions/OpenLinkInWebBrowser.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/actions/OpenLinkInWebBrowser.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,23 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import Ubuntu.Components 1.3 + +Action { + text: i18n.tr("Open link in WebBrowser") +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/actions/OpenVideoInNewTab.qml webbrowser-app-0.23+16.04.20160413/src/app/actions/OpenVideoInNewTab.qml --- webbrowser-app-0.23+16.04.20151124/src/app/actions/OpenVideoInNewTab.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/actions/OpenVideoInNewTab.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,23 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import Ubuntu.Components 1.3 + +Action { + text: i18n.tr("Open video in new tab") +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/actions/SaveVideo.qml webbrowser-app-0.23+16.04.20160413/src/app/actions/SaveVideo.qml --- webbrowser-app-0.23+16.04.20151124/src/app/actions/SaveVideo.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/actions/SaveVideo.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,23 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import Ubuntu.Components 1.3 + +Action { + text: i18n.tr("Save video") +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/browserapplication.cpp webbrowser-app-0.23+16.04.20160413/src/app/browserapplication.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/browserapplication.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/browserapplication.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -16,11 +16,16 @@ * along with this program. If not, see . */ +// system +#include +#include +#include + // Qt -#include +#include #include +#include #include -#include #include #include #include @@ -31,13 +36,16 @@ #include "browserapplication.h" #include "config.h" #include "favicon-fetcher.h" +#include "meminfo.h" #include "mime-database.h" +#include "qquickshortcut_p.h" #include "session-storage.h" #include "webbrowser-window.h" #include "TouchRegistry.h" #include "Ubuntu/Gestures/Direction.h" #include "Ubuntu/Gestures/DirectionalDragArea.h" +#include "Unity/InputInfo/qdeclarativeinputdevicemodel_p.h" BrowserApplication::BrowserApplication(int& argc, char** argv) : QApplication(argc, argv) @@ -100,19 +108,17 @@ return QString(); } -static QObject* MimeDatabase_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new MimeDatabase(); -} +#define MAKE_SINGLETON_FACTORY(type) \ + static QObject* type##_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) { \ + Q_UNUSED(engine); \ + Q_UNUSED(scriptEngine); \ + return new type(); \ + } + +MAKE_SINGLETON_FACTORY(MemInfo) +MAKE_SINGLETON_FACTORY(MimeDatabase) +MAKE_SINGLETON_FACTORY(Direction) -static QObject* Direction_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new Direction(); -} bool BrowserApplication::initialize(const QString& qmlFileSubPath) { @@ -128,7 +134,7 @@ if (qgetenv("APP_ID").isEmpty()) { QString id = appId(); if (id.isEmpty()) { - id = QString(APP_ID); + id = QStringLiteral(APP_ID); } qputenv("APP_ID", id.toUtf8()); } @@ -141,6 +147,26 @@ // which is needed by Online Accounts. QString unversionedAppId = QStringList(appIdParts.mid(0, 2)).join('_'); + // Ensure only one instance of the app is running. + if (m_singleton.run(m_arguments)) { + connect(&m_singleton, SIGNAL(newInstanceLaunched(const QStringList&)), + SLOT(onNewInstanceLaunched(const QStringList&))); + } else { + return false; + } + + bool runningConfined = true; + char* label; + char* mode; + if (aa_getcon(&label, &mode) != -1) { + if (strcmp(label, "unconfined") == 0) { + runningConfined = false; + } + free(label); + } else if (errno == EINVAL) { + runningConfined = false; + } + QString devtoolsPort = inspectorPort(); QString devtoolsHost = inspectorHost(); bool inspectorEnabled = !devtoolsPort.isEmpty(); @@ -151,13 +177,19 @@ const char* uri = "webbrowsercommon.private"; qmlRegisterType(uri, 0, 1, "FaviconFetcher"); + qmlRegisterSingletonType(uri, 0, 1, "MemInfo", MemInfo_singleton_factory); qmlRegisterSingletonType(uri, 0, 1, "MimeDatabase", MimeDatabase_singleton_factory); qmlRegisterType(uri, 0, 1, "SessionStorage"); + qmlRegisterType(uri, 0, 1, "Shortcut"); const char* gesturesUri = "Ubuntu.Gestures"; qmlRegisterSingletonType(gesturesUri, 0, 1, "Direction", Direction_singleton_factory); qmlRegisterType(gesturesUri, 0, 1, "DirectionalDragArea"); + const char* inputInfoUri = "Unity.InputInfo"; + qmlRegisterType(inputInfoUri, 0, 1, "InputDeviceModel"); + qmlRegisterType(inputInfoUri, 0, 1, "InputInfo"); + m_engine = new QQmlEngine; connect(m_engine, SIGNAL(quit()), SLOT(quit())); if (!isRunningInstalled()) { @@ -167,6 +199,9 @@ qmlEngineCreated(m_engine); QQmlContext* context = m_engine->rootContext(); + context->setContextProperty("__runningConfined", runningConfined); + context->setContextProperty("unversionedAppId", unversionedAppId); + m_component = new QQmlComponent(m_engine); m_component->loadUrl(QUrl::fromLocalFile(UbuntuBrowserDirectory() + "/" + qmlFileSubPath)); if (!m_component->isReady()) { @@ -175,7 +210,6 @@ } m_webbrowserWindowProxy = new WebBrowserWindow(); context->setContextProperty("webbrowserWindowProxy", m_webbrowserWindowProxy); - context->setContextProperty("unversionedAppId", unversionedAppId); QObject* browser = m_component->beginCreate(context); m_window = qobject_cast(browser); @@ -186,9 +220,32 @@ browser->setProperty("developerExtrasEnabled", inspectorEnabled); browser->setProperty("forceFullscreen", m_arguments.contains("--fullscreen")); + bool hasTouchScreen = false; + Q_FOREACH(const QTouchDevice* device, QTouchDevice::devices()) { + if (device->type() == QTouchDevice::TouchScreen) { + hasTouchScreen = true; + } + } + browser->setProperty("hasTouchScreen", hasTouchScreen); + return true; } +void BrowserApplication::onNewInstanceLaunched(const QStringList& arguments) const +{ + QVariantList urls; + Q_FOREACH(const QString& argument, arguments) { + if (!argument.startsWith(QStringLiteral("-"))) { + QUrl url = QUrl::fromUserInput(argument); + if (url.isValid()) { + urls.append(url); + } + } + } + QMetaObject::invokeMethod(m_window, "openUrls", Q_ARG(QVariant, QVariant(urls))); + m_window->requestActivate(); +} + void BrowserApplication::qmlEngineCreated(QQmlEngine*) {} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/browserapplication.h webbrowser-app-0.23+16.04.20160413/src/app/browserapplication.h --- webbrowser-app-0.23+16.04.20151124/src/app/browserapplication.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/browserapplication.h 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -26,6 +26,9 @@ #include #include +// local +#include "single-instance-manager.h" + class QQmlComponent; class QQmlEngine; class QQuickWindow; @@ -56,12 +59,17 @@ QQuickWindow* m_window; QQmlComponent* m_component; +private Q_SLOTS: + void onNewInstanceLaunched(const QStringList& arguments) const; + private: QString appId() const; QString inspectorPort() const; QString inspectorHost() const; WebBrowserWindow *m_webbrowserWindowProxy; + + SingleInstanceManager m_singleton; }; #endif // __BROWSER_APPLICATION_H__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/BrowserView.qml webbrowser-app-0.23+16.04.20160413/src/app/BrowserView.qml --- webbrowser-app-0.23+16.04.20151124/src/app/BrowserView.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/BrowserView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -20,7 +20,7 @@ import Ubuntu.Components 1.3 import Ubuntu.Unity.Action 1.1 as UnityActions -Item { +FocusScope { property bool developerExtrasEnabled: false property var currentWebview: null @@ -32,6 +32,8 @@ property var osk: _osk + property bool hasTouchScreen: false + // See http://design.canonical.com/2015/05/to-converge-onto-mobile-tablet-and-desktop-think-grid-units/ readonly property bool wide: width >= units.gu(90) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/BrowserWindow.qml webbrowser-app-0.23+16.04.20160413/src/app/BrowserWindow.qml --- webbrowser-app-0.23+16.04.20151124/src/app/BrowserWindow.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/BrowserWindow.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -27,6 +27,8 @@ property bool forceFullscreen: false property var currentWebview: null + signal openUrls(var urls) + contentOrientation: Screen.orientation width: units.gu(100) @@ -52,4 +54,15 @@ } } } + + // Handle runtime requests to open urls as defined + // by the freedesktop application dbus interface's open + // method for DBUS application activation: + // http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus + // The dispatch on the org.freedesktop.Application if is done per appId at the + // url-dispatcher/upstart level. + Connections { + target: UriHandler + onOpened: window.openUrls(uris) + } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/ChromeBase.qml webbrowser-app-0.23+16.04.20160413/src/app/ChromeBase.qml --- webbrowser-app-0.23+16.04.20151124/src/app/ChromeBase.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/ChromeBase.qml 2016-04-13 15:22:01.000000000 +0000 @@ -23,6 +23,8 @@ StyledItem { id: chrome + objectName: "chromeBase" + property var webview property alias backgroundColor: backgroundRect.color diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/ChromeController.qml webbrowser-app-0.23+16.04.20160413/src/app/ChromeController.qml --- webbrowser-app-0.23+16.04.20151124/src/app/ChromeController.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/ChromeController.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -25,7 +25,7 @@ property var webview property bool forceHide: false property bool forceShow: false - property int defaultMode: Oxide.LocationBarController.ModeAuto + property int defaultMode: internal.modeAuto onWebviewChanged: internal.updateVisibility() onForceHideChanged: internal.updateVisibility() @@ -34,18 +34,22 @@ QtObject { id: internal + readonly property int modeAuto: Oxide.LocationBarController.ModeAuto + readonly property int modeShown: Oxide.LocationBarController.ModeShown + readonly property int modeHidden: Oxide.LocationBarController.ModeHidden + function updateVisibility() { if (!webview) { return } webview.locationBarController.animated = false if (forceHide) { - webview.locationBarController.mode = Oxide.LocationBarController.ModeHidden + webview.locationBarController.mode = internal.modeHidden } else if (forceShow) { - webview.locationBarController.mode = Oxide.LocationBarController.ModeShown + webview.locationBarController.mode = internal.modeShown } else if (!webview.fullscreen) { webview.locationBarController.mode = defaultMode - if (webview.locationBarController.mode == Oxide.LocationBarController.ModeAuto) { + if (webview.locationBarController.mode == internal.modeAuto) { webview.locationBarController.show(false) } } @@ -55,28 +59,35 @@ Connections { target: webview + onFullscreenChanged: { if (webview.fullscreen) { - webview.locationBarController.mode = Oxide.LocationBarController.ModeHidden - } else if (!forceHide && !forceShow) { - webview.locationBarController.mode = defaultMode - if (webview.locationBarController.mode == Oxide.LocationBarController.ModeAuto) { - webview.locationBarController.show(true) + webview.locationBarController.mode = internal.modeHidden + } else if (!forceHide) { + if (forceShow) { + webview.locationBarController.mode = internal.modeShown + } else { + webview.locationBarController.mode = defaultMode + if (webview.locationBarController.mode == internal.modeAuto) { + webview.locationBarController.show(true) + } } } } - onLoadingChanged: { + + onLoadingStateChanged: { if (webview.loading && !webview.fullscreen && !forceHide && !forceShow && - (webview.locationBarController.mode == Oxide.LocationBarController.ModeAuto)) { + (webview.locationBarController.mode == internal.modeAuto)) { webview.locationBarController.show(true) } } + onLoadEvent: { // When loading, force ModeShown until the load is committed or stopped, // to work around https://launchpad.net/bugs/1453908. if (forceHide || forceShow) return if (event.type == Oxide.LoadEvent.TypeStarted) { - webview.locationBarController.mode = Oxide.LocationBarController.ModeShown + webview.locationBarController.mode = internal.modeShown } else if ((event.type == Oxide.LoadEvent.TypeCommitted) || (event.type == Oxide.LoadEvent.TypeStopped)) { webview.locationBarController.mode = defaultMode diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/src/app/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/src/app/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -7,6 +7,9 @@ find_package(Qt5Quick REQUIRED) find_package(Qt5Widgets REQUIRED) +include(FindPkgConfig) +pkg_check_modules(LIBAPPARMOR REQUIRED libapparmor) + add_subdirectory(unity8) configure_file( @@ -19,15 +22,20 @@ set(COMMONLIB_SRC browserapplication.cpp favicon-fetcher.cpp + meminfo.cpp mime-database.cpp session-storage.cpp + single-instance-manager.cpp webbrowser-window.cpp + qquickshortcut.cpp ) add_library(${COMMONLIB} STATIC ${COMMONLIB_SRC}) include_directories(${unity8_SOURCE_DIR}/libs/UbuntuGestures - ${unity8_SOURCE_DIR}/plugins) + ${unity8_SOURCE_DIR}/plugins + ${LIBAPPARMOR_INCLUDE_DIRS} + ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) target_link_libraries(${COMMONLIB} Qt5::Core Qt5::Gui @@ -36,6 +44,8 @@ Qt5::Quick Qt5::Widgets UbuntuGesturesQml + InputInfo + ${LIBAPPARMOR_LDFLAGS} ) file(GLOB QML_FILES *.qml) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/ContentDownloadDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/ContentDownloadDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/ContentDownloadDialog.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/ContentDownloadDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -/* - * Copyright 2014-2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 -import Ubuntu.Components 1.3 -import Ubuntu.Components.Popups 1.3 -import Ubuntu.Content 0.1 - -PopupBase { - id: downloadDialog - anchors.fill: parent - property var activeTransfer - property var downloadId - property alias contentType: peerPicker.contentType - - Rectangle { - anchors.fill: parent - ContentPeerPicker { - id: peerPicker - handler: ContentHandler.Destination - visible: parent.visible - - onPeerSelected: { - activeTransfer = peer.request() - activeTransfer.downloadId = downloadDialog.downloadId - activeTransfer.state = ContentTransfer.Downloading - PopupUtils.close(downloadDialog) - } - - onCancelPressed: { - PopupUtils.close(downloadDialog) - } - } - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/ContentHandler.qml webbrowser-app-0.23+16.04.20160413/src/app/ContentHandler.qml --- webbrowser-app-0.23+16.04.20151124/src/app/ContentHandler.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/ContentHandler.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,35 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Content 1.3 +import "MimeTypeMapper.js" as MimeTypeMapper + +Item { + signal exportFromDownloads(var transfer, var mimetypeFilter, bool multiSelect) + + Connections { + target: ContentHub + onExportRequested: { + exportFromDownloads(transfer, + MimeTypeMapper.mimeTypeRegexForContentType(transfer.contentType), + transfer.selectionType === ContentTransfer.Multiple) + + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/ContentPickerDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/ContentPickerDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/ContentPickerDialog.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/ContentPickerDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/* - * Copyright 2014-2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 -import Ubuntu.Components 1.3 -import Ubuntu.Components.Popups 1.3 as Popups -import Ubuntu.Content 0.1 -import "MimeTypeMapper.js" as MimeTypeMapper - -Component { - Popups.PopupBase { - id: picker - objectName: "contentPickerDialog" - - // Set the parent at construction time, instead of letting show() - // set it later on, which for some reason results in the size of - // the dialog not being updated. - parent: QuickUtils.rootItem(this) - - property var activeTransfer - - Rectangle { - anchors.fill: parent - - ContentTransferHint { - anchors.fill: parent - activeTransfer: picker.activeTransfer - } - - ContentPeerPicker { - id: peerPicker - anchors.fill: parent - visible: true - contentType: ContentType.All - handler: ContentHandler.Source - - onPeerSelected: { - if (model.allowMultipleFiles) { - peer.selectionType = ContentTransfer.Multiple - } else { - peer.selectionType = ContentTransfer.Single - } - picker.activeTransfer = peer.request() - stateChangeConnection.target = picker.activeTransfer - } - - onCancelPressed: { - webview.focus = true - model.reject() - } - } - } - - Connections { - id: stateChangeConnection - target: null - onStateChanged: { - if (picker.activeTransfer.state === ContentTransfer.Charged) { - var selectedItems = [] - for(var i in picker.activeTransfer.items) { - selectedItems.push(String(picker.activeTransfer.items[i].url).replace("file://", "")) - } - model.accept(selectedItems) - } - } - } - - Component.onCompleted: { - if(acceptTypes.length === 1) { - var contentType = MimeTypeMapper.mimeTypeToContentType(acceptTypes[0]) - if(contentType == ContentType.Unknown) { - // If we don't recognise the type, allow uploads from any app - contentType = ContentType.All - } - peerPicker.contentType = contentType - } else { - peerPicker.contentType = ContentType.All - } - show() - } - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/ContentShareDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/ContentShareDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/ContentShareDialog.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/ContentShareDialog.qml 2016-04-13 15:22:01.000000000 +0000 @@ -19,7 +19,7 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 -import Ubuntu.Content 0.1 +import Ubuntu.Content 1.3 PopupBase { id: shareDialog diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/Downloader.qml webbrowser-app-0.23+16.04.20160413/src/app/Downloader.qml --- webbrowser-app-0.23+16.04.20151124/src/app/Downloader.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/Downloader.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -19,18 +19,18 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 -import Ubuntu.DownloadManager 0.1 -import Ubuntu.Content 0.1 +import Ubuntu.DownloadManager 1.2 +import Ubuntu.Content 1.3 import "MimeTypeMapper.js" as MimeTypeMapper import "FileExtensionMapper.js" as FileExtensionMapper Item { id: downloadItem - Component { - id: downloadDialog - ContentDownloadDialog { } - } + property string filename + property string mimeType + + signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType) Component { id: metadataComponent @@ -42,31 +42,29 @@ Component { id: downloadComponent SingleDownload { + id: downloader autoStart: false property var contentType - onDownloadIdChanged: { - PopupUtils.open(downloadDialog, downloadItem, {"contentType" : contentType, "downloadId" : downloadId}) - } + property string url - onFinished: { - metadata.destroy() - destroy() + onDownloadIdChanged: { + showDownloadDialog(downloadId, contentType, downloader, downloadItem.filename, downloadItem.mimeType) } } } function download(url, contentType, headers, metadata) { - var singleDownload = downloadComponent.createObject(downloadItem) - singleDownload.contentType = contentType - if (headers) { - singleDownload.headers = headers + var properties = {'contentType': contentType, 'metadata': metadata, 'url': url} + if (headers) { + properties['headers'] = headers } - singleDownload.metadata = metadata + var singleDownload = downloadComponent.createObject(downloadItem, properties) singleDownload.download(url) } function downloadPicture(url, headers) { var metadata = metadataComponent.createObject(downloadItem) + downloadItem.mimeType = "image/*" download(url, ContentType.Pictures, headers, metadata) } @@ -86,12 +84,16 @@ contentType = ContentType.Music metadata.extract = true } + if (!filename) { + filename = url.toString().split("/").pop() + } metadata.title = filename + downloadItem.filename = filename + downloadItem.mimeType = mimeType download(url, contentType, headers, metadata) } function is7digital(url) { return url.toString().search(/[^\/]+:\/\/[^\/]*7digital.com\//) !== -1 } - } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/FileExtensionMapper.js webbrowser-app-0.23+16.04.20160413/src/app/FileExtensionMapper.js --- webbrowser-app-0.23+16.04.20151124/src/app/FileExtensionMapper.js 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/FileExtensionMapper.js 2016-04-13 15:22:01.000000000 +0000 @@ -160,6 +160,8 @@ case "cxx": case "d": case "diff": + case "doc": + case "docx": case "etx": case "gcd": case "h": @@ -180,6 +182,9 @@ case "ly": case "mml": case "moc": + case "odp": + case "ods": + case "odt": case "p": case "pas": case "patch": @@ -187,6 +192,8 @@ case "pl": case "pm": case "pot": + case "ppt": + case "pptx": case "py": case "rtx": case "scala": @@ -209,6 +216,8 @@ case "wml": case "wmls": case "wsc": + case "xls": + case "xlsx": return ContentType.Documents; case "epub": case "mobi": diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/FilePickerDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/FilePickerDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/FilePickerDialog.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/FilePickerDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -/* - * Copyright 2014-2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 -import QtQuick.Dialogs 1.0 -import Ubuntu.Components 1.3 -import Ubuntu.Components.Popups 1.3 as Popups - -Component { - Popups.Dialog { - FileDialog { - id: fileDialog - title: i18n.tr("Please choose a file") - selectMultiple: model.allowMultipleFiles - - onAccepted: { - var selectedFiles = [] - for(var i in fileDialog.fileUrls) { - selectedFiles.push(fileDialog.fileUrls[i].replace("file://", "")) - } - model.accept(selectedFiles) - } - - onRejected: { - model.reject() - } - Component.onCompleted: visible = true - } - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/FilteredKeyboardModel.qml webbrowser-app-0.23+16.04.20160413/src/app/FilteredKeyboardModel.qml --- webbrowser-app-0.23+16.04.20151124/src/app/FilteredKeyboardModel.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/FilteredKeyboardModel.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Unity.InputInfo 0.1 + +SortFilterModel { + model: InputDeviceModel { + deviceFilter: InputInfo.Keyboard + } + filter { + // Filter out autopilot-emulated keyboards + // (see https://launchpad.net/bugs/1542224). + property: "name" + pattern: /^(?!py-evdev-uinput).*$/ + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/MediaAccessDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/MediaAccessDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/MediaAccessDialog.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/MediaAccessDialog.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,100 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 + +Dialog { + property var request + modal: true + + Label { + elide: Text.ElideRight + textSize: Label.Large + color: theme.palette.normal.overlayText + text: i18n.tr("Permission") + } + + Label { + color: theme.palette.normal.baseText + wrapMode: Text.Wrap + text: (request.isForAudio && request.isForVideo) + ? i18n.tr("Allow this domain to access your camera and microphone?") + : (request.isForVideo ? i18n.tr("Allow this domain to access your camera?") + : i18n.tr("Allow this domain to access your microphone?")) + } + + Label { + color: theme.palette.normal.baseText + wrapMode: Text.Wrap + text: (request.embedder.toString() !== request.origin.toString()) + // TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it + ? i18n.tr("%1 (embedded in %2)").arg(request.origin).arg(request.embedder) + : request.origin + } + + Item { + height: units.gu(2) + Rectangle { + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } + height: units.dp(1) + color: theme.palette.normal.base + } + } + + Row { + height: units.gu(4) + spacing: units.gu(2) + layoutDirection: Qt.RightToLeft + + Button { + objectName: "mediaAccessDialog.allowButton" + text: i18n.tr("Yes") + color: UbuntuColors.green + width: units.gu(10) + onClicked: { + request.allow() + hide() + } + } + + Button { + objectName: "mediaAccessDialog.denyButton" + text: i18n.tr("No") + color: UbuntuColors.lightGrey + width: units.gu(10) + onClicked: { + request.deny() + hide() + } + } + } + + // adjust default dialog visuals to custom design requirements + // (should not be needed when updated dialog implementation lands in UITK) + Binding { + target: __foreground + property: "margins" + value: units.gu(2) + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/meminfo.cpp webbrowser-app-0.23+16.04.20160413/src/app/meminfo.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/meminfo.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/meminfo.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,137 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "meminfo.h" + +// Qt +#include +#include +#include +#include +#include + +MemInfo::MemInfo(QObject* parent) + : QObject(parent) + , m_total(0) + , m_free(0) +{ + // Default interval: 5000 ms + m_timer.setInterval(5000); + connect(&m_timer, SIGNAL(timeout()), SLOT(update())); + // Active by default + m_timer.start(); +} + +MemInfo::~MemInfo() +{} + +const bool MemInfo::active() const +{ + return m_timer.isActive(); +} + +void MemInfo::setActive(bool active) +{ + if (active != m_timer.isActive()) { + if (active) { + m_timer.start(); + } else { + m_timer.stop(); + } + Q_EMIT activeChanged(); + } +} + +const int MemInfo::interval() const +{ + return m_timer.interval(); +} + +void MemInfo::setInterval(int interval) +{ + if (interval != m_timer.interval()) { + m_timer.setInterval(interval); + Q_EMIT intervalChanged(); + } +} + +const int MemInfo::total() const +{ + return m_total; +} + +const int MemInfo::free() const +{ + return m_free; +} + +void MemInfo::update() +{ +#if defined(Q_OS_LINUX) + // Inspired by glibtop_get_mem_s() + QFile meminfo(QStringLiteral("/proc/meminfo")); + if (!meminfo.open(QIODevice::ReadOnly)) { + return; + } + static QRegExp memTotalRegexp(QStringLiteral("MemTotal:\\s*(\\d+) kB\\n")); + static QRegExp memFreeRegexp(QStringLiteral("MemFree:\\s*(\\d+) kB\\n")); + static QRegExp buffersRegexp(QStringLiteral("Buffers:\\s*(\\d+) kB\\n")); + static QRegExp cachedRegexp(QStringLiteral("Cached:\\s*(\\d+) kB\\n")); + int parsedTotal = -1; + int parsedFree = -1; + int parsedBuffers = -1; + int parsedCached = -1; + while ((parsedTotal == -1) || (parsedFree == -1) || + (parsedBuffers == -1) || (parsedCached == -1)) { + QByteArray line = meminfo.readLine(); + if (line.isEmpty()) { + break; + } + if (memTotalRegexp.exactMatch(line)) { + parsedTotal = memTotalRegexp.cap(1).toInt(); + } else if (memFreeRegexp.exactMatch(line)) { + parsedFree = memFreeRegexp.cap(1).toInt(); + } else if (buffersRegexp.exactMatch(line)) { + parsedBuffers = buffersRegexp.cap(1).toInt(); + } else if (cachedRegexp.exactMatch(line)) { + parsedCached = cachedRegexp.cap(1).toInt(); + } + } + meminfo.close(); + if ((parsedTotal != -1) && (parsedFree != -1) && + (parsedBuffers != -1) && (parsedCached != -1)) { + bool totalUpdated = false; + if (parsedTotal != m_total) { + m_total = parsedTotal; + totalUpdated = true; + } + bool freeUpdated = false; + int newFree = parsedFree + parsedCached + parsedBuffers; + if (newFree != m_free) { + m_free = newFree; + freeUpdated = true; + } + if (totalUpdated) { + Q_EMIT totalChanged(); + } + if (freeUpdated) { + Q_EMIT freeChanged(); + } + } +#endif // Q_OS_LINUX +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/meminfo.h webbrowser-app-0.23+16.04.20160413/src/app/meminfo.h --- webbrowser-app-0.23+16.04.20151124/src/app/meminfo.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/meminfo.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,65 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __MEMINFO_H__ +#define __MEMINFO_H__ + +// Qt +#include +#include + +class MemInfo : public QObject +{ + Q_OBJECT + + Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged) + Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged) + + // Expressed in kB + Q_PROPERTY(int total READ total NOTIFY totalChanged) + Q_PROPERTY(int free READ free NOTIFY freeChanged) + +public: + MemInfo(QObject* parent=nullptr); + ~MemInfo(); + + const bool active() const; + void setActive(bool active); + + const int interval() const; + void setInterval(int interval); + + const int total() const; + const int free() const; + +Q_SIGNALS: + void activeChanged() const; + void intervalChanged() const; + void totalChanged() const; + void freeChanged() const; + +private Q_SLOTS: + void update(); + +private: + QTimer m_timer; + int m_total; + int m_free; +}; + +#endif // __MEMINFO_H__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/mime-database.cpp webbrowser-app-0.23+16.04.20160413/src/app/mime-database.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/mime-database.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/mime-database.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -16,6 +16,8 @@ * along with this program. If not, see . */ +#include + #include "mime-database.h" MimeDatabase::MimeDatabase(QObject* parent) @@ -31,3 +33,31 @@ } return QString(); } + +/*! + Provide the system icon name for a given mimetype +*/ +QString MimeDatabase::iconForMimetype(const QString& mimetypeString) const +{ + QMimeType mimetype = m_database.mimeTypeForName(mimetypeString); + if (mimetype.iconName().isEmpty() || !QIcon::hasThemeIcon(mimetype.iconName())) { + if (QIcon::hasThemeIcon(mimetype.genericIconName())) { + return mimetype.genericIconName(); + } else { + return ""; + } + } else { + return mimetype.iconName(); + } +} + +/*! + Provide the user friendly name for a given mimetype +*/ +QString MimeDatabase::nameForMimetype(const QString& mimetypeString) const +{ + QMimeType mimetype = m_database.mimeTypeForName(mimetypeString); + return mimetype.comment(); +} + + diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/mime-database.h webbrowser-app-0.23+16.04.20160413/src/app/mime-database.h --- webbrowser-app-0.23+16.04.20151124/src/app/mime-database.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/mime-database.h 2016-04-13 15:22:01.000000000 +0000 @@ -31,6 +31,9 @@ explicit MimeDatabase(QObject* parent=0); Q_INVOKABLE QString filenameToMimeType(const QString& filename) const; + Q_INVOKABLE QString iconForMimetype(const QString& mimetypeString) const; + Q_INVOKABLE QString nameForMimetype(const QString& mimetypeString) const; + private: QMimeDatabase m_database; diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/MimeTypeMapper.js webbrowser-app-0.23+16.04.20160413/src/app/MimeTypeMapper.js --- webbrowser-app-0.23+16.04.20151124/src/app/MimeTypeMapper.js 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/MimeTypeMapper.js 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014 Canonical Ltd. + * Copyright 2014-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,27 +18,54 @@ function mimeTypeToContentType(mimeType) { - if(mimeType.search("image/") === 0) { - return ContentType.Pictures; - } else if(mimeType.search("audio/") === 0) { - return ContentType.Music; - } else if(mimeType.search("video/") === 0) { - return ContentType.Videos; - } else if(mimeType.search("text/x-vcard") === 0 - || mimeType.search("text/vcard") === 0) { - return ContentType.Contacts; - } else if(mimeType.search("application/epub[+]zip") === 0 - || mimeType.search("application/vnd\.amazon\.ebook") === 0 - || mimeType.search("application/x-mobipocket-ebook") === 0 - || mimeType.search("application/x-fictionbook+xml") === 0 - || mimeType.search("application/x-ms-reader") === 0) { - return ContentType.EBooks; - } else if(mimeType.search("text/") === 0 - || mimeType.search("application/pdf") === 0 - || mimeType.search("application/x-pdf") === 0 - || mimeType.search("application/vnd\.pdf") === 0) { - return ContentType.Documents; + if (mimeType.search("image/") === 0) { + return ContentType.Pictures + } else if (mimeType.search("audio/") === 0) { + return ContentType.Music + } else if (mimeType.search("video/") === 0) { + return ContentType.Videos + } else if (mimeType.search("text/x-vcard") === 0 + || mimeType.search("text/vcard") === 0) { + return ContentType.Contacts + } else if (mimeType.search("application/epub[+]zip") === 0 + || mimeType.search("application/vnd\.amazon\.ebook") === 0 + || mimeType.search("application/x-mobipocket-ebook") === 0 + || mimeType.search("application/x-fictionbook+xml") === 0 + || mimeType.search("application/x-ms-reader") === 0) { + return ContentType.EBooks + } else if (mimeType.search("text/") === 0 + || mimeType.search("application/pdf") === 0 + || mimeType.search("application/x-pdf") === 0 + || mimeType.search("application/vnd\.pdf") === 0 + || mimeType.search("application/vnd\.oasis\.opendocument") === 0 + || mimeType.search("application/msword") === 0 + || mimeType.search("application/vnd\.openxmlformats-officedocument\.wordprocessingml\.document") === 0 + || mimeType.search("application/vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet") === 0 + || mimeType.search("application/vnd\.openxmlformats-officedocument\.presentationml\.presentation") === 0 + || mimeType.search("application/vnd\.ms-excel") === 0 + || mimeType.search("application/vnd\.ms-powerpoint") === 0) { + return ContentType.Documents } else { - return ContentType.Unknown; + return ContentType.Unknown + } +} + +function mimeTypeRegexForContentType(contentType) { + switch (contentType) { + case ContentType.Pictures: + return /image\/.*/; + case ContentType.Music: + return /audio\/.*/; + case ContentType.Videos: + return /video\/.*/; + case ContentType.Contacts: + return /text\/(x-vcard|vcard)/; + case ContentType.EBooks: + return /application\/(epub.*|vnd.amazon.ebook|x-mobipocket-ebook|x-fictionbook+xml|x-ms-reader)/; + case ContentType.Documents: + return /(text\/.*|application\/pdf|application\/x-pdf|application\/vnd\.pdf|application\/vnd\.oasis\.opendocument.*|application\/msword|application\/vnd\.openxmlformats-officedocument\.wordprocessingml\.document|application\/vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet|application\/vnd\.openxmlformats-officedocument\.presentationml\.presentation|application\/vnd\.ms-excel|application\/vnd\.ms-powerpoint)/; + case ContentType.Unknown: + case ContentType.All: + return /.*/; } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/qquickshortcut.cpp webbrowser-app-0.23+16.04.20160413/src/app/qquickshortcut.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/qquickshortcut.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/qquickshortcut.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,283 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtQuick module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickshortcut_p.h" + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +/*! + \qmltype Shortcut + \instantiates QQuickShortcut + \inqmlmodule QtQuick + \since 5.5 + \ingroup qtquick-input + \brief Provides keyboard shortcuts + + The Shortcut type provides a way of handling keyboard shortcuts. The shortcut can + be set to one of the \l{QKeySequence::StandardKey}{standard keyboard shortcuts}, + or it can be described with a string containing a sequence of up to four key + presses that are needed to \l{Shortcut::activated}{activate} the shortcut. + + \qml + Item { + id: view + + property int currentIndex + + Shortcut { + sequence: StandardKey.NextChild + onActivated: view.currentIndex++ + } + } + \endqml + + \sa Keys +*/ + +/*! \qmlsignal QtQuick::Shortcut::activated() + + This signal is emitted when the shortcut is activated. + + The corresponding handler is \c onActivated. +*/ + +/*! \qmlsignal QtQuick::Shortcut::activatedAmbiguously() + + This signal is emitted when the shortcut is activated ambigously, + meaning that it matches the start of more than one shortcut. + + The corresponding handler is \c onActivatedAmbiguously. +*/ + +QQuickShortcut::QQuickShortcut(QObject *parent) : QObject(parent), m_id(0), + m_enabled(true), m_completed(false), m_autorepeat(true), m_context(Qt::WindowShortcut) +{ +} + +QQuickShortcut::~QQuickShortcut() +{ + ungrabShortcut(); +} + +/*! + \qmlproperty keysequence QtQuick::Shortcut::sequence + + This property holds the shortcut's key sequence. The key sequence can be set + to one of the \l{QKeySequence::StandardKey}{standard keyboard shortcuts}, or + it can be described with a string containing a sequence of up to four key + presses that are needed to \l{Shortcut::activated}{activate} the shortcut. + + The default value is an empty key sequence. + + \qml + Shortcut { + sequence: "Ctrl+E,Ctrl+W" + onActivated: edit.wrapMode = TextEdit.Wrap + } + \endqml +*/ +QVariant QQuickShortcut::sequence() const +{ + return m_sequence; +} + +void QQuickShortcut::setSequence(const QVariant &sequence) +{ + if (sequence == m_sequence) + return; + + QKeySequence shortcut; + if (sequence.type() == QVariant::Int) + shortcut = QKeySequence(static_cast(sequence.toInt())); + else + shortcut = QKeySequence::fromString(sequence.toString()); + + grabShortcut(shortcut, m_context); + + m_sequence = sequence; + m_shortcut = shortcut; + emit sequenceChanged(); +} + +/*! + \qmlproperty bool QtQuick::Shortcut::enabled + + This property holds whether the shortcut is enabled. + + The default value is \c true. +*/ +bool QQuickShortcut::isEnabled() const +{ + return m_enabled; +} + +void QQuickShortcut::setEnabled(bool enabled) +{ + if (enabled == m_enabled) + return; + + if (m_id) + QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enabled, m_id, this); + + m_enabled = enabled; + emit enabledChanged(); +} + +/*! + \qmlproperty bool QtQuick::Shortcut::autoRepeat + + This property holds whether the shortcut can auto repeat. + + The default value is \c true. +*/ +bool QQuickShortcut::autoRepeat() const +{ + return m_autorepeat; +} + +void QQuickShortcut::setAutoRepeat(bool repeat) +{ + if (repeat == m_autorepeat) + return; + + if (m_id) + QGuiApplicationPrivate::instance()->shortcutMap.setShortcutAutoRepeat(repeat, m_id, this); + + m_autorepeat = repeat; + emit autoRepeatChanged(); +} + +/*! + \qmlproperty enumeration QtQuick::Shortcut::context + + This property holds the \l{Qt::ShortcutContext}{shortcut context}. + + Supported values are: + \list + \li \c Qt.WindowShortcut (default) - The shortcut is active when its parent item is in an active top-level window. + \li \c Qt.ApplicationShortcut - The shortcut is active when one of the application's windows are active. + \endlist + + \qml + Shortcut { + sequence: StandardKey.Quit + context: Qt.ApplicationShortcut + onActivated: Qt.quit() + } + \endqml +*/ +Qt::ShortcutContext QQuickShortcut::context() const +{ + return m_context; +} + +void QQuickShortcut::setContext(Qt::ShortcutContext context) +{ + if (context == m_context) + return; + + grabShortcut(m_shortcut, context); + + m_context = context; + emit contextChanged(); +} + +void QQuickShortcut::classBegin() +{ +} + +void QQuickShortcut::componentComplete() +{ + m_completed = true; + grabShortcut(m_shortcut, m_context); +} + +bool QQuickShortcut::event(QEvent *event) +{ + if (m_enabled && event->type() == QEvent::Shortcut) { + QShortcutEvent *se = static_cast(event); + if (se->shortcutId() == m_id && se->key() == m_shortcut){ + if (se->isAmbiguous()) + emit activatedAmbiguously(); + else + emit activated(); + return true; + } + } + return false; +} + +static bool qQuickShortcutContextMatcher(QObject *obj, Qt::ShortcutContext context) +{ + switch (context) { + case Qt::ApplicationShortcut: + return true; + case Qt::WindowShortcut: + while (obj && !obj->isWindowType()) { + obj = obj->parent(); + if (QQuickItem *item = qobject_cast(obj)) + obj = item->window(); + } + return obj && obj == QGuiApplication::focusWindow(); + default: + return false; + } +} + +void QQuickShortcut::grabShortcut(const QKeySequence &sequence, Qt::ShortcutContext context) +{ + ungrabShortcut(); + + if (m_completed && !sequence.isEmpty()) { + QGuiApplicationPrivate *pApp = QGuiApplicationPrivate::instance(); + m_id = pApp->shortcutMap.addShortcut(this, sequence, context, qQuickShortcutContextMatcher); + if (!m_enabled) + pApp->shortcutMap.setShortcutEnabled(false, m_id, this); + if (!m_autorepeat) + pApp->shortcutMap.setShortcutAutoRepeat(false, m_id, this); + } +} + +void QQuickShortcut::ungrabShortcut() +{ + if (m_id) { + QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(m_id, this); + m_id = 0; + } +} + +QT_END_NAMESPACE diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/qquickshortcut_p.h webbrowser-app-0.23+16.04.20160413/src/app/qquickshortcut_p.h --- webbrowser-app-0.23+16.04.20151124/src/app/qquickshortcut_p.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/qquickshortcut_p.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtQuick module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKSHORTCUT_P_H +#define QQUICKSHORTCUT_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QQuickShortcut : public QObject, public QQmlParserStatus +{ + Q_OBJECT + Q_INTERFACES(QQmlParserStatus) + Q_PROPERTY(QVariant sequence READ sequence WRITE setSequence NOTIFY sequenceChanged FINAL) + Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) + Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL) + Q_PROPERTY(Qt::ShortcutContext context READ context WRITE setContext NOTIFY contextChanged FINAL) + +public: + explicit QQuickShortcut(QObject *parent = Q_NULLPTR); + ~QQuickShortcut(); + + QVariant sequence() const; + void setSequence(const QVariant &sequence); + + bool isEnabled() const; + void setEnabled(bool enabled); + + bool autoRepeat() const; + void setAutoRepeat(bool repeat); + + Qt::ShortcutContext context() const; + void setContext(Qt::ShortcutContext context); + +Q_SIGNALS: + void sequenceChanged(); + void enabledChanged(); + void autoRepeatChanged(); + void contextChanged(); + + void activated(); + void activatedAmbiguously(); + +protected: + void classBegin() Q_DECL_OVERRIDE; + void componentComplete() Q_DECL_OVERRIDE; + bool event(QEvent *event) Q_DECL_OVERRIDE; + + void grabShortcut(const QKeySequence &sequence, Qt::ShortcutContext context); + void ungrabShortcut(); + +private: + int m_id; + bool m_enabled; + bool m_completed; + bool m_autorepeat; + QKeySequence m_shortcut; + Qt::ShortcutContext m_context; + QVariant m_sequence; +}; + +QT_END_NAMESPACE + +#endif // QQUICKSHORTCUT_P_H diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/session-storage.cpp webbrowser-app-0.23+16.04.20160413/src/app/session-storage.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/session-storage.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/session-storage.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -16,7 +16,11 @@ * along with this program. If not, see . */ +// system +#include + // Qt +#include #include // local @@ -73,10 +77,16 @@ void SessionStorage::store(const QString& data) const { - QFile file(m_dataFile); + if (m_dataFile.isEmpty()) { + return; + } + QString tempName = m_dataFile + "." + \ + QString::number(QDateTime::currentDateTime().toMSecsSinceEpoch());; + QFile file(tempName); if (file.open(QIODevice::WriteOnly)) { file.write(data.toUtf8()); file.close(); + rename(tempName.toUtf8().constData(), m_dataFile.toUtf8().constData()); } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/Share.qml webbrowser-app-0.23+16.04.20160413/src/app/Share.qml --- webbrowser-app-0.23+16.04.20151124/src/app/Share.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/Share.qml 2016-04-13 15:22:01.000000000 +0000 @@ -19,7 +19,7 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 -import Ubuntu.Content 0.1 +import Ubuntu.Content 1.3 Item { id: shareItem diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/single-instance-manager.cpp webbrowser-app-0.23+16.04.20160413/src/app/single-instance-manager.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/single-instance-manager.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/single-instance-manager.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,169 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Implementation loosely based on Chromium’s ProcessSingleton +// (https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/process_singleton_posix.cc). + +// Qt +#include +#include +#include +#include +#include +#include +#include +#include + +// local +#include "single-instance-manager.h" + +namespace { +const int kWaitForRunningInstanceToRespondMs = 1000; +const int kWaitForRunningInstanceToAckMs = 1000; +const int kDataStreamVersion = QDataStream::Qt_5_0; +const QString kHeaderToken = QStringLiteral("MESSAGE"); +const QString kAckToken = QStringLiteral("ACK"); +} + +SingleInstanceManager::SingleInstanceManager(QObject* parent) + : QObject(parent) +{} + +bool SingleInstanceManager::listen(const QString& name) +{ + if (m_server.listen(name)) { + connect(&m_server, SIGNAL(newConnection()), + SLOT(onNewInstanceConnected())); + return true; + } + return false; +} + +bool SingleInstanceManager::run(const QStringList& arguments) +{ + if (m_server.isListening()) { + return false; + } + + QDir profile(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); + if (!profile.exists()) { + if (!QDir::root().mkpath(profile.absolutePath())) { + qCritical() << "Failed to create profile directory," + "unable to ensure a single instance of the application"; + return false; + } + } + QString name = profile.absoluteFilePath(QStringLiteral("SingletonSocket")); + // XXX: Unix domain sockets limit the length of the pathname to 108 characters. + // We should probably handle QAbstractSocket::HostNotFoundError explicitly. + + if (listen(name)) { + return true; + } + + QLocalSocket socket; + socket.connectToServer(name); + if (socket.waitForConnected(kWaitForRunningInstanceToRespondMs)) { + qWarning() << "Passing arguments to already running instance"; + QByteArray block; + QDataStream message(&block, QIODevice::WriteOnly); + message.setVersion(kDataStreamVersion); + message << kHeaderToken; + Q_FOREACH(const QString& argument, arguments) { + message << argument; + } + socket.write(block); + socket.waitForBytesWritten(); + + if (socket.waitForReadyRead(kWaitForRunningInstanceToAckMs)) { + block = socket.readAll(); + QDataStream response(&block, QIODevice::ReadOnly); + response.setVersion(kDataStreamVersion); + QString ack; + response >> ack; + if (ack != kAckToken) { + qCritical() << "Received malformed ack from already running instance"; + } + } else { + qCritical() << "Already running instance did not acknowledge message reception"; + } + socket.disconnectFromServer(); + } else { + // Failed to talk to already running instance, assume it crashed. + if (QLocalServer::removeServer(name)) { + if (listen(name)) { + return true; + } else { + qCritical() << "Failed to launch single instance:" + << m_server.errorString(); + } + } else { + qCritical() << "Failed to recover from a previous crash"; + } + } + + return false; +} + +void SingleInstanceManager::onNewInstanceConnected() +{ + if (m_server.hasPendingConnections()) { + QLocalSocket* socket = m_server.nextPendingConnection(); + connect(socket, SIGNAL(readyRead()), SLOT(onReadyRead())); + connect(socket, SIGNAL(disconnected()), SLOT(onDisconnected())); + } +} + +void SingleInstanceManager::onReadyRead() +{ + QLocalSocket* socket = qobject_cast(sender()); + if (!socket) { + return; + } + + QByteArray block = socket->readAll(); + QDataStream message(&block, QIODevice::ReadOnly); + message.setVersion(kDataStreamVersion); + QStringList arguments; + while (!message.atEnd()) { + QString token; + message >> token; + arguments << token; + } + if (arguments.takeFirst() != kHeaderToken) { + qCritical() << "Received a malformed message from another instance"; + return; + } + Q_EMIT newInstanceLaunched(arguments); + + // Send ack to new instance + block.clear(); + QDataStream ack(&block, QIODevice::WriteOnly); + ack.setVersion(kDataStreamVersion); + ack << kAckToken; + socket->write(block); + socket->flush(); +} + +void SingleInstanceManager::onDisconnected() +{ + QLocalSocket* socket = qobject_cast(sender()); + if (socket) { + socket->deleteLater(); + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/single-instance-manager.h webbrowser-app-0.23+16.04.20160413/src/app/single-instance-manager.h --- webbrowser-app-0.23+16.04.20151124/src/app/single-instance-manager.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/single-instance-manager.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __SINGLE_INSTANCE_MANAGER_H__ +#define __SINGLE_INSTANCE_MANAGER_H__ + +// Qt +#include +#include + +class QString; +class QStringList; + +class SingleInstanceManager : public QObject +{ + Q_OBJECT + +public: + SingleInstanceManager(QObject* parent=nullptr); + + bool run(const QStringList& arguments); + +Q_SIGNALS: + void newInstanceLaunched(const QStringList& arguments) const; + +private Q_SLOTS: + void onNewInstanceConnected(); + void onReadyRead(); + void onDisconnected(); + +private: + QLocalServer m_server; + bool listen(const QString& name); +}; + +#endif // __SINGLE_INSTANCE_MANAGER__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -1 +1,2 @@ add_subdirectory(Ubuntu) +add_subdirectory(Unity) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1 @@ +add_subdirectory(InputInfo) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,40 @@ +# This is a temporary snapshot of the WIP QInputInfo API as we +# require this in unity now but upstream isn't finished yet. +# Eventually this should be dropped in favor of the upstream +# QInputInfo API. + +project(InputInfo) + +find_package(Qt5Core REQUIRED) +find_package(Qt5Quick REQUIRED) + +include(FindPkgConfig) +pkg_check_modules(LIBUDEV REQUIRED libudev) +pkg_check_modules(LIBEVDEV REQUIRED libevdev) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${LIBUDEV_INCLUDE_DIRS} + ${LIBEVDEV_INCLUDE_DIRS} +) + +set(InputInfo_SOURCES + plugin.cpp + qinputinfo.cpp + qdeclarativeinputdevicemodel.cpp + linux/qinputdeviceinfo_linux.cpp +) + +add_library(InputInfo STATIC + ${InputInfo_SOURCES} +) + +target_link_libraries(InputInfo + ${LIBUDEV_LDFLAGS} + ${LIBEVDEV_LDFLAGS} +) + +qt5_use_modules(InputInfo Core Qml Quick) + +#add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,291 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSystems module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qinputdeviceinfo_linux_p.h" + +#include +#include +#include +#include +#include +#include +#include + +QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) : + QObject(parent), + currentFilter(QInputDevice::Unknown), + udevice(0) +{ + QTimer::singleShot(250,this,SLOT(init())); +} + +QInputDeviceManagerPrivate::~QInputDeviceManagerPrivate() +{ + udev_unref(udevice); + udev_monitor_unref(udevMonitor); +} + +void QInputDeviceManagerPrivate::init() +{ + if (!udevice) + udevice = udev_new(); + + udev_list_entry *devices; + udev_list_entry *dev_list_entry; + udev_device *dev; + + QString subsystem = QStringLiteral("input"); + struct udev_enumerate *enumerate = 0; + + if (udevice) { + + udevMonitor = udev_monitor_new_from_netlink(udevice, "udev"); + udev_monitor_filter_add_match_subsystem_devtype(udevMonitor, subsystem.toLatin1(), NULL); + enumerate = udev_enumerate_new(udevice); + udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1()); + + udev_monitor_enable_receiving(udevMonitor); + notifierFd = udev_monitor_get_fd(udevMonitor); + + notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this); + connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges())); + + udev_enumerate_scan_devices(enumerate); + devices = udev_enumerate_get_list_entry(enumerate); + + udev_list_entry_foreach(dev_list_entry, devices) { + const char *path; + path = udev_list_entry_get_name(dev_list_entry); + + dev = udev_device_new_from_syspath(udevice, path); + if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) { + QInputDevice *iDevice = addDevice(dev); + if (iDevice && !iDevice->devicePath().isEmpty()) { + deviceMap.insert(iDevice->devicePath(),iDevice); + } + } + udev_device_unref(dev); + } + udev_enumerate_unref(enumerate); + } + // udev_unref(udevice); + Q_FOREACH (const QString &devicePath, deviceMap.keys()) { + Q_EMIT deviceAdded(devicePath); + } + Q_EMIT ready(); +} + +QInputDevice::InputTypeFlags QInputDeviceManagerPrivate::getInputTypeFlags(struct udev_device *dev) +{ + QInputDevice::InputTypeFlags flags = QInputDevice::Unknown; + if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEY"), "1") == 0 ) { + flags |= QInputDevice::Button; + } + if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_MOUSE"), "1") == 0) { + flags |= QInputDevice::Mouse; + } + if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD"), "1") == 0) { + flags |= QInputDevice::TouchPad; + } + if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN"), "1") == 0 + || qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_TABLET"), "1") == 0) { + flags |= QInputDevice::TouchScreen; + } + if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 ) { + flags |= QInputDevice::Keyboard; + } + if (!QString::fromLatin1(udev_device_get_property_value(dev, "SW")).isEmpty()) { + flags |= QInputDevice::Switch; + } + + return flags; +} + +QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev) +{ + QString eventPath = QString::fromLatin1(udev_device_get_sysname(udev)); + + if (eventPath.contains(QStringLiteral("event"))) + eventPath.prepend(QStringLiteral("/dev/input/")); + + if (deviceMap.contains(eventPath)) { + return Q_NULLPTR; + } + struct libevdev *dev = NULL; + int fd; + int rc = 1; + QInputDevice *inputDevice; + inputDevice = addUdevDevice(udev); + if (!inputDevice) { + return Q_NULLPTR; + } + eventPath = inputDevice->devicePath(); + + qDebug() << "Input device added:" << inputDevice->name() << inputDevice->devicePath() << inputDevice->type(); + + fd = open(eventPath.toLatin1(), O_RDONLY|O_NONBLOCK); + if (fd == -1) { + return inputDevice; + } + rc = libevdev_new_from_fd(fd, &dev); + if (rc < 0) { + qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")"; + return Q_NULLPTR; + } + + for (int i = 0; i < EV_MAX; i++) { + if (i == EV_KEY || i == EV_SW || i == EV_REL + || i == EV_REL || i == EV_ABS) { + for (int j = 0; j < libevdev_event_type_get_max(i); j++) { + if (libevdev_has_event_code(dev, i, j)) { + switch (i) { + case EV_KEY: + inputDevice->addButton(j); + break; + case EV_SW: + inputDevice->addSwitch(j); + break; + case EV_REL: + inputDevice->addRelativeAxis(j); + break; + case EV_ABS: + inputDevice->addAbsoluteAxis(j); + break; + }; + } + } + } + } + + return inputDevice; +} + +void QInputDeviceManagerPrivate::addDetails(struct udev_device *) +{ +} + +void QInputDeviceManagerPrivate::removeDevice(const QString &path) +{ + // this path is not a full evdev path + Q_FOREACH (const QString devicePath, deviceMap.keys()) { + if (devicePath.contains(path)) { + qDebug() << "Input device removed:" << deviceMap.value(devicePath)->name() << devicePath << deviceMap.value(devicePath)->type(); + deviceMap.remove(devicePath); + Q_EMIT deviceRemoved(devicePath); + } + } +} + +QInputDevice *QInputDeviceManagerPrivate::addUdevDevice(struct udev_device *udev) +{ + QInputDevice *iDevice; + + struct udev_list_entry *list; + struct udev_list_entry *node; + + list = udev_device_get_properties_list_entry (udev); + QString syspath = QString::fromLatin1(udev_device_get_syspath(udev)); + QDir sysdir(syspath); + + QStringList infoList = sysdir.entryList(QStringList() << QStringLiteral("event*"),QDir::Dirs); + + if (infoList.count() > 0) { + QString token = infoList.at(0); + + token.prepend(QStringLiteral("/dev/input/")); + iDevice = new QInputDevice(this); + iDevice->setDevicePath(token); + } else { + return Q_NULLPTR; + } + udev_list_entry_foreach (node, list) { + + QString key = QString::fromLatin1(udev_list_entry_get_name(node)); + QString value = QString::fromLatin1(udev_list_entry_get_value(node)); + + if (key == QStringLiteral("NAME")) { + iDevice->setName(value.remove(QStringLiteral("\""))); + } + } + iDevice->setType(getInputTypeFlags(udev)); + return iDevice; +} + +void QInputDeviceManagerPrivate::onUDevChanges() +{ + if (!udevMonitor) + return; + + udev_device *dev = udev_monitor_receive_device(udevMonitor); + + if (dev) { + if (qstrcmp(udev_device_get_subsystem(dev), "input") == 0 ) { + QString eventPath = QString::fromLatin1(udev_device_get_sysname(dev)); + + QString action = QString::fromStdString(udev_device_get_action(dev)); + + if (!eventPath.contains(QStringLiteral("/dev/input/"))) + eventPath.prepend(QStringLiteral("/dev/input/")); + + if (action == QStringLiteral("add")) { + if (deviceMap.contains(eventPath)){ + udev_device_unref(dev); + return; + } + + QInputDevice *iDevice = addDevice(dev); + if (!iDevice) { + delete iDevice; + return; + } + iDevice->setType(getInputTypeFlags(dev)); + udev_device_unref(dev); + + deviceMap.insert(eventPath,iDevice); + + Q_EMIT deviceAdded(eventPath); + + } else if (action == QStringLiteral("remove")) { + removeDevice(eventPath); + } + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSystems module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QINPUTDEVICEINFO_LINUX_P_H +#define QINPUTDEVICEINFO_LINUX_P_H + +#include +#include "qinputinfo.h" +#include + +class QInputDevicePrivate : public QObject +{ + Q_OBJECT +public: + explicit QInputDevicePrivate(QObject *parent = 0); + + QString name; + QString devicePath; + QList buttons; //keys + QList switches; + QList relativeAxis; + QList absoluteAxis; + QInputDevice::InputTypeFlags type; +}; + +class QInputDeviceManagerPrivate : public QObject +{ + Q_OBJECT +public: + explicit QInputDeviceManagerPrivate(QObject *parent = 0); + ~QInputDeviceManagerPrivate(); + QVector deviceList; + QMap deviceMap; + static QInputDeviceManagerPrivate * instance(); + QInputDevice::InputType currentFilter; + +Q_SIGNALS: + void deviceAdded(const QString &); + void deviceRemoved(const QString &); + void ready(); + +private: + QInputDevice *addDevice(struct udev_device *udev); + QInputDevice *addUdevDevice(struct udev_device *); + + QInputDevice *addDevice(const QString &path); + void removeDevice(const QString &path); + QSocketNotifier *notifier; + int notifierFd; + struct udev_monitor *udevMonitor; + QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *); + struct udev *udevice; + void addDetails(struct udev_device *); + +private Q_SLOTS: + void onUDevChanges(); + void init(); +}; + +#endif // QINPUTDEVICEINFO_LINUX_P_H diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/plugin.cpp webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/plugin.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/plugin.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/plugin.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This program 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; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +// Qt +#include + +// self +#include "plugin.h" + +// local +#include "qdeclarativeinputdevicemodel_p.h" + +void InputInfoPlugin::registerTypes(const char *uri) +{ + int major = 0; + int minor = 1; + qmlRegisterType(uri, major, minor, "InputDeviceModel"); + qmlRegisterType(uri, major, minor, "InputInfo"); +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/plugin.h webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/plugin.h --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/plugin.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/plugin.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,30 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This program 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; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +#ifndef INPUTINFO_PLUGIN_H +#define INPUTINFO_PLUGIN_H + +#include + +class InputInfoPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") +public: + void registerTypes(const char *uri); +}; + +#endif // INPUTINFO_PLUGIN_H diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,196 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Jolla. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSystems module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "qdeclarativeinputdevicemodel_p.h" +#include "qinputinfo.h" + +QDeclarativeInputDeviceModel::QDeclarativeInputDeviceModel(QObject *parent) : + QAbstractListModel(parent), + deviceInfo(new QInputDeviceManager), + currentFilter(QInputDevice::Unknown) +{ + connect(deviceInfo,SIGNAL(ready()),this,SLOT(updateDeviceList())); + connect(deviceInfo, &QInputDeviceManager::deviceAdded,this,&QDeclarativeInputDeviceModel::addedDevice); + connect(deviceInfo, &QInputDeviceManager::deviceRemoved,this,&QDeclarativeInputDeviceModel::removedDevice); +} + +QDeclarativeInputDeviceModel::~QDeclarativeInputDeviceModel() +{ + delete deviceInfo; +} + +QVariant QDeclarativeInputDeviceModel::data(const QModelIndex &index, int role) const +{ + switch (role) { + case ServiceRole: + return QVariant::fromValue(static_cast(inputDevices.value(index.row()))); + break; + case NameRole: + return QVariant::fromValue(static_cast(inputDevices.value(index.row())->name())); + break; + case DevicePathRole: + return QVariant::fromValue(static_cast(inputDevices.value(index.row())->devicePath())); + break; + case ButtonsRole: + return QVariant::fromValue(static_cast >(inputDevices.value(index.row())->buttons())); + break; + case SwitchesRole: + return QVariant::fromValue(static_cast >(inputDevices.value(index.row())->switches())); + break; + case RelativeAxisRole: + return QVariant::fromValue(static_cast >(inputDevices.value(index.row())->relativeAxis())); + break; + case AbsoluteAxisRole: + return QVariant::fromValue(static_cast >(inputDevices.value(index.row())->absoluteAxis())); + break; + case TypesRole: + return QVariant::fromValue(static_cast(inputDevices.value(index.row())->type())); + break; + }; + + return QVariant(); +} + +int QDeclarativeInputDeviceModel::rowCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent); + + return inputDevices.count(); +} + +int QDeclarativeInputDeviceModel::indexOf(const QString &devicePath) const +{ + int idx(-1); + Q_FOREACH (QInputDevice *device, inputDevices) { + idx++; + if (device->devicePath() == devicePath) return idx; + } + + return -1; +} + +QInputDevice *QDeclarativeInputDeviceModel::get(int index) const +{ + if (index < 0 || index > inputDevices.count()) + return 0; + return inputDevices.value(index); +} + +void QDeclarativeInputDeviceModel::updateDeviceList() +{ + QVector newDevices = deviceInfo->deviceListOfType(currentFilter); + + int numNew = newDevices.count(); + + for (int i = 0; i < numNew; i++) { + int j = inputDevices.indexOf(newDevices.value(i)); + + if (j == -1) { + beginInsertRows(QModelIndex(), i, i); + inputDevices.insert(i, newDevices.value(i)); + endInsertRows(); + Q_EMIT countChanged(); + } else if (i != j) { + // changed its position -> move it + QInputDevice* device = inputDevices.value(j); + beginMoveRows(QModelIndex(), j, j, QModelIndex(), i); + inputDevices.remove(j); + inputDevices.insert(i, device); + endMoveRows(); + Q_EMIT countChanged(); + } //else { + QModelIndex changedIndex(this->index(j, 0, QModelIndex())); + Q_EMIT dataChanged(changedIndex, changedIndex); + } + + int numOld = inputDevices.count(); + if (numOld > numNew) { + beginRemoveRows(QModelIndex(), numNew, numOld - 1); + inputDevices.remove(numNew, numOld - numNew); + endRemoveRows(); + Q_EMIT countChanged(); + } +} + +void QDeclarativeInputDeviceModel::addedDevice(const QString &devicePath) +{ + updateDeviceList(); + Q_EMIT deviceAdded(devicePath); +} + +void QDeclarativeInputDeviceModel::removedDevice(const QString &devicePath) +{ + updateDeviceList(); + Q_EMIT deviceRemoved(devicePath); +} + +QHash QDeclarativeInputDeviceModel::roleNames() const +{ + QHash roles; + roles[NameRole] = "name"; + roles[DevicePathRole] = "devicePath"; + roles[ButtonsRole] = "buttons"; + roles[SwitchesRole] = "switches"; + roles[RelativeAxisRole] = "rAxis"; + roles[AbsoluteAxisRole] = "aAxis"; + roles[TypesRole] = "types"; + return roles; +} + +/* + * Returns the currently set device filter. + * */ +QInputDevice::InputType QDeclarativeInputDeviceModel::deviceFilter() +{ + return currentFilter; +} + +/* + * Sets the current input device filter to filter. + * */ +void QDeclarativeInputDeviceModel::setDeviceFilter(QInputDevice::InputType filter) +{ + if (filter != currentFilter) { + deviceInfo->setDeviceFilter(filter); + currentFilter = filter; + updateDeviceList(); + Q_EMIT deviceFilterChanged(filter); + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Jolla. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSystems module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVEINPUTDEVICEMODEL_H +#define QDECLARATIVEINPUTDEVICEMODEL_H + +#include +#include +#include "qinputinfo.h" + +class QDeclarativeInputDeviceModel : public QAbstractListModel +{ + Q_OBJECT + Q_DISABLE_COPY(QDeclarativeInputDeviceModel) + Q_PROPERTY(QInputDevice::InputType deviceFilter READ deviceFilter WRITE setDeviceFilter NOTIFY deviceFilterChanged) + + Q_PROPERTY(int count READ rowCount NOTIFY countChanged) + +public: + enum ItemRoles { + ServiceRole = Qt::UserRole + 1, + NameRole, + DevicePathRole, + ButtonsRole, + SwitchesRole, + RelativeAxisRole, + AbsoluteAxisRole, + TypesRole + }; + + explicit QDeclarativeInputDeviceModel(QObject *parent = 0); + virtual ~QDeclarativeInputDeviceModel(); + + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const; + + void setDeviceFilter(QInputDevice::InputType filter); + QInputDevice::InputType deviceFilter(); + + Q_INVOKABLE int indexOf(const QString &devicePath) const; + + Q_INVOKABLE QInputDevice *get(int index) const; + QHash roleNames() const; + +Q_SIGNALS: + void deviceAdded(const QString &devicePath); + void deviceRemoved(const QString &devicePath); + void deviceFilterChanged(const QInputDevice::InputType filter); + void countChanged(); + +public Q_SLOTS: + void updateDeviceList(); +private: + QInputDeviceManager *deviceInfo; + QVector inputDevices; + QInputDevice::InputType currentFilter; + +private Q_SLOTS: + void addedDevice(const QString &); + void removedDevice(const QString &path); + +}; + +#endif // QDECLARATIVEINPUTDEVICEMODEL_H diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.cpp webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,270 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSystems module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qinputinfo.h" + +#if defined(UNITY_MOCKS) +#include "qinputdeviceinfo_mock_p.h" +#elif defined(Q_OS_LINUX) +#include "linux/qinputdeviceinfo_linux_p.h" +#endif + +Q_GLOBAL_STATIC(QInputDeviceManagerPrivate, inputDeviceManagerPrivate) + +QT_BEGIN_NAMESPACE + +QInputDeviceManagerPrivate * QInputDeviceManagerPrivate::instance() +{ + QInputDeviceManagerPrivate *priv = inputDeviceManagerPrivate(); + return priv; +} + +QInputDevicePrivate::QInputDevicePrivate(QObject *parent) : + QObject(parent), + type(QInputDevice::Unknown) +{ +} + +QInputDevice::QInputDevice(QObject *parent) : + QObject(parent), + d_ptr(new QInputDevicePrivate(this)) +{ +} + +/* + * Returns the name of this input device. + */ +QString QInputDevice::name() const +{ + return d_ptr->name; +} + +/* + * Sets the name of this input device to \b name. + */ +void QInputDevice::setName(const QString &name) +{ + d_ptr->name = name; +} + +/* + * Returns the device path of this device. + */ +QString QInputDevice::devicePath() const +{ + return d_ptr->devicePath; +} + +/* + * Sets the device ppath of this device to /b path. + */ +void QInputDevice::setDevicePath(const QString &path) +{ + d_ptr->devicePath = path; +} + +/* + * Returns the number of buttons this device has. + */ +QList QInputDevice::buttons() const +{ + return d_ptr->buttons; +} + +/* + * Adds a button + */ +void QInputDevice::addButton(int buttonCode) +{ + d_ptr->buttons.append(buttonCode); +} + +/* + * Returns the number of switch of this device. + */ +QList QInputDevice::switches() const +{ + return d_ptr->switches; +} + +/* + * Adds a switch + */ +void QInputDevice::addSwitch(int switchCode) +{ + d_ptr->switches.append(switchCode); +} + +/* + * Returns a list of the relative axis of this device + */ +QList QInputDevice::relativeAxis() const +{ + return d_ptr->relativeAxis; +} + +/* + */ +void QInputDevice::addRelativeAxis(int axisCode) +{ + d_ptr->relativeAxis.append(axisCode); +} + +/* + * Returns a list of the absolute axis of this device + */ +QList QInputDevice::absoluteAxis() const +{ + return d_ptr->absoluteAxis; +} + +/* + */ +void QInputDevice::addAbsoluteAxis(int axisCode) +{ + d_ptr->absoluteAxis.append(axisCode); +} + +/* + * Returns a QInputDevice::InputTypeFlags of all the types of types. + */ +QInputDevice::InputTypeFlags QInputDevice::type() const +{ + return d_ptr->type; +} + +/* + */ +void QInputDevice::setType(QInputDevice::InputTypeFlags type) //? setTypes? +{ + d_ptr->type = type; +} + +QInputDeviceManager::QInputDeviceManager(QObject *parent) : + QObject(parent), + d_ptr(inputDeviceManagerPrivate) +{ + connect(d_ptr, &QInputDeviceManagerPrivate::deviceAdded,this,&QInputDeviceManager::addedDevice); + connect(d_ptr, &QInputDeviceManagerPrivate::deviceRemoved,this,&QInputDeviceManager::deviceRemoved); + + connect(d_ptr,SIGNAL(ready()),this,SIGNAL(ready())); +} + +/* + * Returns a QMap of known input devices. + */ +QMap QInputDeviceManager::deviceMap() +{ + return d_ptr->deviceMap; +} + +/* + */ +void QInputDeviceManager::addedDevice(const QString & devicePath) +{ + Q_EMIT deviceAdded(devicePath); +} + +/* + * Returns a QVector of InputDevices of type filter + * */ +QVector QInputDeviceManager::deviceListOfType(QInputDevice::InputType filter) +{ + QVector dList; + QMapIterator i(d_ptr->deviceMap); + while (i.hasNext()) { + i.next(); + if (i.value()->type().testFlag(filter) || filter == QInputDevice::Unknown) { + dList.append(i.value()); + } + } + return dList; +} + +/* + * Returns the number of input devices with the currently set QInputDevice::InputType filter. + * If no device filter has been set, returns number of all available input devices. + * If filter has not been set, returns all available input devices + */ +int QInputDeviceManager::deviceCount() const +{ + return deviceCount(static_cast< QInputDevice::InputType >(d_ptr->currentFilter)); +} + +/* + * Returns the number of input devices of the type filter. + */ +int QInputDeviceManager::deviceCount(const QInputDevice::InputType filter) const +{ + int dList = 0; + QMapIterator i(d_ptr->deviceMap); + while (i.hasNext()) { + i.next(); +// qDebug() << i.value()->name() << i.value()->devicePath(); +// qDebug() << i.value()->type() << i.value()->type().testFlag(filter); + + if (i.value()->type().testFlag(filter)) { + dList++; + } + } + return dList; +} + +/* + * Returns the currently set device filter. + * */ +QInputDevice::InputType QInputDeviceManager::deviceFilter() +{ + return d_ptr->currentFilter; +} + +/* + * Sets the current input device filter to filter. + * */ +void QInputDeviceManager::setDeviceFilter(QInputDevice::InputType filter) +{ + if (filter != d_ptr->currentFilter) { + d_ptr->currentFilter = filter; + Q_EMIT deviceFilterChanged(filter); + } +} + +QT_END_NAMESPACE diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.h webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.h --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qinputinfo.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,143 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Canonical, Ltd. and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSystems module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QINPUTINFO_H +#define QINPUTINFO_H + +#include +#include +#include +#include +#include + +class QInputDeviceManagerPrivate; +class QInputDevicePrivate; +class QInputDevice; + +class QInputDeviceManager; + +class QInputDevice : public QObject +{ + Q_OBJECT + Q_ENUMS(InputType) + Q_FLAGS(InputType InputTypeFlags) + friend class QInputDeviceManagerPrivate; + +public: + + enum InputType { + Unknown = 0, + Button = 1, + Mouse = 2, + TouchPad = 4, + TouchScreen = 8, + Keyboard = 16, + Switch = 32 + }; + Q_ENUMS(InputType) + Q_DECLARE_FLAGS(InputTypeFlags, InputType) + + explicit QInputDevice(QObject *parent = 0); + QString name() const; + QString devicePath() const; + QList buttons() const; //keys event code + QList switches() const; + QList relativeAxis() const; + QList absoluteAxis() const; + QInputDevice::InputTypeFlags type() const; + +private: + + QInputDevicePrivate *d_ptr; + void setName(const QString &); + void setDevicePath(const QString &); + void addButton(int); + void addSwitch(int); + void addRelativeAxis(int); + void addAbsoluteAxis(int); + void setType(QInputDevice::InputTypeFlags flags); + +}; + +Q_DECLARE_METATYPE(QInputDevice::InputType) +Q_DECLARE_METATYPE(QInputDevice::InputTypeFlags) + +class QInputDeviceManagerPrivate; + +class QInputDeviceManager : public QObject +{ + Q_OBJECT + Q_PROPERTY(int deviceCount READ deviceCount NOTIFY deviceCountChanged) + Q_PROPERTY(QInputDevice::InputType deviceFilter READ deviceFilter WRITE setDeviceFilter NOTIFY deviceFilterChanged) +public: + + explicit QInputDeviceManager(QObject *parent = 0); + + int deviceCount() const; + int deviceCount(const QInputDevice::InputType filter) const; + + void setDeviceFilter(QInputDevice::InputType filter); + QInputDevice::InputType deviceFilter(); + + QMap deviceMap(); + Q_INVOKABLE QVector deviceListOfType(QInputDevice::InputType filter); + +Q_SIGNALS: + + void deviceAdded(const QString & devicePath); + void deviceRemoved(const QString & devicePath); + + void ready(); + void deviceCountChanged(int count); + void deviceFilterChanged(const QInputDevice::InputType filter); + +public Q_SLOTS: + void addedDevice(const QString & devicePath); + +private: + Q_DISABLE_COPY(QInputDeviceManager) +#if !defined(QT_SIMULATOR) + QInputDeviceManagerPrivate *const d_ptr; + Q_DECLARE_PRIVATE(QInputDeviceManager) +#endif +}; + +#endif // QINPUTINFO_H diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qmldir webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qmldir --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/plugins/Unity/InputInfo/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/plugins/Unity/InputInfo/qmldir 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,3 @@ +module Unity.InputInfo +plugin InputInfo +typeinfo InputInfo.qmltypes diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/unity8/README webbrowser-app-0.23+16.04.20160413/src/app/unity8/README --- webbrowser-app-0.23+16.04.20151124/src/app/unity8/README 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/unity8/README 2016-04-13 15:22:01.000000000 +0000 @@ -1,11 +1,19 @@ Code in this directory was copied over from unity8. + +Ubuntu.Gestures: - first import: 2015-02-04, at revision 1583 of lp:unity8 - last sync: 2015-03-17, at revision 1663 of lp:unity8 +Unity.InputInfo: + - first import: 2016-01-28, at revision 2143 of lp:unity8 + The structure of the directories has been kept identical, to ease syncing the code in the future. Minor changes were made to the build system to integrate it with the existing webbrowser-app code base. -The goal is to eventually have those components moved over to the UITK, thus -removing the need for a copy here. See -https://docs.google.com/a/canonical.com/document/d/1_ljZunMXWqJfrBGEkCp0peVD8gq6-E4ZMFpuH0PVKRc. +As of 2015-12-09, the SwipeArea component is available in the UITK, so we should +start using it instead of building a local copy of Ubuntu.Gestures. This is +currently blocked on https://launchpad.net/bugs/1459362. + +The Unity.InputInfo plugin should be replaced by an upstream Qt API in the near +future. diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/AddressBar.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/AddressBar.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/AddressBar.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/AddressBar.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -43,6 +43,7 @@ property bool showFavicon: true property bool findInPageMode: false property var findController: null + property color fgColor: Theme.palette.normal.baseText property var securityStatus: null @@ -54,8 +55,6 @@ readonly property Item __actionButton: action readonly property Item __bookmarkToggle: bookmarkToggle - height: textField.height - function selectAll() { textField.selectAll() } @@ -117,7 +116,7 @@ name: addressbar.loading ? "stop" : reload ? "reload" : looksLikeAUrl ? "stock_website" : "search" - color: UbuntuColors.darkGrey + color: addressbar.fgColor MouseArea { objectName: "actionButton" @@ -142,7 +141,7 @@ Icon { id: secure name: "network-secure" - color: UbuntuColors.darkGrey + color: addressbar.fgColor height: parent.height width: height visible: internal.idle && internal.secureConnection @@ -159,7 +158,7 @@ Icon { id: securityAlert name: "security-alert" - color: UbuntuColors.darkGrey + color: addressbar.fgColor height: parent.height width: height visible: internal.idle && internal.securityWarning @@ -201,7 +200,7 @@ objectName: "findInPageCounter" anchors.verticalCenter: parent.verticalCenter fontSize: "x-small" - color: UbuntuColors.darkGrey + color: addressbar.fgColor opacity: findController && findController.count > 0 ? 1.0 : 0.6 visible: findInPageMode @@ -226,7 +225,7 @@ anchors.centerIn: parent name: addressbar.bookmarked ? "starred" : "non-starred" - color: addressbar.bookmarked ? UbuntuColors.orange : UbuntuColors.darkGrey + color: addressbar.bookmarked ? UbuntuColors.orange : addressbar.fgColor } onClicked: addressbar.toggleBookmark() @@ -239,7 +238,7 @@ } font.pixelSize: FontUtils.sizeToPixels("small") - color: UbuntuColors.darkGrey + color: addressbar.fgColor inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhUrlCharactersOnly placeholderText: findInPageMode ? i18n.tr("find in page") Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/bottom_edge_hint@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/bottom_edge_hint@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/broken_lock@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/broken_lock@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/stock_website.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/stock_website.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-active@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-active@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-active-desktop@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-active-desktop@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-artwork.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-artwork.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-hover@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-hover@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-hover-desktop@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-hover-desktop@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-non-active@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-non-active@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-non-active-desktop@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-non-active-desktop@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/tab-shadow-narrow@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/tab-shadow-narrow@27.png differ Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/assets/toolbar-dropshadow.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/assets/toolbar-dropshadow.png differ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarkOptions.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarkOptions.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarkOptions.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarkOptions.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -100,7 +100,7 @@ anchors.right: parent.right text: i18n.tr("OK") color: UbuntuColors.green - onClicked: hide() + onClicked: bookmarkOptions.destroy() } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksFoldersView.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksFoldersView.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksFoldersView.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksFoldersView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -28,6 +28,8 @@ property alias interactive: bookmarksFolderListView.interactive property url homeBookmarkUrl + readonly property Item currentItem: bookmarksFolderListView.currentItem ? bookmarksFolderListView.currentItem.currentItem : null + signal bookmarkClicked(url url) signal bookmarkRemoved(url url) @@ -40,22 +42,42 @@ ListView { id: bookmarksFolderListView + objectName: "bookmarksFolderListView" anchors.fill: parent interactive: false focus: true model: bookmarksFolderListModel delegate: Loader { + objectName: "bookmarkFolderDelegateLoader" anchors { left: parent.left right: parent.right } height: active ? item.height : 0 - active: entries.count > 0 + active: (entries.count > 0) || !folder + + readonly property Item currentItem: active ? item.currentItem : null - sourceComponent: Item { + onActiveChanged: { + if (!active && activeFocus) { + bookmarksFolderListView.decrementCurrentIndex() + } + } + + sourceComponent: FocusScope { objectName: "bookmarkFolderDelegate" + focus: true + + readonly property Item currentItem: activeFocus ? (bookmarkFolderHeader.focus ? bookmarkFolderHeader : bookmarksInFolderLoader.item.currentItem) : null + + function focusHeader() { + bookmarkFolderHeader.focus = true + } + function focusBookmarks() { + bookmarksInFolderLoader.focus = true + } property string folderName: folder @@ -64,126 +86,194 @@ right: parent ? parent.right : undefined } - height: delegateColumn.height + height: childrenRect.height - Column { - id: delegateColumn + property bool expanded: folderName ? false : true - property bool expanded: folderName ? false : true + Item { + id: bookmarkFolderHeader + objectName: "bookmarkFolderHeader" anchors { + top: parent.top left: parent.left right: parent.right } + height: units.gu(6.5) + focus: true - Item { - objectName: "bookmarkFolderHeader" - + Row { anchors { left: parent.left + leftMargin: units.gu(2.5) right: parent.right - leftMargin: units.gu(2) - rightMargin: units.gu(2) } - height: units.gu(6.5) - - Row { - anchors { - left: parent.left - leftMargin: units.gu(1.5) - right: parent.right - } - - height: units.gu(6) - spacing: units.gu(1.5) + height: units.gu(6) + spacing: units.gu(1.5) - Icon { - id: expandedIcon - name: delegateColumn.expanded ? "go-down" : "go-next" - - height: units.gu(2) - width: height - - anchors { - leftMargin: units.gu(1) - topMargin: units.gu(2) - top: parent.top - } - } + Icon { + id: expandedIcon + name: expanded ? "go-down" : "go-next" - Label { - width: parent.width - expandedIcon.width - units.gu(3) - anchors.verticalCenter: expandedIcon.verticalCenter + height: units.gu(2) + width: height - text: folderName ? folderName : i18n.tr("All Bookmarks") - fontSize: "small" - } - } - - ListItem.ThinDivider { anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - bottomMargin: units.gu(1) + leftMargin: units.gu(1) + topMargin: units.gu(2) + top: parent.top } } - MouseArea { - anchors.fill: parent - onClicked: delegateColumn.expanded = !delegateColumn.expanded + Label { + width: parent.width - expandedIcon.width - units.gu(3) + anchors.verticalCenter: expandedIcon.verticalCenter + + text: folderName ? folderName : i18n.tr("All Bookmarks") + fontSize: "small" } } - Loader { + ListItem.ThinDivider { anchors { left: parent.left right: parent.right + bottom: parent.bottom + bottomMargin: units.gu(1) } + } + + ListViewHighlight { + anchors.fill: parent + visible: hasKeyboard && parent.activeFocus + } + + MouseArea { + anchors.fill: parent + onClicked: expanded = !expanded + } + + Keys.onEnterPressed: expanded = !expanded + Keys.onReturnPressed: expanded = !expanded + Keys.onSpacePressed: expanded = !expanded + } - height: item ? item.contentHeight : 0 + Loader { + id: bookmarksInFolderLoader + anchors { + top: bookmarkFolderHeader.bottom + left: parent.left + right: parent.right + } - visible: status == Loader.Ready + height: item ? item.contentHeight : 0 - active: delegateColumn.expanded - sourceComponent: ListView { - readonly property bool isAllBookmarksFolder: folder === "" + visible: status == Loader.Ready - interactive: false + active: expanded + onActiveChanged: { + if (!active && focus) { + focusHeader() + } + } - model: { - if (isAllBookmarksFolder) { - return BookmarksModelUtils.prependHomepageToBookmarks(entries, { - title: i18n.tr("Homepage"), - url: bookmarksFoldersViewItem.homeBookmarkUrl - }) - } + sourceComponent: ListView { + readonly property bool isAllBookmarksFolder: folder === "" - return entries + focus: true + interactive: false + currentIndex: 0 + + model: { + if (isAllBookmarksFolder) { + return BookmarksModelUtils.prependHomepageToBookmarks(entries, { + title: i18n.tr("Homepage"), + url: bookmarksFoldersViewItem.homeBookmarkUrl + }) } - delegate: UrlDelegate{ - id: urlDelegate + return entries + } - property var entry: isAllBookmarksFolder ? modelData : model + delegate: UrlDelegate{ + id: urlDelegate + objectName: "urlDelegate_%1".arg(index) - width: parent.width - height: units.gu(5) + property var entry: isAllBookmarksFolder ? modelData : model - removable: !isAllBookmarksFolder || index !== 0 + width: parent.width + height: units.gu(5) - icon: entry.icon ? entry.icon : "" - title: entry.title ? entry.title : entry.url - url: entry.url + removable: !isAllBookmarksFolder || index !== 0 - onClicked: bookmarksFoldersViewItem.bookmarkClicked(url) - onRemoved: bookmarksFoldersViewItem.bookmarkRemoved(url) + icon: entry.icon ? entry.icon : "" + title: entry.title ? entry.title : entry.url + url: entry.url + + onClicked: bookmarksFoldersViewItem.bookmarkClicked(url) + onRemoved: bookmarksFoldersViewItem.bookmarkRemoved(url) + } + + highlight: ListViewHighlight {} + + Keys.onUpPressed: { + if (currentIndex > 0) { + --currentIndex + } else { + focusHeader() + } + } + Keys.onDownPressed: { + if (currentIndex < (count - 1)) { + ++currentIndex + } else { + event.accepted = false } } + Keys.onEnterPressed: currentItem.clicked() + Keys.onReturnPressed: currentItem.clicked() + Keys.onDeletePressed: currentItem.removed() } } + + Keys.onDownPressed: { + if (expanded && !bookmarksInFolderLoader.focus) { + focusBookmarks() + } else { + event.accepted = false + } + } + } + } + + Keys.onUpPressed: { + var current = currentIndex + --currentIndex + while (currentItem && !currentItem.active) { + --currentIndex + } + if (!currentItem) { + currentIndex = current + event.accepted = false } } + Keys.onDownPressed: { + var current = currentIndex + ++currentIndex + while (currentItem && !currentItem.active) { + ++currentIndex + } + if (!currentItem || !currentItem.active) { + currentIndex = current + } + } + } + + // Initially focus the first bookmark + Component.onCompleted: { + if (bookmarksFolderListView.currentItem) { + bookmarksFolderListView.currentItem.item.focusBookmarks() + } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksFoldersViewWide.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksFoldersViewWide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksFoldersViewWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksFoldersViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -33,7 +33,7 @@ function restoreLastFocusedColumn() { if (internal.lastFocusedColumn && internal.lastFocusedColumn == bookmarksList && - model.count > 0) { + BookmarksModel.count > 0) { bookmarksList.forceActiveFocus() } else { folders.forceActiveFocus() @@ -46,11 +46,6 @@ } } - Rectangle { - anchors.fill: parent - color: "#fbfbfb" - } - ListView { id: folders objectName: "foldersList" @@ -95,8 +90,7 @@ readonly property bool isAllBookmarksFolder: folder.length === 0 readonly property bool isCurrentDropTarget: dropArea.containsDrag && dropArea.drag.source.folder !== folder - color: isCurrentDropTarget ? "green" : - ((folders.activeFocus && isActiveFolder) ? Qt.rgba(0, 0, 0, 0.05) : "transparent") + color: isCurrentDropTarget ? "green" : "transparent" Label { anchors { @@ -109,7 +103,16 @@ fontSize: "small" text: isAllBookmarksFolder ? i18n.tr("All Bookmarks") : folderItem.name - color: isActiveFolder ? UbuntuColors.orange : UbuntuColors.darkGrey + color: (isActiveFolder && !folders.activeFocus) ? UbuntuColors.orange : UbuntuColors.darkGrey + } + + divider { + // Hide the divider so that the highlight doesn’t overlap it + // Do not set visible to false, otherwise the content item is resized. + opacity: (!ListView.view.activeFocus || + (index > ListView.view.currentIndex) || + (index < (ListView.view.currentIndex - 1))) ? 1 : 0 + Behavior on opacity { UbuntuNumberAnimation {} } } onClicked: folders.currentIndex = index @@ -121,6 +124,8 @@ anchors.fill: parent } } + + highlight: ListViewHighlight {} } Scrollbar { @@ -176,7 +181,6 @@ removable: !isHomeBookmark draggable: !isHomeBookmark && contentItem.x === 0 - highlighted: bookmarksList.activeFocus && ListView.isCurrentItem onClicked: bookmarksFoldersViewWideItem.bookmarkClicked(url) onRemoved: bookmarksFoldersViewWideItem.bookmarkRemoved(url) @@ -195,13 +199,14 @@ bookmarksList.interactive = true if (dragAndDrop.target && dragAndDrop.target.folderName !== folder) { - bookmarksFoldersViewWideItem.model.update(entry.url, entry.title, - dragAndDrop.target.folderName) + BookmarksModel.update(entry.url, entry.title, dragAndDrop.target.folderName) dragAndDrop.success = true } } } + highlight: ListViewHighlight {} + Keys.onReturnPressed: bookmarksFoldersViewWideItem.bookmarkClicked(currentItem.url) Keys.onDeletePressed: { if (currentItem.removable) { diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksView.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksView.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksView.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -19,6 +19,8 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.3 as ListItems +import webbrowserapp.private 0.1 +import "." as Local FocusScope { id: bookmarksView @@ -42,7 +44,6 @@ left: parent.left right: parent.right bottom: toolbar.top - rightMargin: units.gu(2) } interactive: true @@ -57,7 +58,7 @@ } } - Toolbar { + Local.Toolbar { id: topBar height: units.gu(7) @@ -89,7 +90,7 @@ } } - Toolbar { + Local.Toolbar { id: toolbar height: units.gu(7) @@ -107,14 +108,15 @@ verticalCenter: parent.verticalCenter } + activeFocusOnPress: false strokeColor: UbuntuColors.darkGrey - text: i18n.tr("Done") onClicked: bookmarksView.done() } ToolbarAction { + objectName: "newTabAction" anchors { right: parent.right rightMargin: units.gu(2) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksViewWide.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksViewWide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BookmarksViewWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BookmarksViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -19,6 +19,8 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.3 as ListItems +import webbrowserapp.private 0.1 +import "." as Local FocusScope { id: bookmarksViewWide @@ -55,7 +57,7 @@ } } - Toolbar { + Local.Toolbar { id: topBar height: units.gu(7) @@ -87,7 +89,7 @@ } } - Toolbar { + Local.Toolbar { id: toolbar height: units.gu(7) @@ -113,6 +115,7 @@ } ToolbarAction { + objectName: "newTabAction" anchors { right: parent.right rightMargin: units.gu(2) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BrowserPageHeader.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BrowserPageHeader.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BrowserPageHeader.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BrowserPageHeader.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,119 @@ + /* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItem + +/* + * Component to use as page header in settings page, download page and + * subpages + * + * It has a back() signal fired when back button is pressed, a text + * property to set the page title and an actions property which + * displays action icons on the right of header. + */ + +Item { + id: root + signal back() + property string text + property alias actions: actionBar.actions + property alias color: title.color + + height: title.height + divider.height + + anchors { + left: parent.left + right: parent.right + } + + MouseArea { + // Prevent click events from propagating through to the view below + anchors.fill: parent + acceptedButtons: Qt.AllButtons + } + + Rectangle { + id: title + + height: units.gu(6) - divider.height + anchors { left: parent.left; right: parent.right } + color: "#f6f6f6" + + AbstractButton { + id: backButton + objectName: "backButton" + + width: height + + activeFocusOnPress: false + onTriggered: root.back() + anchors { + top: parent.top + bottom: parent.bottom + left: parent.left + } + + Rectangle { + anchors.fill: parent + anchors.leftMargin: units.gu(1) + anchors.rightMargin: units.gu(1) + color: "#E6E6E6" + visible: parent.pressed + } + + Icon { + name: "back" + anchors { + fill: parent + topMargin: units.gu(2) + bottomMargin: units.gu(2) + } + } + } + + Label { + anchors { + left: backButton.right + verticalCenter: parent.verticalCenter + } + text: root.text + fontSize: 'x-large' + } + + ActionBar { + id: actionBar + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + } + + + } + + Rectangle { + id: divider + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } + height: units.dp(1) + color: Qt.darker(title.color, 1.1) + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/Browser.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/Browser.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/Browser.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/Browser.qml 2016-04-13 15:22:06.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -22,12 +22,14 @@ import com.canonical.Oxide 1.8 as Oxide import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 +import Unity.InputInfo 0.1 import webbrowserapp.private 0.1 import webbrowsercommon.private 0.1 import "../actions" as Actions import "../UrlUtils.js" as UrlUtils import ".." import "." +import "." as Local BrowserView { id: browser @@ -37,16 +39,14 @@ currentWebview: tabsModel && tabsModel.currentTab ? tabsModel.currentTab.webview : null + readonly property var downloadManager: (downloadHandlerLoader.status == Loader.Ready) ? downloadHandlerLoader.item : null + property bool newSession: false property bool incognito: false readonly property var tabsModel: incognito ? privateTabsModelLoader.item : publicTabsModel - // XXX: we might want to tweak this value depending - // on the form factor and/or the available memory - readonly property int maxLiveWebviews: 2 - // Restore only the n most recent tabs at startup, // to limit the overhead of instantiating too many // tab objects (see http://pad.lv/1376433). @@ -55,21 +55,10 @@ onTabsModelChanged: { if (incognito && privateTabsModelLoader.item) { browser.openUrlInNewTab("", true) - } - } - - Connections { - target: tabsModel - onCurrentIndexChanged: { - // Remove focus from the address bar when the current tab - // changes to ensure that its contents are updated. - tabContainer.forceActiveFocus() - - // In narrow mode, the tabslist is a stack: - // the current tab is always at the top. - if (!browser.wide) { - tabsModel.move(tabsModel.currentIndex, 0) - } + } else if (!incognito && tabsModel.currentTab) { + // If the system is low on memory, the current public tab might + // have been unloaded while browsing incognito, so reload it. + tabsModel.currentTab.load() } } @@ -92,6 +81,25 @@ onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request }) } + InputDeviceModel { + id: miceModel + deviceFilter: InputInfo.Mouse + } + + InputDeviceModel { + id: touchPadModel + deviceFilter: InputInfo.TouchPad + } + + InputDeviceModel { + id: touchScreenModel + deviceFilter: InputInfo.TouchScreen + } + + FilteredKeyboardModel { + id: keyboardModel + } + Component { id: mediaAccessDialogComponent MediaAccessDialog { } @@ -137,7 +145,6 @@ property url homepage: settingsDefaults.homepage property string searchEngine: settingsDefaults.searchEngine - property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab property bool restoreSession: settingsDefaults.restoreSession property int newTabDefaultSection: settingsDefaults.newTabDefaultSection property string defaultAudioDevice @@ -146,7 +153,6 @@ function restoreDefaults() { homepage = settingsDefaults.homepage searchEngine = settingsDefaults.searchEngine - allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab restoreSession = settingsDefaults.restoreSession newTabDefaultSection = settingsDefaults.newTabDefaultSection defaultAudioDevice = settingsDefaults.defaultAudioDevice @@ -159,7 +165,6 @@ readonly property url homepage: "http://start.ubuntu.com" readonly property string searchEngine: "google" - readonly property string allowOpenInBackgroundTab: "default" readonly property bool restoreSession: true readonly property int newTabDefaultSection: 0 readonly property string defaultAudioDevice: "" @@ -167,8 +172,9 @@ } FocusScope { + id: contentsContainer anchors.fill: parent - visible: !settingsContainer.visible && !historyViewLoader.active && !bookmarksViewLoader.active + visible: !settingsViewLoader.active && !historyViewLoader.active && !bookmarksViewLoader.active && !downloadsViewLoader.active FocusScope { id: tabContainer @@ -177,10 +183,31 @@ right: parent.right top: parent.top } - height: parent.height - osk.height + height: parent.height - osk.height - bottomEdgeBar.height + + focus: !errorSheetLoader.focus && + !invalidCertificateErrorSheetLoader.focus && + !newTabViewLoader.focus && + !sadTabLoader.focus + + Keys.onPressed: { + if (tabContainer.visible && (event.key == Qt.Key_Backspace)) { + // Not handled as a window-level shortcut as it would take + // precedence over backspace events in HTML text fields + // (https://launchpad.net/bugs/1569938). + if (event.modifiers == Qt.NoModifier) { + internal.historyGoBack() + event.accepted = true + } else if (event.modifiers == Qt.ShiftModifier) { + internal.historyGoForward() + event.accepted = true + } + } + } } Loader { + id: errorSheetLoader anchors { fill: tabContainer topMargin: (chrome.state == "shown") ? chrome.height : 0 @@ -190,10 +217,12 @@ url: currentWebview ? currentWebview.url : "" onRefreshClicked: currentWebview.reload() } + focus: item.visible asynchronous: true } Loader { + id: invalidCertificateErrorSheetLoader anchors { fill: tabContainer topMargin: (chrome.state == "shown") ? chrome.height : 0 @@ -211,6 +240,7 @@ currentWebview.resetCertificateError() } } + focus: item.visible asynchronous: true } @@ -219,7 +249,7 @@ anchors { fill: tabContainer - topMargin: (chrome.state == "shown" && chrome.visible) ? chrome.height : 0 + topMargin: (chrome.state == "shown") ? chrome.height : 0 } // Avoid loading the new tab view if the webview is about to load @@ -232,6 +262,7 @@ } } active: false + focus: active asynchronous: true Connections { @@ -265,6 +296,7 @@ currentWebview.url = url tabContainer.forceActiveFocus() } + Keys.onUpPressed: chrome.focus = true } } @@ -286,7 +318,7 @@ currentWebview.url = url tabContainer.forceActiveFocus() } - onReleasingKeyboardFocus: chrome.focus = true + Keys.onUpPressed: chrome.focus = true } } @@ -298,12 +330,14 @@ } Loader { + id: sadTabLoader anchors { fill: tabContainer topMargin: (chrome.state == "shown") ? chrome.height : 0 } active: webProcessMonitor.crashed || (webProcessMonitor.killed && !currentWebview.loading) + focus: active sourceComponent: SadTab { webview: currentWebview @@ -365,7 +399,7 @@ onTabClosed: internal.closeTab(index) } - Toolbar { + Local.Toolbar { id: recentToolbar objectName: "recentToolbar" @@ -418,6 +452,7 @@ state = "" recentToolbar.state = "hidden" tabslist.reset() + internal.resetFocus() } } @@ -432,8 +467,9 @@ webview: browser.currentWebview forceHide: browser.fullscreen forceShow: recentView.visible - defaultMode: (formFactor == "desktop") ? Oxide.LocationBarController.ModeShown - : Oxide.LocationBarController.ModeAuto + defaultMode: (internal.hasMouse && !internal.hasTouchScreen) + ? Oxide.LocationBarController.ModeShown + : Oxide.LocationBarController.ModeAuto } Chrome { @@ -449,6 +485,10 @@ showTabsBar: browser.wide showFaviconInAddressBar: !browser.wide + availableHeight: tabContainer.height - height - y + + touchEnabled: internal.hasTouchScreen + property bool hidden: false y: hidden ? -height : webview ? webview.locationBarController.offset : 0 Behavior on y { @@ -495,7 +535,8 @@ objectName: "share" text: i18n.tr("Share") iconName: "share" - enabled: (formFactor == "mobile") && chrome.tab && chrome.tab.url.toString() + enabled: (contentHandlerLoader.status == Loader.Ready) && + chrome.tab && chrome.tab.url.toString() onTriggered: internal.shareLink(chrome.tab.url, chrome.tab.title) }, Action { @@ -511,23 +552,6 @@ onTriggered: historyViewLoader.active = true }, Action { - objectName: "tabs" - text: i18n.tr("Open tabs") - iconName: "browser-tabs" - enabled: (formFactor != "mobile") && !browser.wide - onTriggered: { - recentView.state = "shown" - recentToolbar.state = "shown" - } - }, - Action { - objectName: "newtab" - text: i18n.tr("New tab") - iconName: browser.incognito ? "private-tab-new" : "tab-new" - enabled: (formFactor != "mobile") && !browser.wide - onTriggered: browser.openUrlInNewTab("", true) - }, - Action { objectName: "findinpage" text: i18n.tr("Find in page") iconName: "search" @@ -535,6 +559,13 @@ onTriggered: chrome.findInPageMode = true }, Action { + objectName: "downloads" + text: i18n.tr("Downloads") + iconName: "save" + enabled: downloadHandlerLoader.status == Loader.Ready && contentHandlerLoader.status == Loader.Ready + onTriggered: downloadsViewLoader.active = true + }, + Action { objectName: "privatemode" text: browser.incognito ? i18n.tr("Leave Private Mode") : i18n.tr("Private Mode") iconName: "private-browsing" @@ -556,11 +587,7 @@ objectName: "settings" text: i18n.tr("Settings") iconName: "settings" - onTriggered: { - settingsComponent.createObject(settingsContainer) - settingsContainer.focus = true - chrome.findInPageMode = false - } + onTriggered: settingsViewLoader.active = true } ] @@ -570,7 +597,7 @@ Keys.onDownPressed: { if (suggestionsList.count) suggestionsList.focus = true else if (newTabViewLoader.status == Loader.Ready) { - newTabViewLoader.focus = true + newTabViewLoader.forceActiveFocus() } } @@ -666,6 +693,7 @@ BottomEdgeHandle { id: bottomEdgeHandle + objectName: "bottomEdgeHandle" anchors { left: parent.left @@ -674,8 +702,8 @@ } height: units.gu(2) - enabled: (formFactor == "mobile") && !browser.wide && - (recentView.state == "") && browser.currentWebview && + enabled: !browser.wide && (recentView.state == "") && + browser.currentWebview && (Screen.orientation == Screen.primaryOrientation) onDraggingChanged: { @@ -704,8 +732,7 @@ Image { id: bottomEdgeHint - objectName: "bottomEdgeHint" - source: (formFactor == "mobile") ? "assets/bottom_edge_hint.png" : "" + source: "assets/bottom_edge_hint.png" property bool forceShow: false anchors { horizontalCenter: parent.horizontalCenter @@ -715,7 +742,7 @@ UbuntuNumberAnimation {} } } - visible: bottomEdgeHandle.enabled + visible: bottomEdgeHandle.enabled && !internal.hasMouse opacity: recentView.visible ? 0 : 1 Behavior on opacity { UbuntuNumberAnimation {} @@ -734,6 +761,44 @@ } } + MouseArea { + id: bottomEdgeBar + objectName: "bottomEdgeBar" + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } + enabled: !browser.wide && internal.hasMouse && + (osk.state == "hidden") && (recentView.state == "") + visible: enabled + height: visible ? units.gu(4) : 0 + // Ensure that this ends up below the chrome, so that the + // drawer menu’s inverse mouse area covers it. + z: -1 + + onClicked: { + recentView.state = "shown" + recentToolbar.state = "shown" + } + + Rectangle { + anchors.fill: parent + color: "#f7f7f7" + border { + width: units.dp(1) + color: "#cdcdcd" + } + } + + Label { + anchors.centerIn: parent + color: "#5d5d5d" + // TRANSLATORS: %1 refers to the current number of tabs opened + text: i18n.tr("(%1)").arg(tabsModel ? tabsModel.count : 0) + } + } + Loader { id: bookmarksViewLoader @@ -751,6 +816,13 @@ Keys.onEscapePressed: bookmarksViewLoader.active = false + onActiveChanged: { + if (active) { + chrome.findInPageMode = false + forceActiveFocus() + } + } + Connections { target: bookmarksViewLoader.item @@ -804,44 +876,53 @@ Keys.onEscapePressed: historyViewLoader.active = false - onActiveChanged: if (active) chrome.findInPageMode = false + onActiveChanged: { + if (active) { + chrome.findInPageMode = false + forceActiveFocus() + } + } Component { id: historyViewComponent - HistoryView { - anchors.fill: parent + FocusScope { + signal loadModel() + onLoadModel: children[0].loadModel() - onSeeMoreEntriesClicked: { - var view = expandedHistoryViewComponent.createObject(expandedHistoryViewContainer, {model: model}) - view.onHistoryEntryClicked.connect(done) + HistoryView { + anchors.fill: parent + focus: !expandedHistoryViewLoader.focus + visible: focus + onSeeMoreEntriesClicked: { + expandedHistoryViewLoader.model = model + expandedHistoryViewLoader.active = true + } + onNewTabRequested: browser.openUrlInNewTab("", true) + onDone: historyViewLoader.active = false } - onDone: historyViewLoader.active = false - FocusScope { - id: expandedHistoryViewContainer - - visible: children.length > 0 + Loader { + id: expandedHistoryViewLoader + asynchronous: true anchors.fill: parent - - Component { - id: expandedHistoryViewComponent - - ExpandedHistoryView { - anchors.fill: parent - - onHistoryEntryClicked: { - browser.openUrlInNewTab(url, true) + active: false + focus: active + property var model: null + sourceComponent: ExpandedHistoryView { + focus: true + model: expandedHistoryViewLoader.model + onHistoryEntryClicked: { + browser.openUrlInNewTab(url, true) + historyViewLoader.active = false + } + onHistoryEntryRemoved: { + if (count == 1) { done() } - onHistoryEntryRemoved: { - if (count == 1) { - done() - } - HistoryModel.removeEntryByUrl(url) - } - onDone: destroy() + HistoryModel.removeEntryByUrl(url) } + onDone: expandedHistoryViewLoader.active = false } } } @@ -869,26 +950,70 @@ } } - FocusScope { - id: settingsContainer + Loader { + id: settingsViewLoader - visible: children.length > 0 anchors.fill: parent + active: false - Component { - id: settingsComponent + onStatusChanged: { + if (status == Loader.Ready) { + settingsViewLoader.item.forceActiveFocus() + } else { + internal.resetFocus() + } + } - SettingsPage { - anchors.fill: parent - focus: true - settingsObject: settings - onDone: destroy() - Keys.onEscapePressed: { - destroy() - internal.resetFocus() - } + Keys.onEscapePressed: settingsViewLoader.active = false + + onActiveChanged: { + if (active) { + chrome.findInPageMode = false + forceActiveFocus() + } + } + + sourceComponent: SettingsPage { + anchors.fill: parent + focus: true + settingsObject: settings + onDone: settingsViewLoader.active = false + } + } + + Loader { + id: downloadsViewLoader + + anchors.fill: parent + active: false + source: "DownloadsPage.qml" + + onStatusChanged: { + if (status == Loader.Ready) { + item.forceActiveFocus() + } else { + internal.resetFocus() } } + + Keys.onEscapePressed: active = false + + onActiveChanged: { + if (active) { + forceActiveFocus() + } + } + + Binding { + target: downloadsViewLoader.item + property: "downloadManager" + value: browser.downloadManager + } + + Connections { + target: downloadsViewLoader.item + onDone: downloadsViewLoader.active = false + } } TabsModel { @@ -916,6 +1041,12 @@ } } + Loader { + id: downloadHandlerLoader + source: "DownloadHandler.qml" + asynchronous: true + } + Component { id: tabComponent @@ -936,6 +1067,7 @@ readonly property bool current: tab.current currentWebview: browser.currentWebview + filePicker: filePickerLoader.item anchors.fill: parent focus: true @@ -960,10 +1092,7 @@ } Actions.OpenLinkInNewBackgroundTab { objectName: "OpenLinkInNewBackgroundTabContextualAction" - enabled: contextModel && contextModel.linkUrl.toString() && - ((settings.allowOpenInBackgroundTab === "true") || - ((settings.allowOpenInBackgroundTab === "default") && - (formFactor === "desktop"))) + enabled: contextModel && contextModel.linkUrl.toString() onTriggered: browser.openUrlInNewTab(contextModel.linkUrl, false) } Actions.BookmarkLink { @@ -992,7 +1121,7 @@ } Actions.Share { objectName: "ShareContextualAction" - enabled: (formFactor == "mobile") && contextModel && + enabled: (contentHandlerLoader.status == Loader.Ready) && contextModel && (contextModel.linkUrl.toString() || contextModel.selectionText) onTriggered: { if (contextModel.linkUrl.toString()) { @@ -1004,7 +1133,9 @@ } Actions.OpenImageInNewTab { objectName: "OpenImageInNewTabContextualAction" - enabled: contextModel && contextModel.srcUrl.toString() + enabled: contextModel && + (contextModel.mediaType === Oxide.WebView.MediaTypeImage) && + contextModel.srcUrl.toString() onTriggered: browser.openUrlInNewTab(contextModel.srcUrl, true) } Actions.CopyImage { @@ -1022,6 +1153,20 @@ contextModel.hasImageContents onTriggered: contextModel.saveMedia() } + Actions.OpenVideoInNewTab { + objectName: "OpenVideoInNewTabContextualAction" + enabled: contextModel && + (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) && + contextModel.srcUrl.toString() + onTriggered: browser.openUrlInNewTab(contextModel.srcUrl, true) + } + Actions.SaveVideo { + objectName: "SaveVideoContextualAction" + enabled: contextModel && + (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) && + contextModel.srcUrl.toString() + onTriggered: contextModel.saveMedia() + } Actions.Undo { objectName: "UndoContextualAction" enabled: contextModel && contextModel.isEditable && @@ -1125,20 +1270,47 @@ } } + QtObject { + id: webviewInternal + property url storedUrl: "" + property bool titleSet: false + property string title: "" + } onLoadEvent: { if (event.type == Oxide.LoadEvent.TypeCommitted) { chrome.findInPageMode = false + webviewInternal.titleSet = false + webviewInternal.title = title } if (webviewimpl.incognito) { return } - if (event.type == Oxide.LoadEvent.TypeSucceeded && - 300 > event.httpStatusCode && event.httpStatusCode >= 200) { + if ((event.type == Oxide.LoadEvent.TypeCommitted) && + !event.isError && + (300 > event.httpStatusCode) && (event.httpStatusCode >= 200)) { + webviewInternal.storedUrl = event.url HistoryModel.add(event.url, title, icon) } } + onTitleChanged: { + if (!webviewInternal.titleSet && webviewInternal.storedUrl.toString()) { + // Record the title to avoid updating the history database + // every time the page dynamically updates its title. + // We don’t want pages that update their title every second + // to achieve an ugly "scrolling title" effect to flood the + // history database with updates. + webviewInternal.titleSet = true + webviewInternal.title = title + HistoryModel.update(webviewInternal.storedUrl, title, icon) + } + } + onIconChanged: { + if (webviewInternal.storedUrl.toString()) { + HistoryModel.update(webviewInternal.storedUrl, webviewInternal.title, icon) + } + } onGeolocationPermissionRequested: requestGeolocationPermission(request) @@ -1203,9 +1375,9 @@ color: "white" font.weight: Font.Light anchors.centerIn: parent - text: (formFactor == "mobile") ? - i18n.tr("Swipe Up To Exit Full Screen") : - i18n.tr("Press ESC To Exit Full Screen") + text: bottomEdgeHandle.enabled + ? i18n.tr("Swipe Up To Exit Full Screen") + : i18n.tr("Press ESC To Exit Full Screen") } Timer { @@ -1227,6 +1399,29 @@ Component.onDestruction: bottomEdgeHint.forceShow = false } } + + onShowDownloadDialog: { + if (downloadDialogLoader.status === Loader.Ready) { + var downloadDialog = PopupUtils.open(downloadDialogLoader.item, browser, {"contentType" : contentType, + "downloadId" : downloadId, + "singleDownload" : downloader, + "filename" : filename, + "mimeType" : mimeType}) + downloadDialog.startDownload.connect(startDownload) + } + } + + function showDownloadsPage() { + downloadsViewLoader.active = true + return downloadsViewLoader.item + } + + function startDownload(downloadId, download, mimeType) { + DownloadsModel.add(downloadId, download.url, mimeType) + download.start() + downloadsViewLoader.active = true + } + } } } @@ -1238,8 +1433,12 @@ sourceModel: BookmarksModel } - Component.onCompleted: { - forceActiveFocus() + Component.onCompleted: forceActiveFocus() + + onVisibleChanged: { + if (!visible) { + BookmarksModel.remove(bookmarkUrl) + } } Component.onDestruction: { @@ -1248,36 +1447,11 @@ } } - Keys.onPressed: { - if (bookmarkOptionsShortcuts.processKey(event.key, event.modifiers)) { - event.accepted = true - } - } - - KeyboardShortcuts { - id: bookmarkOptionsShortcuts - KeyboardShortcut { - key: Qt.Key_Return - onTriggered: hide() - } - - KeyboardShortcut { - key: Qt.Key_Escape - onTriggered: { - BookmarksModel.remove(bookmarkUrl) - hide() - } - } - - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_D - onTriggered: { - BookmarksModel.remove(bookmarkUrl) - hide() - } - } - } + // Fragile workaround for https://launchpad.net/bugs/1546677. + // By destroying the popover, its visibility isn’t changed to + // false, and thus the bookmark is not removed. + Keys.onEnterPressed: destroy() + Keys.onReturnPressed: destroy() } } @@ -1293,13 +1467,24 @@ } } + readonly property bool hasMouse: (miceModel.count + touchPadModel.count) > 0 + readonly property bool hasTouchScreen: touchScreenModel.count > 0 + + readonly property real freeMemRatio: (MemInfo.total > 0) ? (MemInfo.free / MemInfo.total) : 1.0 + // Under that threshold, available memory is considered "low", and the + // browser is going to try and free up memory from unused tabs. This + // value was chosen empirically, it is subject to change to better + // reflect what a system under memory pressure might look like. + readonly property real lowOnMemoryThreshold: 0.3 + readonly property bool lowOnMemory: freeMemRatio < lowOnMemoryThreshold + function getOpenPages() { - var urls = []; + var urls = [] for (var i = 0; i < tabsModel.count; i++) { var url = tabsModel.get(i).url - if (url.length > 0) urls.push(url) // exclude "new tab" tabs + if (url.toString()) urls.push(url) // exclude "new tab" tabs } - return urls; + return urls } function instantiateShareComponent() { @@ -1363,7 +1548,7 @@ if (!incognito && closedTabHistory.length > 0) { var tabInfo = closedTabHistory.pop() var tab = session.createTabFromState(tabInfo.state) - internal.addTab(tab, true, tabInfo.index) + addTab(tab, true, tabInfo.index) } } @@ -1373,7 +1558,6 @@ } else { internal.switchToTab(tabsModel.count - 1, true) } - if (recentView.visible) recentView.focus = true } function switchToNextTab() { @@ -1382,7 +1566,6 @@ } else { internal.switchToTab(tabsModel.count - 1, true) } - if (recentView.visible) recentView.focus = true } function switchToTab(index, delayed) { @@ -1393,10 +1576,11 @@ tabsModel.currentIndex = index nextTabIndex = -1 var tab = tabsModel.currentTab - if (tab) { - if (!tab.url.toString() && !tab.initialUrl.toString() && - (formFactor == "desktop")) { - focusAddressBar() + if (recentView.visible) { + recentView.focus = true + } else if (tab) { + if (!tab.url.toString() && !tab.initialUrl.toString()) { + maybeFocusAddressBar() } else { tabContainer.forceActiveFocus() } @@ -1412,14 +1596,22 @@ function resetFocus() { if (browser.currentWebview) { - if (!browser.currentWebview.url.toString() && (formFactor == "desktop")) { - internal.focusAddressBar() + if (!browser.currentWebview.url.toString()) { + internal.maybeFocusAddressBar() } else { - tabContainer.forceActiveFocus() + contentsContainer.forceActiveFocus() } } } + function maybeFocusAddressBar() { + if (keyboardModel.count > 0) { + focusAddressBar() + } else { + contentsContainer.forceActiveFocus() + } + } + // Invalid certificates the user has explicitly allowed for this session property var allowedCertificateErrors: [] @@ -1459,14 +1651,14 @@ } } + property var currentBookmarkOptionsDialog: null function addBookmark(url, title, icon, location) { if (title == "") title = UrlUtils.removeScheme(url) BookmarksModel.add(url, title, icon, "") if (location === undefined) location = chrome.bookmarkTogglePlaceHolder - PopupUtils.open(bookmarkOptionsComponent, - location, - {"bookmarkUrl": url, - "bookmarkTitle": title}) + var properties = {"bookmarkUrl": url, "bookmarkTitle": title} + currentBookmarkOptionsDialog = PopupUtils.open(bookmarkOptionsComponent, + location, properties) } } @@ -1485,8 +1677,8 @@ if (load) { tab.load() } - if (!url.toString() && (formFactor == "desktop")) { - internal.focusAddressBar() + if (!url.toString()) { + internal.maybeFocusAddressBar() } } @@ -1588,11 +1780,12 @@ session.save() } if (browser.currentWebview) { - // Workaround for a desktop bug where changing volume causes the app to - // briefly lose focus to notify-osd, and therefore exit fullscreen mode. - // We prevent this by exiting fullscreen only if the focus remains lost - // for longer than a certain threshold. See: http://pad.lv/1477308 - if (formFactor == "desktop") exitFullscreenOnLostFocus.start() + // Workaround for a desktop bug where changing volume causes + // the app to briefly lose focus to notify-osd, and therefore + // exit fullscreen mode. We prevent this by exiting fullscreen + // only if the focus remains lost for longer than a certain + // threshold. See: https://launchpad.net/bugs/694224. + if (__platformName == "xcb") exitFullscreenOnLostFocus.start() else browser.currentWebview.fullscreen = false } } else exitFullscreenOnLostFocus.stop() @@ -1646,12 +1839,13 @@ browser.openUrlInNewTab(settings.homepage, true, false) } tabsModel.currentTab.load() - if (!tabsModel.currentTab.url.toString() && !tabsModel.currentTab.restoreState && (formFactor == "desktop")) { - internal.focusAddressBar() + if (!tabsModel.currentTab.url.toString() && !tabsModel.currentTab.restoreState) { + internal.maybeFocusAddressBar() } BookmarksModel.databasePath = dataLocation + "/bookmarks.sqlite" HistoryModel.databasePath = dataLocation + "/history.sqlite" + DownloadsModel.databasePath = dataLocation + "/downloads.sqlite" // Note that the property setter for databasePath won't return until // the entire model has been loaded, so it is safe to call this here @@ -1660,21 +1854,54 @@ } Connections { - // On mobile, ensure that at most n webviews are instantiated at all - // times, to reduce memory consumption (see http://pad.lv/1376418). - // Note: this works only in narrow mode, where the list of tabs is a - // stack. Switching from wide mode to narrow mode will result in - // undefined behaviour (tabs previously loaded won’t be unloaded). - target: ((formFactor == "mobile") && !browser.wide) ? tabsModel : null - onCurrentTabChanged: { - if (tabsModel.count > browser.maxLiveWebviews) { - tabsModel.get(browser.maxLiveWebviews).unload() + target: internal + onFreeMemRatioChanged: { + if (internal.lowOnMemory) { + // Unload an inactive tab to (hopefully) free up some memory + function getCandidate(model) { + // Naive implementation that only takes into account the + // last time a tab was current. In the future we might + // want to take into account other parameters such as + // whether the tab is currently playing audio/video. + var candidate = null + for (var i = 0; i < model.count; ++i) { + var tab = model.get(i) + if (tab.current || !tab.webview) { + continue + } + if (!candidate || (candidate.lastCurrent > tab.lastCurrent)) { + candidate = tab + } + } + return candidate + } + var candidate = getCandidate(publicTabsModel) + if (candidate) { + console.warn("Unloading background tab (%1) to free up some memory".arg(candidate.url)) + candidate.unload() + return + } else if (browser.incognito) { + candidate = getCandidate(privateTabsModelLoader.item) + if (candidate) { + console.warn("Unloading a background incognito tab to free up some memory") + candidate.unload() + return + } + } + console.warn("System low on memory, but unable to pick a tab to unload") } } } Connections { target: tabsModel + onCurrentIndexChanged: { + // In narrow mode, the tabslist is a stack: + // the current tab is always at the top. + if (!browser.wide) { + tabsModel.move(tabsModel.currentIndex, 0) + } + } onCurrentTabChanged: { chrome.findInPageMode = false var tab = tabsModel.currentTab @@ -1688,7 +1915,7 @@ if (browser.incognito) { browser.incognito = false internal.resetFocus() - } else if ((formFactor == "desktop") || browser.wide) { + } else if (browser.wide) { Qt.quit() } } @@ -1721,178 +1948,207 @@ } } - Keys.onPressed: if (shortcuts.processKey(event.key, event.modifiers)) event.accepted = true - KeyboardShortcuts { - id: shortcuts - - // Ctrl+Tab or Ctrl+PageDown: cycle through open tabs - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_Tab - enabled: chrome.visible || recentView.visible - onTriggered: internal.switchToNextTab() - } - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_PageDown - enabled: chrome.visible || recentView.visible - onTriggered: internal.switchToNextTab() - } - - // Ctrl+Shift+Tab or Ctrl+PageUp: cycle through open tabs in reverse order - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_Backtab - enabled: chrome.visible || recentView.visible - onTriggered: internal.switchToPreviousTab() - } - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_PageUp - enabled: chrome.visible || recentView.visible - onTriggered: internal.switchToPreviousTab() - } - - // Ctrl+Shift+W or Ctrl+Shift+T: Undo close tab - KeyboardShortcut { - modifiers: Qt.ControlModifier | Qt.ShiftModifier - key: Qt.Key_W - enabled: chrome.visible || recentView.visible - onTriggered: internal.undoCloseTab() - } - - KeyboardShortcut { - modifiers: Qt.ControlModifier | Qt.ShiftModifier - key: Qt.Key_T - enabled: chrome.visible || recentView.visible - onTriggered: internal.undoCloseTab() - } - - // Ctrl+W or Ctrl+F4: Close the current tab - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_W - enabled: chrome.visible || recentView.visible - onTriggered: internal.closeCurrentTab() - } - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_F4 - enabled: chrome.visible || recentView.visible - onTriggered: internal.closeCurrentTab() - } - - // Ctrl+T: Open a new Tab - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_T - enabled: chrome.visible || recentView.visible || bookmarksViewLoader.active || historyViewLoader.active - onTriggered: { - openUrlInNewTab("", true) - if (recentView.visible) recentView.reset() + // TODO: internationalize non-standard key sequences? - bookmarksViewLoader.active = false - historyViewLoader.active = false - } + // Ctrl+Tab or Ctrl+PageDown: cycle through open tabs + Shortcut { + sequence: StandardKey.NextChild + enabled: tabContainer.visible || recentView.visible + onActivated: internal.switchToNextTab() + } + Shortcut { + sequence: "Ctrl+PgDown" + enabled: tabContainer.visible || recentView.visible + onActivated: internal.switchToNextTab() + } + + // Ctrl+Shift+Tab or Ctrl+PageUp: cycle through open tabs in reverse order + Shortcut { + sequence: StandardKey.PreviousChild + enabled: tabContainer.visible || recentView.visible + onActivated: internal.switchToPreviousTab() + } + Shortcut { + sequence: "Ctrl+Shift+Tab" + enabled: tabContainer.visible || recentView.visible + onActivated: internal.switchToPreviousTab() + } + Shortcut { + sequence: "Ctrl+PgUp" + enabled: tabContainer.visible || recentView.visible + onActivated: internal.switchToPreviousTab() + } + + // Ctrl+W or Ctrl+F4: Close the current tab + Shortcut { + sequence: StandardKey.Close + enabled: tabContainer.visible || recentView.visible + onActivated: internal.closeCurrentTab() + } + Shortcut { + sequence: "Ctrl+F4" + enabled: tabContainer.visible || recentView.visible + onActivated: internal.closeCurrentTab() + } + + // Ctrl+Shift+W or Ctrl+Shift+T: Undo close tab + Shortcut { + sequence: "Ctrl+Shift+W" + enabled: tabContainer.visible || recentView.visible + onActivated: internal.undoCloseTab() + } + Shortcut { + sequence: "Ctrl+Shift+T" + enabled: tabContainer.visible || recentView.visible + onActivated: internal.undoCloseTab() + } + + // Ctrl+T: Open a new Tab + Shortcut { + sequence: StandardKey.AddTab + enabled: tabContainer.visible || recentView.visible || + bookmarksViewLoader.active || historyViewLoader.active + onActivated: { + openUrlInNewTab("", true) + if (recentView.visible) recentView.reset() + bookmarksViewLoader.active = false + historyViewLoader.active = false } + } - // F6 or Ctrl+L or Alt+D: Select the content in the address bar - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_L - enabled: chrome.visible - onTriggered: internal.focusAddressBar(true) - } - KeyboardShortcut { - modifiers: Qt.AltModifier - key: Qt.Key_D - enabled: chrome.visible - onTriggered: internal.focusAddressBar(true) - } - KeyboardShortcut { - key: Qt.Key_F6 - enabled: chrome.visible - onTriggered: internal.focusAddressBar(true) - } - - // Ctrl+D: Toggle bookmarked state on current Tab - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_D - enabled: chrome.visible - onTriggered: { - if (currentWebview) { - if (BookmarksModel.contains(currentWebview.url)) { - BookmarksModel.remove(currentWebview.url) - } else { - internal.addBookmark(currentWebview.url, currentWebview.title, currentWebview.icon) - } + // F6 or Ctrl+L or Alt+D: Select the content in the address bar + Shortcut { + sequence: "F6" + enabled: tabContainer.visible + onActivated: internal.focusAddressBar(true) + } + Shortcut { + sequence: "Ctrl+L" + enabled: tabContainer.visible + onActivated: internal.focusAddressBar(true) + } + Shortcut { + sequence: "Alt+D" + enabled: tabContainer.visible + onActivated: internal.focusAddressBar(true) + } + + // Ctrl+D: Toggle bookmarked state on current Tab + Shortcut { + sequence: "Ctrl+D" + enabled: tabContainer.visible + onActivated: { + if (internal.currentBookmarkOptionsDialog) { + internal.currentBookmarkOptionsDialog.hide() + } else if (currentWebview) { + if (BookmarksModel.contains(currentWebview.url)) { + BookmarksModel.remove(currentWebview.url) + } else { + internal.addBookmark(currentWebview.url, currentWebview.title, currentWebview.icon) } } } + } - // Ctrl+H: Show History - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_H - enabled: chrome.visible - onTriggered: historyViewLoader.active = true - } + // Ctrl+H: Show History + Shortcut { + sequence: "Ctrl+H" + enabled: tabContainer.visible + onActivated: historyViewLoader.active = true + } - // Ctrl+Shift+O: Show Bookmarks - KeyboardShortcut { - modifiers: Qt.ControlModifier | Qt.ShiftModifier - key: Qt.Key_O - enabled: chrome.visible - onTriggered: bookmarksViewLoader.active = true - } + // Ctrl+Shift+O: Show Bookmarks + Shortcut { + sequence: "Ctrl+Shift+O" + enabled: tabContainer.visible + onActivated: bookmarksViewLoader.active = true + } - // Alt+← or Backspace: Goes to the previous page in history - KeyboardShortcut { - modifiers: Qt.AltModifier - key: Qt.Key_Left - enabled: chrome.visible - onTriggered: internal.historyGoBack() - } - KeyboardShortcut { - key: Qt.Key_Backspace - enabled: chrome.visible - onTriggered: internal.historyGoBack() - } + // Alt+← or Backspace: Goes to the previous page in history + Shortcut { + sequence: StandardKey.Back + enabled: tabContainer.visible + onActivated: internal.historyGoBack() + } - // Alt+→ or Shift+Backspace: Goes to the next page in history - KeyboardShortcut { - modifiers: Qt.AltModifier - key: Qt.Key_Right - enabled: chrome.visible - onTriggered: internal.historyGoForward() - } - KeyboardShortcut { - modifiers: Qt.ShiftModifier - key: Qt.Key_Backspace - enabled: chrome.visible - onTriggered: internal.historyGoForward() - } + // Alt+→ or Shift+Backspace: Goes to the next page in history + Shortcut { + sequence: StandardKey.Forward + enabled: tabContainer.visible + onActivated: internal.historyGoForward() + } - // F5 or Ctrl+R: Reload current Tab - KeyboardShortcut { - key: Qt.Key_F5 - enabled: chrome.visible - onTriggered: if (currentWebview) currentWebview.reload() - } - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_R - enabled: chrome.visible - onTriggered: if (currentWebview) currentWebview.reload() - } + // F5 or Ctrl+R: Reload current Tab + Shortcut { + sequence: StandardKey.Refresh + enabled: tabContainer.visible + onActivated: if (currentWebview) currentWebview.reload() + } + Shortcut { + sequence: "F5" + enabled: tabContainer.visible + onActivated: if (currentWebview) currentWebview.reload() + } + + // Ctrl+F: Find in Page + Shortcut { + sequence: StandardKey.Find + enabled: tabContainer.visible && !newTabViewLoader.active + onActivated: chrome.findInPageMode = true + } - // Ctrl + F: Find in Page - KeyboardShortcut { - modifiers: Qt.ControlModifier - key: Qt.Key_F - enabled: !newTabViewLoader.active && !bookmarksViewLoader.active - onTriggered: chrome.findInPageMode = true + // Ctrl+J: Show downloads page + Shortcut { + sequence: "Ctrl+J" + enabled: chrome.visible && + downloadHandlerLoader.status == Loader.Ready && + contentHandlerLoader.status == Loader.Ready && + !downloadsViewLoader.active + onActivated: downloadsViewLoader.active = true + } + + // Ctrl+G: Find next + Shortcut { + sequence: StandardKey.FindNext + enabled: currentWebview && chrome.findInPageMode + onActivated: currentWebview.findController.next() + } + + // Ctrl+Shift+G: Find previous + Shortcut { + sequence: StandardKey.FindPrevious + enabled: currentWebview && chrome.findInPageMode + onActivated: currentWebview.findController.previous() + } + + Loader { + id: contentHandlerLoader + source: "../ContentHandler.qml" + asynchronous: true + } + + Connections { + target: contentHandlerLoader.item + onExportFromDownloads: { + if (downloadHandlerLoader.status == Loader.Ready) { + downloadsViewLoader.active = true + downloadsViewLoader.item.mimetypeFilter = mimetypeFilter + downloadsViewLoader.item.activeTransfer = transfer + downloadsViewLoader.item.multiSelect = multiSelect + downloadsViewLoader.item.pickingMode = true + } } } + + Loader { + id: downloadDialogLoader + source: "ContentDownloadDialog.qml" + asynchronous: true + } + + Loader { + id: filePickerLoader + source: "ContentPickerDialog.qml" + asynchronous: true + } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BrowserTab.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BrowserTab.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/BrowserTab.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/BrowserTab.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -39,6 +39,7 @@ readonly property url icon: webview ? webview.icon : initialIcon property url preview property bool current: false + readonly property int lastCurrent: internal.lastCurrent property bool incognito visible: false @@ -116,8 +117,9 @@ } function close() { + var _url = url unload() - PreviewManager.checkDelete(url) + if (_url.toString()) PreviewManager.checkDelete(_url) destroy() } @@ -125,6 +127,7 @@ id: internal property bool hiding: false property var incubator: null + property int lastCurrent: 0 } // When current is set to false, delay hiding the tab contents to give it @@ -132,6 +135,7 @@ // only if embedders do not set the 'visible' property directly or // indirectly on instances of a BrowserTab. onCurrentChanged: { + internal.lastCurrent = Date.now() if (current) { internal.hiding = false z = 1 @@ -167,6 +171,29 @@ } } + // Take a capture of the current page shortly after it has finished + // loading to give rendering an opportunity to complete. There is + // unfortunately no signal to notify us when rendering has completed. + Timer { + id: delayedCapture + interval: 500 + onTriggered: { + if (webview && current && visible && !internal.hiding) { + webview.grabToImage(function(result) { + PreviewManager.saveToDisk(result, url) + }) + } + } + } + Connections { + target: webview + onLoadingStateChanged: { + if (!webview.loading && !webview.incognito) { + delayedCapture.restart() + } + } + } + onAboutToShow: { if (!current) { opacity = 0 diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/Chrome.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/Chrome.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/Chrome.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/Chrome.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -38,13 +38,15 @@ property alias incognito: navigationBar.incognito property alias showTabsBar: tabsBar.active property alias showFaviconInAddressBar: navigationBar.showFaviconInAddressBar + property alias availableHeight: navigationBar.availableHeight readonly property alias bookmarkTogglePlaceHolder: navigationBar.bookmarkTogglePlaceHolder + property bool touchEnabled: true signal switchToTab(int index) signal requestNewTab(int index, bool makeCurrent) signal tabClosed(int index) - backgroundColor: incognito ? UbuntuColors.darkGrey : "#bcbcbc" + backgroundColor: incognito ? UbuntuColors.darkGrey : "#ffffff" implicitHeight: tabsBar.height + navigationBar.height + content.anchors.topMargin @@ -61,7 +63,7 @@ Rectangle { anchors.fill: navigationBar - color: (showTabsBar || !incognito) ? "#f8f8f8" : UbuntuColors.darkGrey + color: (showTabsBar || !incognito) ? "#ffffff" : UbuntuColors.darkGrey } Loader { @@ -70,6 +72,8 @@ sourceComponent: TabsBar { model: tabsModel incognito: chrome.incognito + fgColor: navigationBar.fgColor + touchEnabled: chrome.touchEnabled onSwitchToTab: chrome.switchToTab(index) onRequestNewTab: chrome.requestNewTab(index, makeCurrent) onTabClosed: chrome.tabClosed(index) @@ -80,13 +84,14 @@ left: parent.left right: parent.right } - height: active ? (formFactor == "desktop" ? units.gu(3) : units.gu(4)) : 0 + height: active ? (touchEnabled ? units.gu(4) : units.gu(3)) : 0 } NavigationBar { id: navigationBar - iconColor: (incognito && !showTabsBar) ? "white" : UbuntuColors.darkGrey + fgColor: "#111111" + iconColor: (incognito && !showTabsBar) ? "white" : fgColor focus: true diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -13,17 +13,14 @@ bookmarks-model.cpp bookmarks-folder-model.cpp bookmarks-folderlist-model.cpp + downloads-model.cpp history-domain-model.cpp - history-domainlist-chronological-model.cpp history-domainlist-model.cpp - history-lastvisitdate-model.cpp history-lastvisitdatelist-model.cpp history-model.cpp - history-timeframe-model.cpp limit-proxy-model.cpp tabs-model.cpp text-search-filter-model.cpp - top-sites-model.cpp ) set(WEBBROWSER_APP_MODELS webbrowser-app-models) @@ -78,3 +75,8 @@ install(FILES "webbrowser-app.url-dispatcher" DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls) + +install(FILES "webbrowser-app-content-hub.json" + DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers + RENAME webbrowser-app + ) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContentDownloadDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContentDownloadDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContentDownloadDialog.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContentDownloadDialog.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,158 @@ +/* + * Copyright 2014-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 +import Ubuntu.Content 1.3 +import webbrowsercommon.private 0.1 +import ".." + +Component { + PopupBase { + id: downloadDialog + objectName: "downloadDialog" + anchors.fill: parent + property var activeTransfer + property string downloadId + property var singleDownload + property string mimeType + property string filename + property string icon: MimeDatabase.iconForMimetype(mimeType) + property alias contentType: peerPicker.contentType + + signal startDownload(string downloadId, var download, string mimeType) + + Component { + id: downloadOptionsComponent + Dialog { + id: downloadOptionsDialog + objectName: "downloadOptionsDialog" + Column { + spacing: units.gu(2) + + Item { + width: parent.width + height: mimetypeIcon.height + + Icon { + id: mimetypeIcon + name: icon != "" ? icon : "save" + height: units.gu(4.5) + width: height + } + + Label { + id: filenameLabel + anchors.top: mimetypeIcon.top + anchors.left: mimetypeIcon.right + anchors.leftMargin: units.gu(2) + anchors.right: parent.right + anchors.rightMargin: units.gu(2) + elide: Text.ElideMiddle + text: downloadDialog.filename + } + + Label { + anchors.top: filenameLabel.bottom + anchors.left: filenameLabel.left + anchors.right: filenameLabel.right + elide: Text.ElideRight + font.capitalization: Font.Capitalize + text: MimeDatabase.nameForMimetype(downloadDialog.mimeType) + } + } + + Label { + width: parent.width + text: i18n.tr("Choose an application to open this file or add it to the downloads folder.") + wrapMode: Text.Wrap + visible: peerModel.peers.length > 0 + } + + Button { + text: i18n.tr("Choose an application") + objectName: "chooseAppButton" + anchors.horizontalCenter: parent.horizontalCenter + width: units.gu(22) + height: units.gu(4) + visible: peerModel.peers.length > 0 + onClicked: { + PopupUtils.close(downloadOptionsDialog) + pickerRect.visible = true + } + } + + Button { + text: i18n.tr("Download") + objectName: "downloadFileButton" + anchors.horizontalCenter: parent.horizontalCenter + width: units.gu(22) + height: units.gu(4) + onClicked: { + startDownload(downloadId, singleDownload, mimeType) + PopupUtils.close(downloadDialog) + } + } + + Button { + text: i18n.tr("Cancel") + objectName: "cancelDownloadButton" + anchors.horizontalCenter: parent.horizontalCenter + width: units.gu(22) + height: units.gu(4) + onClicked: PopupUtils.close(downloadDialog) + } + } + } + } + + ContentPeerModel { + id: peerModel + handler: ContentHandler.Destination + contentType: downloadDialog.contentType + } + + Rectangle { + id: pickerRect + anchors.fill: parent + visible: false + ContentPeerPicker { + id: peerPicker + handler: ContentHandler.Destination + objectName: "contentPeerPicker" + visible: parent.visible + + onPeerSelected: { + activeTransfer = peer.request() + activeTransfer.downloadId = downloadDialog.downloadId + activeTransfer.state = ContentTransfer.Downloading + PopupUtils.close(downloadDialog) + } + + onCancelPressed: { + PopupUtils.close(downloadDialog) + } + } + } + + Component.onCompleted: { + PopupUtils.open(downloadOptionsComponent, downloadDialog) + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContentPickerDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContentPickerDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContentPickerDialog.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContentPickerDialog.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,111 @@ +/* + * Copyright 2014-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 as Popups +import Ubuntu.Content 1.3 +import com.canonical.Oxide 1.8 +import "../MimeTypeMapper.js" as MimeTypeMapper +import ".." + +Component { + Popups.PopupBase { + id: picker + objectName: "contentPickerDialog" + + // Set the parent at construction time, instead of letting show() + // set it later on, which for some reason results in the size of + // the dialog not being updated. + parent: QuickUtils.rootItem(this) + + property var activeTransfer + + Rectangle { + anchors.fill: parent + + ContentTransferHint { + anchors.fill: parent + activeTransfer: picker.activeTransfer + } + + ContentPeerPicker { + id: peerPicker + anchors.fill: parent + visible: true + contentType: ContentType.All + handler: ContentHandler.Source + + onPeerSelected: { + if (peer.appId == "webbrowser-app") { + // If we're inside the browser and the user has + // requested content from the browser then we + // need to handle the transfer internally + var downloadsPage = picker.WebView.view.showDownloadsPage() + downloadsPage.mimetypeFilter = MimeTypeMapper.mimeTypeRegexForContentType(contentType) + downloadsPage.multiSelect = model.allowMultipleFiles + downloadsPage.selectMode = false + downloadsPage.pickingMode = true + downloadsPage.internalFilePicker = model + Popups.PopupUtils.close(picker) + } else { + if (model.allowMultipleFiles) { + peer.selectionType = ContentTransfer.Multiple + } else { + peer.selectionType = ContentTransfer.Single + } + picker.activeTransfer = peer.request() + stateChangeConnection.target = picker.activeTransfer + } + } + + onCancelPressed: { + model.reject() + } + } + } + + Connections { + id: stateChangeConnection + target: null + onStateChanged: { + if (picker.activeTransfer.state === ContentTransfer.Charged) { + var selectedItems = [] + for(var i in picker.activeTransfer.items) { + selectedItems.push(String(picker.activeTransfer.items[i].url).replace("file://", "")) + } + model.accept(selectedItems) + } + } + } + + Component.onCompleted: { + if(acceptTypes.length === 1) { + var contentType = MimeTypeMapper.mimeTypeToContentType(acceptTypes[0]) + if(contentType == ContentType.Unknown) { + // If we don't recognise the type, allow uploads from any app + contentType = ContentType.All + } + peerPicker.contentType = contentType + } else { + peerPicker.contentType = ContentType.All + } + show() + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContextMenuMobile.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContextMenuMobile.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContextMenuMobile.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContextMenuMobile.qml 2016-04-13 15:22:01.000000000 +0000 @@ -152,4 +152,9 @@ property: "itemSpacing" value: 0 } + + // We can’t prevent the dialog from stealing the focus from + // the webview, but we can at least restore it when the + // dialog is closed (https://launchpad.net/bugs/1526884). + Component.onDestruction: Oxide.WebView.view.forceActiveFocus() } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContextMenuWide.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContextMenuWide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ContextMenuWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ContextMenuWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -136,4 +136,20 @@ contextModel.close() } } + + // Override default implementation to prevent context menu from stealing + // active focus when shown (https://launchpad.net/bugs/1526884). + function show() { + visible = true + __foreground.show() + } + + Binding { + // Ensure the context menu doesn’t steal focus from + // the webview when one of its actions is activated + // (https://launchpad.net/bugs/1526884). + target: __foreground + property: "activeFocusOnPress" + value: false + } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/DownloadDelegate.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/DownloadDelegate.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/DownloadDelegate.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/DownloadDelegate.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,235 @@ +/* + * Copyright 2014-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import ".." + +ListItem { + id: downloadDelegate + + property var downloadManager + + property alias icon: mimeicon.name + property alias image: thumbimage.source + property alias title: title.text + property alias url: url.text + property string errorMessage + property bool incomplete: false + property string downloadId + property var download + property int progress: download ? download.progress : 0 + property bool paused + + divider.visible: false + + signal removed() + signal cancelled() + + height: visible ? (incomplete ? (paused ? units.gu(13) : units.gu(10)) : units.gu(7)) : 0 + + QtObject { + id: internal + + function connectToDownloadObject() { + if (incomplete && !download && downloadManager) { + for(var i = 0; i < downloadManager.downloads.length; i++) { + if (downloadManager.downloads[i].downloadId == downloadId) { + download = downloadManager.downloads[i] + } + } + } + } + } + + Component.onCompleted: internal.connectToDownloadObject() + onDownloadManagerChanged: internal.connectToDownloadObject() + + Item { + + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + + Item { + id: iconContainer + width: units.gu(3) + height: width + anchors.verticalCenter: parent.verticalCenter + anchors.verticalCenterOffset: downloadDelegate.incomplete ? -units.gu(1) : 0 + + Image { + id: thumbimage + asynchronous: true + width: parent.width + height: parent.height + fillMode: Image.PreserveAspectFit + sourceSize.width: parent.width + sourceSize.height: parent.height + anchors.verticalCenter: parent.verticalCenter + } + + Image { + id: mimeicon + asynchronous: true + anchors.fill: parent + anchors.margins: units.gu(0.2) + source: "image://theme/%1".arg(name != "" ? name : "save") + visible: thumbimage.status !== Image.Ready + cache: true + property string name + } + } + + Item { + anchors.top: iconContainer.top + anchors.left: iconContainer.right + anchors.leftMargin: units.gu(2) + anchors.right: parent.right + + Column { + id: detailsColumn + width: parent.width - cancelColumn.width + height: parent.height + + Label { + id: title + fontSize: "x-small" + color: "#5d5d5d" + elide: Text.ElideRight + width: parent.width + } + + Label { + id: url + fontSize: "x-small" + color: "#5d5d5d" + elide: Text.ElideRight + width: parent.width + } + + Item { + height: error.visible ? units.gu(1) : units.gu(2) + width: parent.width + visible: downloadDelegate.incomplete + } + + Item { + id: error + visible: incomplete && download === undefined || errorMessage !== "" + height: units.gu(3) + width: parent.width + + Icon { + id: errorIcon + width: units.gu(2) + height: width + anchors.verticalCenter: parent.verticalCenter + name: "dialog-warning-symbolic" + color: UbuntuColors.red + } + + Label { + width: parent.width - errorIcon.width + anchors.left: errorIcon.right + anchors.leftMargin: units.gu(1) + anchors.verticalCenter: errorIcon.verticalCenter + fontSize: "x-small" + color: UbuntuColors.red + text: errorMessage !== "" ? errorMessage + : (incomplete && download === undefined) ? i18n.tr("Download failed") + : "" + elide: Text.ElideRight + } + } + + IndeterminateProgressBar { + id: progressBar + width: parent.width + height: units.gu(0.5) + visible: downloadDelegate.incomplete && !error.visible + progress: downloadDelegate.progress + // Work around UDM bug #1450144 + indeterminateProgress: downloadDelegate.progress < 0 || downloadDelegate.progress > 100 + } + } + + Column { + id: cancelColumn + spacing: units.gu(1) + anchors.top: detailsColumn.top + anchors.left: detailsColumn.right + anchors.leftMargin: units.gu(2) + width: downloadDelegate.incomplete && !error.visible ? cancelButton.width + units.gu(2) : 0 + + Button { + visible: downloadDelegate.incomplete && !error.visible + id: cancelButton + text: i18n.tr("Cancel") + onClicked: { + if (download) { + download.cancel() + cancelled() + } + } + } + + Label { + visible: !progressBar.indeterminateProgress && downloadDelegate.incomplete + && !error.visible + && !downloadDelegate.paused + width: cancelButton.width + horizontalAlignment: Text.AlignHCenter + fontSize: "x-small" + text: progressBar.progress + "%" + } + + Button { + visible: downloadDelegate.paused + text: i18n.tr("Resume") + width: cancelButton.width + onClicked: { + if (download) { + download.resume() + } + } + } + } + + } + } + + leadingActions: error.visible || !downloadDelegate.incomplete ? deleteActionList : null + + ListItemActions { + id: deleteActionList + actions: [ + Action { + objectName: "leadingAction.delete" + iconName: "delete" + enabled: error.visible || !downloadDelegate.incomplete + onTriggered: error.visible ? downloadDelegate.cancelled() + : downloadDelegate.removed() + } + ] + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/DownloadHandler.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/DownloadHandler.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/DownloadHandler.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/DownloadHandler.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,46 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.DownloadManager 1.2 +import webbrowserapp.private 0.1 + +DownloadManager { + onDownloadFinished: { + if (DownloadsModel.contains(download.downloadId)) { + DownloadsModel.moveToDownloads(download.downloadId, path) + } + DownloadsModel.setComplete(download.downloadId, true) + } + + onDownloadPaused: { + DownloadsModel.pauseDownload(download.downloadId) + } + + onDownloadResumed: { + DownloadsModel.resumeDownload(download.downloadId) + } + + onDownloadCanceled: { + DownloadsModel.cancelDownload(download.downloadId) + } + + onErrorFound: { + DownloadsModel.setError(download.downloadId, download.errorMessage) + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/downloads-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/downloads-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/downloads-model.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/downloads-model.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,420 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "downloads-model.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#define CONNECTION_NAME "webbrowser-app-downloads" + +/*! + \class DownloadsModel + \brief List model that stores information about downloaded files. + + DownloadsModel is a list model that stores information about files that + have been downloaded by the browser and stored permanently + (e.g. in ~/Downloads), as opposed to those that were sent directly to + another application after download. For each download the original URL, the + path to the downloaded file, the file mimetype and the download time are + stored. The model is sorted chronologically to display the most recent + download first. + + The information is persistently stored on disk in a SQLite database. + The database is read at startup to populate the model, and whenever a new + entry is added to the model or an entry is removed from the model + the database is updated. Removing a download from the model also results + in it being deleted from the disk. + The model doesn’t monitor the database for external changes, but does check + that downloaded files still exist when first populating. +*/ +DownloadsModel::DownloadsModel(QObject* parent) + : QAbstractListModel(parent) + , m_numRows(0) + , m_fetchedCount(0) + , m_canFetchMore(true) +{ + m_database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), CONNECTION_NAME); +} + +DownloadsModel::~DownloadsModel() +{ + m_database.close(); + m_database = QSqlDatabase(); + QSqlDatabase::removeDatabase(CONNECTION_NAME); +} + +void DownloadsModel::resetDatabase(const QString& databaseName) +{ + beginResetModel(); + m_orderedEntries.clear(); + m_database.close(); + m_database.setDatabaseName(databaseName); + m_database.open(); + m_numRows = 0; + m_fetchedCount = 0; + m_canFetchMore = true; + createOrAlterDatabaseSchema(); + endResetModel(); + Q_EMIT rowCountChanged(); +} + +void DownloadsModel::createOrAlterDatabaseSchema() +{ + QSqlQuery createQuery(m_database); + QString query = QLatin1String("CREATE TABLE IF NOT EXISTS downloads " + "(downloadId VARCHAR, url VARCHAR, path VARCHAR, " + "mimetype VARCHAR, complete BOOL, paused BOOL, " + "error VARCHAR, created DATETIME DEFAULT " + "CURRENT_TIMESTAMP);"); + createQuery.prepare(query); + createQuery.exec(); +} + +void DownloadsModel::fetchMore(const QModelIndex &parent) +{ + QSqlQuery populateQuery(m_database); + QString query = QLatin1String("SELECT downloadId, url, path, mimetype, " + "complete, error, created, paused " + "FROM downloads ORDER BY created DESC LIMIT 100 OFFSET ?;"); + populateQuery.prepare(query); + populateQuery.addBindValue(m_fetchedCount); + populateQuery.exec(); + int count = 0; // size() isn't supported on the sqlite backend + while (populateQuery.next()) { + DownloadEntry entry; + entry.downloadId = populateQuery.value(0).toString(); + entry.url = populateQuery.value(1).toUrl(); + entry.path = populateQuery.value(2).toString(); + entry.mimetype = populateQuery.value(3).toString(); + entry.complete = populateQuery.value(4).toBool(); + entry.error = populateQuery.value(5).toString(); + entry.created = QDateTime::fromTime_t(populateQuery.value(6).toInt()); + entry.paused = populateQuery.value(7).toBool(); + QFileInfo fileInfo(entry.path); + if (fileInfo.exists()) { + entry.filename = fileInfo.fileName(); + } + + // Only list a completed entry if its file exists, however we don't + // remove the entry if the file is missing as it may be stored on a + // removable medium like an SD card in the future, so could reappear. + if (!entry.complete || fileInfo.exists()) { + beginInsertRows(QModelIndex(), m_numRows, m_numRows); + m_orderedEntries.append(entry); + endInsertRows(); + m_numRows++; + } + count++; + } + m_fetchedCount += count; + if (count == 0) { + m_canFetchMore = false; + } +} + +QHash DownloadsModel::roleNames() const +{ + static QHash roles; + if (roles.isEmpty()) { + roles[DownloadId] = "downloadId"; + roles[Url] = "url"; + roles[Path] = "path"; + roles[Filename] = "filename"; + roles[Mimetype] = "mimetype"; + roles[Complete] = "complete"; + roles[Paused] = "paused"; + roles[Error] = "error"; + roles[Created] = "created"; + } + return roles; +} + +int DownloadsModel::rowCount(const QModelIndex& parent) const +{ + Q_UNUSED(parent); + return m_orderedEntries.count(); +} + +QVariant DownloadsModel::data(const QModelIndex& index, int role) const +{ + if (!index.isValid()) { + return QVariant(); + } + const DownloadEntry& entry = m_orderedEntries.at(index.row()); + switch (role) { + case DownloadId: + return entry.downloadId; + case Url: + return entry.url; + case Path: + return entry.path; + case Filename: + return entry.filename; + case Mimetype: + return entry.mimetype; + case Complete: + return entry.complete; + case Paused: + return entry.paused; + case Error: + return entry.error; + case Created: + return entry.created; + default: + return QVariant(); + } +} + +const QString DownloadsModel::databasePath() const +{ + return m_database.databaseName(); +} + +void DownloadsModel::setDatabasePath(const QString& path) +{ + if (path != databasePath()) { + if (path.isEmpty()) { + resetDatabase(":memory:"); + } else { + resetDatabase(path); + } + Q_EMIT databasePathChanged(); + } +} + +bool DownloadsModel::contains(const QString& downloadId) const +{ + Q_FOREACH(const DownloadEntry& entry, m_orderedEntries) { + if (entry.downloadId == downloadId) { + return true; + } + } + return false; +} + +/*! + Add a download to the database. This should happen as soon as the download + is started. +*/ +void DownloadsModel::add(const QString& downloadId, const QUrl& url, const QString& mimetype) +{ + beginInsertRows(QModelIndex(), 0, 0); + DownloadEntry entry; + entry.downloadId = downloadId; + entry.complete = false; + entry.paused = false; + entry.url = url; + entry.mimetype = mimetype; + m_orderedEntries.prepend(entry); + m_numRows++; + m_fetchedCount++; + endInsertRows(); + Q_EMIT added(downloadId, url, mimetype); + insertNewEntryInDatabase(entry); + Q_EMIT rowCountChanged(); +} + +void DownloadsModel::setPath(const QString& downloadId, const QString& path) +{ + QSqlQuery query(m_database); + + // Override reported mimetype from server with detected mimetype from file once downloaded + QMimeDatabase mimeDatabase; + QString mimetype = mimeDatabase.mimeTypeForFile(path).name(); + + static QString updateStatement = QLatin1String("UPDATE downloads SET mimetype = ?, " + "path = ? WHERE downloadId = ?"); + query.prepare(updateStatement); + query.addBindValue(mimetype); + query.addBindValue(path); + query.addBindValue(downloadId); + query.exec(); + Q_EMIT pathChanged(downloadId, path); +} + +void DownloadsModel::setComplete(const QString& downloadId, const bool complete) +{ + QSqlQuery query(m_database); + static QString updateStatement = QLatin1String("UPDATE downloads SET complete = ? " + "WHERE downloadId = ?"); + query.prepare(updateStatement); + query.addBindValue(complete); + query.addBindValue(downloadId); + query.exec(); + Q_EMIT completeChanged(downloadId, complete); + reload(); +} + +void DownloadsModel::setError(const QString& downloadId, const QString& error) +{ + QSqlQuery query(m_database); + static QString updateStatement = QLatin1String("UPDATE downloads SET error = ? " + "WHERE downloadId = ?"); + query.prepare(updateStatement); + query.addBindValue(error); + query.addBindValue(downloadId); + query.exec(); + Q_EMIT errorChanged(downloadId, error); + reload(); +} + +void DownloadsModel::moveToDownloads(const QString& downloadId, const QString& path) +{ + QFile file(path); + if (file.exists()) { + QFileInfo fi(path); + QString suffix = fi.completeSuffix(); + QString filename = fi.fileName(); + QString filenameWithoutSuffix = filename.left(filename.size() - suffix.size()); + QString dir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); + QString destination = dir + QDir::separator() + filenameWithoutSuffix + suffix; + // Avoid filename collision by automatically inserting an incremented + // number into the filename if the original name already exists. + int append = 1; + while (QFile::exists(destination)) { + destination = QString("%1%2.%3").arg(dir + QDir::separator() + filenameWithoutSuffix, QString::number(append), suffix); + ++append; + } + if (file.rename(destination)) { + setPath(downloadId, destination); + } else { + qWarning() << "Failed moving file from" << path << "to" << destination; + } + } else { + qWarning() << "Download not found:" << path; + } +} + +void DownloadsModel::insertNewEntryInDatabase(const DownloadEntry& entry) +{ + QSqlQuery query(m_database); + static QString insertStatement = QLatin1String("INSERT INTO downloads (downloadId, url, " + "mimetype) " + "VALUES (?, ?, ?);"); + query.prepare(insertStatement); + query.addBindValue(entry.downloadId); + query.addBindValue(entry.url); + query.addBindValue(entry.mimetype); + query.exec(); +} + +/*! + Remove a downloaded file from the list of downloads and + delete the file. +*/ +void DownloadsModel::deleteDownload(const QString& path) +{ + int index = 0; + Q_FOREACH(DownloadEntry entry, m_orderedEntries) { + if (entry.path == path) { + beginRemoveRows(QModelIndex(), index, index); + m_orderedEntries.removeAt(index); + endRemoveRows(); + Q_EMIT deleted(path); + removeExistingEntryFromDatabase(path); + m_fetchedCount--; + m_numRows--; + Q_EMIT rowCountChanged(); + QFile::remove(path); + return; + } else { + index++; + } + } +} + +/*! + Remove a cancelled download from the model and the database. +*/ +void DownloadsModel::cancelDownload(const QString& downloadId) +{ + int index=0; + Q_FOREACH(DownloadEntry entry, m_orderedEntries) { + if (entry.downloadId == downloadId) { + beginRemoveRows(QModelIndex(), index, index); + m_orderedEntries.removeAt(index); + QSqlQuery query(m_database); + static QString deleteStatement = QLatin1String("DELETE FROM downloads WHERE downloadId=?;"); + query.prepare(deleteStatement); + query.addBindValue(downloadId); + query.exec(); + endRemoveRows(); + m_fetchedCount--; + m_numRows--; + Q_EMIT rowCountChanged(); + return; + } else { + index++; + } + } +} + +void DownloadsModel::pauseDownload(const QString& downloadId) +{ + QSqlQuery query(m_database); + static QString pauseStatement = QLatin1String("UPDATE downloads SET paused=1 WHERE downloadId=?;"); + query.prepare(pauseStatement); + query.addBindValue(downloadId); + query.exec(); + reload(); +} + +void DownloadsModel::resumeDownload(const QString& downloadId) +{ + QSqlQuery query(m_database); + static QString resumeStatement = QLatin1String("UPDATE downloads SET paused=0 WHERE downloadId=?;"); + query.prepare(resumeStatement); + query.addBindValue(downloadId); + query.exec(); + reload(); +} + +void DownloadsModel::removeExistingEntryFromDatabase(const QString& path) +{ + QSqlQuery query(m_database); + static QString deleteStatement = QLatin1String("DELETE FROM downloads WHERE path=?;"); + query.prepare(deleteStatement); + query.addBindValue(path); + query.exec(); +} + +bool DownloadsModel::canFetchMore(const QModelIndex &parent) const +{ + Q_UNUSED(parent) + + return m_canFetchMore; +} + +void DownloadsModel::reload() +{ + beginResetModel(); + m_orderedEntries.clear(); + m_canFetchMore = true; + m_fetchedCount = 0; + m_numRows = 0; + endResetModel(); + fetchMore(); + Q_EMIT rowCountChanged(); +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/downloads-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/downloads-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/downloads-model.h 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/downloads-model.h 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,111 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __DOWNLOADS_MODEL_H__ +#define __DOWNLOADS_MODEL_H__ + +#include +#include +#include +#include +#include +#include +#include + +class DownloadsModel : public QAbstractListModel +{ + Q_OBJECT + + Q_PROPERTY(QString databasePath READ databasePath WRITE setDatabasePath NOTIFY databasePathChanged) + Q_PROPERTY(int count READ rowCount NOTIFY rowCountChanged) + + Q_ENUMS(Roles) + +public: + DownloadsModel(QObject* parent=0); + ~DownloadsModel(); + + enum Roles { + DownloadId = Qt::UserRole + 1, + Url, + Path, + Filename, + Mimetype, + Complete, + Paused, + Error, + Created + }; + + // reimplemented from QAbstractListModel + QHash roleNames() const; + int rowCount(const QModelIndex& parent=QModelIndex()) const; + QVariant data(const QModelIndex& index, int role) const; + bool canFetchMore(const QModelIndex &parent = QModelIndex()) const; + void fetchMore(const QModelIndex &parent = QModelIndex()); + + const QString databasePath() const; + void setDatabasePath(const QString& path); + + Q_INVOKABLE bool contains(const QString& downloadId) const; + Q_INVOKABLE void add(const QString& downloadId, const QUrl& url, const QString& mimetype); + Q_INVOKABLE void moveToDownloads(const QString& downloadId, const QString& path); + Q_INVOKABLE void setPath(const QString& downloadId, const QString& path); + Q_INVOKABLE void setComplete(const QString& downloadId, const bool complete); + Q_INVOKABLE void setError(const QString& downloadId, const QString& error); + Q_INVOKABLE void deleteDownload(const QString& path); + Q_INVOKABLE void cancelDownload(const QString& downloadId); + Q_INVOKABLE void pauseDownload(const QString& downloadId); + Q_INVOKABLE void resumeDownload(const QString& downloadId); + +Q_SIGNALS: + void databasePathChanged() const; + void added(const QString& downloadId, const QUrl& url, const QString& mimetype) const; + void pathChanged(const QString& downloadId, const QString& path) const; + void completeChanged(const QString& downloadId, const bool complete) const; + void errorChanged(const QString& downloadId, const QString& error) const; + void deleted(const QString& path) const; + void rowCountChanged(); + +private: + QSqlDatabase m_database; + int m_numRows; + int m_fetchedCount; + bool m_canFetchMore; + + struct DownloadEntry { + QString downloadId; + QUrl url; + QString path; + QString filename; + QString mimetype; + bool complete; + bool paused; + QString error; + QDateTime created; + }; + QList m_orderedEntries; + + void resetDatabase(const QString& databaseName); + void createOrAlterDatabaseSchema(); + void insertNewEntryInDatabase(const DownloadEntry& entry); + void removeExistingEntryFromDatabase(const QString& path); + void reload(); +}; + +#endif // __DOWNLOADS_MODEL_H__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/DownloadsPage.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/DownloadsPage.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/DownloadsPage.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/DownloadsPage.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Content 1.3 +import webbrowserapp.private 0.1 +import webbrowsercommon.private 0.1 + +import "../MimeTypeMapper.js" as MimeTypeMapper +import ".." + +FocusScope { + id: downloadsItem + + property var downloadManager + + // We can get file picking requests either via content-hub (activeTransfer) + // Or via the internal oxide file picker (internalFilePicker) in the case + // where the user wishes to upload a file from their previous downloads. + property var activeTransfer + property var internalFilePicker + + property bool selectMode + property bool pickingMode + property bool multiSelect + property alias mimetypeFilter: downloadModelFilter.pattern + + signal done() + + Loader { + id: thumbnailLoader + source: "Thumbnailer.qml" + } + + Rectangle { + anchors.fill: parent + color: "#fbfbfb" + } + + BrowserPageHeader { + id: title + text: i18n.tr("Downloads") + color: "#f7f7f7" + actions: [ + Action { + text: i18n.tr("Confirm selection") + iconName: "tick" + visible: pickingMode + enabled: downloadsListView.ViewItems.selectedIndices.length > 0 + onTriggered: { + var results = [] + if (internalFilePicker) { + for (var i = 0; i < downloadsListView.ViewItems.selectedIndices.length; i++) { + var selectedDownload = downloadsListView.model.get(downloadsListView.ViewItems.selectedIndices[i]) + results.push(selectedDownload.path) + } + internalFilePicker.accept(results) + } else { + for (var i = 0; i < downloadsListView.ViewItems.selectedIndices.length; i++) { + var selectedDownload = downloadsListView.model.get(downloadsListView.ViewItems.selectedIndices[i]) + results.push(resultComponent.createObject(downloadsItem, {"url": "file://" + selectedDownload.path})) + } + activeTransfer.items = results + activeTransfer.state = ContentTransfer.Charged + } + downloadsItem.done() + } + }, + Action { + text: i18n.tr("Select all") + iconName: "select" + visible: selectMode + onTriggered: { + if (downloadsListView.ViewItems.selectedIndices.length === downloadsListView.count) { + downloadsListView.ViewItems.selectedIndices = [] + } else { + var indices = [] + for (var i = 0; i < downloadsListView.count; ++i) { + indices.push(i) + } + downloadsListView.ViewItems.selectedIndices = indices + } + } + }, + Action { + text: i18n.tr("Delete") + iconName: "delete" + visible: selectMode + enabled: downloadsListView.ViewItems.selectedIndices.length > 0 + onTriggered: { + var toDelete = [] + for (var i = 0; i < downloadsListView.ViewItems.selectedIndices.length; i++) { + var selectedDownload = downloadsListView.model.get(downloadsListView.ViewItems.selectedIndices[i]) + toDelete.push(selectedDownload.path) + } + for (var i = 0; i < toDelete.length; i++) { + DownloadsModel.deleteDownload(toDelete[i]) + } + downloadsListView.ViewItems.selectedIndices = [] + downloadsItem.selectMode = false + } + }, + Action { + iconName: "edit" + visible: !selectMode && !pickingMode + enabled: downloadsListView.count > 0 + onTriggered: { + selectMode = true + multiSelect = true + } + } + ] + onBack: { + if (selectMode) { + selectMode = false + } else { + if (activeTransfer) { + activeTransfer.state = ContentTransfer.Aborted + } + if (internalFilePicker) { + internalFilePicker.reject() + } + downloadsItem.done() + } + } + } + + Component { + id: resultComponent + ContentItem { } + } + + ListView { + id: downloadsListView + clip: true + focus: !exportPeerPicker.focus + + anchors { + fill: parent + topMargin: title.height + } + + model: SortFilterModel { + model: DownloadsModel + filter { + id: downloadModelFilter + property: "mimetype" + } + } + + property int selectedIndex: -1 + ViewItems.selectMode: downloadsItem.selectMode || downloadsItem.pickingMode + ViewItems.onSelectedIndicesChanged: { + if (downloadsItem.multiSelect) { + return + } + // Enforce single selection mode to work around + // the lack of such a feature in the UITK. + if (ViewItems.selectedIndices.length > 1 && selectedIndex != -1) { + var selection = ViewItems.selectedIndices + selection.splice(selection.indexOf(selectedIndex), 1) + selectedIndex = selection[0] + ViewItems.selectedIndices = selection + return + } + if (ViewItems.selectedIndices.length > 0) { + selectedIndex = ViewItems.selectedIndices[0] + } else { + selectedIndex = -1 + } + } + + delegate: DownloadDelegate { + downloadManager: downloadsItem.downloadManager + downloadId: model.downloadId + title: model.filename ? model.filename : model.url.toString().split('/').pop().split('?').shift() + url: model.url + image: model.complete && thumbnailLoader.status == Loader.Ready + && (model.mimetype.indexOf("image") === 0 + || model.mimetype.indexOf("video") === 0) + ? "image://thumbnailer/file://" + model.path : "" + icon: MimeDatabase.iconForMimetype(model.mimetype) + incomplete: !model.complete + visible: !(selectMode && incomplete) + errorMessage: model.error + paused: model.paused + + onClicked: { + if (model.complete && !selectMode) { + exportPeerPicker.contentType = MimeTypeMapper.mimeTypeToContentType(model.mimetype) + exportPeerPicker.visible = true + exportPeerPicker.path = model.path + } + } + + onPressAndHold: { + if (downloadsItem.selectMode || downloadsItem.pickingMode) { + return + } + downloadsItem.selectMode = true + downloadsItem.multiSelect = true + if (downloadsItem.selectMode) { + downloadsListView.ViewItems.selectedIndices = [index] + } + } + + onRemoved: { + if (model.complete) { + DownloadsModel.deleteDownload(model.path) + } + } + + onCancelled: { + DownloadsModel.cancelDownload(model.downloadId) + } + } + + highlight: ListViewHighlight {} + + Keys.onEnterPressed: currentItem.clicked() + Keys.onReturnPressed: currentItem.clicked() + Keys.onEscapePressed: { + if (selectMode) { + selectMode = false + } else { + event.accepted = false + } + } + Keys.onSpacePressed: { + if (selectMode || pickingMode) { + currentItem.clicked() + } + } + Keys.onDeletePressed: { + if (!selectMode && !pickingMode) { + currentItem.removed() + } + } + } + + Label { + id: emptyLabel + anchors.centerIn: parent + visible: downloadsListView.count == 0 + wrapMode: Text.Wrap + width: parent.width + horizontalAlignment: Text.AlignHCenter + text: i18n.tr("No downloads available") + } + + Component { + id: contentItemComponent + ContentItem {} + } + + ContentPeerPicker { + id: exportPeerPicker + visible: false + focus: visible + anchors.fill: parent + handler: ContentHandler.Destination + property string path + onPeerSelected: { + var transfer = peer.request() + if (transfer.state === ContentTransfer.InProgress) { + transfer.items = [contentItemComponent.createObject(downloadsItem, {"url": path})] + transfer.state = ContentTransfer.Charged + } + visible = false + } + onCancelPressed: visible = false + Keys.onEscapePressed: visible = false + } + +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ExpandedHistoryView.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ExpandedHistoryView.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ExpandedHistoryView.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ExpandedHistoryView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -20,7 +20,7 @@ import Ubuntu.Components 1.3 import ".." -Item { +FocusScope { id: expandedHistoryView property alias model: entriesListView.model @@ -30,6 +30,12 @@ signal historyEntryRemoved(url url) signal done() + MouseArea { + // Prevent click events from propagating through to the view below + anchors.fill: parent + acceptedButtons: Qt.AllButtons + } + Rectangle { anchors.fill: parent color: "#f6f6f6" @@ -38,13 +44,16 @@ ListView { id: entriesListView + focus: true + clip: true + anchors { top: header.bottom + topMargin: units.gu(1.5) bottom: parent.bottom + bottomMargin: units.gu(1.5) left: parent.left right: parent.right - margins: units.gu(1.5) - leftMargin: 0 } section.property: "lastVisitDate" @@ -69,10 +78,18 @@ onClicked: expandedHistoryView.historyEntryClicked(model.url) onRemoved: expandedHistoryView.historyEntryRemoved(model.url) } + + highlight: ListViewHighlight {} + + Keys.onEnterPressed: currentItem.clicked() + Keys.onReturnPressed: currentItem.clicked() + Keys.onDeletePressed: currentItem.removed() + Keys.onEscapePressed: done() } Item { id: header + objectName: "header" anchors { top: parent.top @@ -99,8 +116,8 @@ top: parent.top topMargin: -units.gu(0.7) } - icon: expandedHistoryView.model.lastVisitedIcon - title: expandedHistoryView.model.domain + icon: model ? model.lastVisitedIcon : "" + title: model ? model.domain : "" url: i18n.tr("%1 page", "%1 pages", entriesListView.count).arg(entriesListView.count) enabled: false } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-chronological-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-chronological-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-chronological-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-chronological-model.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* - * Copyright 2013-2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "history-domainlist-chronological-model.h" -#include "history-domainlist-model.h" - -/*! - \class HistoryDomainListChronologicalModel - \brief Proxy model that sorts a domain list model in reverse chronological - order - - HistoryDomainListChronologicalModel is a proxy model that sorts a - HistoryDomainListModel in reverse chronological order - (i.e. the domain with the latest entry visited first). -*/ -HistoryDomainListChronologicalModel::HistoryDomainListChronologicalModel(QObject* parent) - : QSortFilterProxyModel(parent) -{ - setDynamicSortFilter(true); - setSortRole(HistoryDomainListModel::LastVisit); - sort(0, Qt::DescendingOrder); -} - -HistoryDomainListModel* HistoryDomainListChronologicalModel::sourceModel() const -{ - return qobject_cast(QSortFilterProxyModel::sourceModel()); -} - -void HistoryDomainListChronologicalModel::setSourceModel(HistoryDomainListModel* sourceModel) -{ - if (sourceModel != this->sourceModel()) { - QSortFilterProxyModel::setSourceModel(sourceModel); - Q_EMIT sourceModelChanged(); - } -} - -QString HistoryDomainListChronologicalModel::get(int index) const -{ - return data(this->index(index, 0), HistoryDomainListModel::Domain).toString(); -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-chronological-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-chronological-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-chronological-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-chronological-model.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/* - * Copyright 2013-2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __HISTORY_DOMAINLIST_CHRONOLOGICAL_MODEL_H__ -#define __HISTORY_DOMAINLIST_CHRONOLOGICAL_MODEL_H__ - -// Qt -#include -#include - -class HistoryDomainListModel; - -class HistoryDomainListChronologicalModel : public QSortFilterProxyModel -{ - Q_OBJECT - - Q_PROPERTY(HistoryDomainListModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) - -public: - HistoryDomainListChronologicalModel(QObject* parent=0); - - HistoryDomainListModel* sourceModel() const; - void setSourceModel(HistoryDomainListModel* sourceModel); - - Q_INVOKABLE QString get(int index) const; - -Q_SIGNALS: - void sourceModelChanged() const; -}; - -#endif // __HISTORY_DOMAINLIST_CHRONOLOGICAL_MODEL_H__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-model.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -19,7 +19,6 @@ #include "history-domain-model.h" #include "history-domainlist-model.h" #include "history-model.h" -#include "history-timeframe-model.h" // Qt #include @@ -29,7 +28,7 @@ \brief List model that exposes history entries grouped by domain name HistoryDomainListModel is a list model that exposes history entries from a - HistoryTimeframeModel grouped by domain name. Each item in the list has + HistoryModel grouped by domain name. Each item in the list has three roles: 'domain' for the domain name, 'lastVisit' for the timestamp of the last page visited in this domain, and 'entries' for the corresponding HistoryDomainModel that contains all entries in this group. @@ -91,12 +90,12 @@ } } -HistoryTimeframeModel* HistoryDomainListModel::sourceModel() const +HistoryModel* HistoryDomainListModel::sourceModel() const { return m_sourceModel; } -void HistoryDomainListModel::setSourceModel(HistoryTimeframeModel* sourceModel) +void HistoryDomainListModel::setSourceModel(HistoryModel* sourceModel) { if (sourceModel != m_sourceModel) { beginResetModel(); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domainlist-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domainlist-model.h 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -25,13 +25,13 @@ #include class HistoryDomainModel; -class HistoryTimeframeModel; +class HistoryModel; class HistoryDomainListModel : public QAbstractListModel { Q_OBJECT - Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) + Q_PROPERTY(HistoryModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) Q_ENUMS(Roles) @@ -53,8 +53,8 @@ int rowCount(const QModelIndex& parent=QModelIndex()) const; QVariant data(const QModelIndex& index, int role) const; - HistoryTimeframeModel* sourceModel() const; - void setSourceModel(HistoryTimeframeModel* sourceModel); + HistoryModel* sourceModel() const; + void setSourceModel(HistoryModel* sourceModel); Q_SIGNALS: void sourceModelChanged() const; @@ -67,7 +67,7 @@ void onDomainDataChanged(); private: - HistoryTimeframeModel* m_sourceModel; + HistoryModel* m_sourceModel; QMap m_domains; void clearDomains(); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domain-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domain-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domain-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domain-model.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,7 +18,6 @@ #include "history-domain-model.h" #include "history-model.h" -#include "history-timeframe-model.h" // Qt #include @@ -46,12 +45,12 @@ connect(this, SIGNAL(dataChanged(QModelIndex, QModelIndex, QVector)), SLOT(onModelChanged())); } -HistoryTimeframeModel* HistoryDomainModel::sourceModel() const +HistoryModel* HistoryDomainModel::sourceModel() const { - return qobject_cast(QSortFilterProxyModel::sourceModel()); + return qobject_cast(QSortFilterProxyModel::sourceModel()); } -void HistoryDomainModel::setSourceModel(HistoryTimeframeModel* sourceModel) +void HistoryDomainModel::setSourceModel(HistoryModel* sourceModel) { if (sourceModel != this->sourceModel()) { QSortFilterProxyModel::setSourceModel(sourceModel); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domain-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domain-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-domain-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-domain-model.h 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -25,13 +25,13 @@ #include #include -class HistoryTimeframeModel; +class HistoryModel; class HistoryDomainModel : public QSortFilterProxyModel { Q_OBJECT - Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) + Q_PROPERTY(HistoryModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged) Q_PROPERTY(QDateTime lastVisit READ lastVisit NOTIFY lastVisitChanged) Q_PROPERTY(QString lastVisitedTitle READ lastVisitedTitle NOTIFY lastVisitedTitleChanged) @@ -40,8 +40,8 @@ public: HistoryDomainModel(QObject* parent=0); - HistoryTimeframeModel* sourceModel() const; - void setSourceModel(HistoryTimeframeModel* sourceModel); + HistoryModel* sourceModel() const; + void setSourceModel(HistoryModel* sourceModel); const QString& domain() const; void setDomain(const QString& domain); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdatelist-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdatelist-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdatelist-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdatelist-model.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -18,7 +18,6 @@ #include "history-lastvisitdatelist-model.h" #include "history-model.h" -#include "history-timeframe-model.h" // Qt #include @@ -28,10 +27,10 @@ \class HistoryLastVisitDateListModel \brief List model that exposes a list of all last visit dates from history - HistoryLastVisitiDateListModel is a list model that exposes all last visit + HistoryLastVisitDateListModel is a list model that exposes all last visit dates from the source model. Each item has one single role: 'lastVisitDate' for a date in which there is at least one url visited on the source model. - A special entry is added to the begining of the list to represent all dates. + A special entry is added to the beginning of the list to represent all dates. The source model needs to expose a role named 'lastVisitDate', from which the input dates will be read. If such role is not present, this model will @@ -86,9 +85,9 @@ void HistoryLastVisitDateListModel::setSourceModel(QVariant sourceModel) { QAbstractItemModel* newSourceModel = qvariant_cast(sourceModel); - if (sourceModel.isValid() && newSourceModel == 0) { - qWarning() << "Only QAbstractItemModel-derived instances are allowed as" - << "source models"; + if (sourceModel.isValid() && (newSourceModel == 0) && !sourceModel.canConvert()) { + qWarning() << "Only QAbstractItemModel-derived instances and null are" + << "allowed as source models"; } if (newSourceModel != m_sourceModel) { @@ -107,6 +106,9 @@ SLOT(onRowsInserted(const QModelIndex&, int, int))); connect(m_sourceModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onRowsRemoved(const QModelIndex&, int, int))); + connect(m_sourceModel, + SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)), + SLOT(onRowsMoved(const QModelIndex&, int, int, const QModelIndex&, int))); connect(m_sourceModel, SIGNAL(modelReset()), SLOT(onModelReset())); connect(m_sourceModel, SIGNAL(layoutChanged(QList, QAbstractItemModel::LayoutChangeHint)), SLOT(onModelReset())); @@ -160,6 +162,7 @@ int removeAt = m_orderedDates.indexOf(lastVisitDate.key()); beginRemoveRows(QModelIndex(), removeAt, removeAt); m_orderedDates.removeAt(removeAt); + delete lastVisitDate.value(); lastVisitDate = m_lastVisitDates.erase(lastVisitDate); endRemoveRows(); } else { @@ -175,6 +178,41 @@ } } +void HistoryLastVisitDateListModel::onRowsMoved(const QModelIndex& parent, int start, int end, const QModelIndex& destination, int row) +{ + Q_UNUSED(parent); + Q_UNUSED(destination); + + // Rows were moved in the source model, meaning that their last visit dates + // were potentially updated, so we remove all the dates corresponding to + // the rows before they were moved, and we add all the dates corresponding + // to the rows after they were moved. + + // Determine a lower and upper bound for the dates that should be removed + // by looking at the indexes surrounding the rows before they were moved. + QDate lower = m_sourceModel->data(m_sourceModel->index((row < start) ? end + 1 : start, 0), m_sourceModelRole).toDate(); + if (!lower.isValid()) { + // The last row was moved too, we don’t have a strict lower bound. + lower = m_orderedDates.last().addDays(-1); + } + QDate upper = m_sourceModel->data(m_sourceModel->index((row < start) ? end : start - 1, 0), m_sourceModelRole).toDate(); + for (QDate i = upper.addDays(-1); i > lower; i = i.addDays(-1)) { + if (m_orderedDates.contains(i)) { + int removeAt = m_orderedDates.indexOf(i); + beginRemoveRows(QModelIndex(), removeAt, removeAt); + m_orderedDates.removeAt(removeAt); + delete m_lastVisitDates.take(i); + endRemoveRows(); + } + } + + // Now add back dates for all the rows after they were moved. + for (int i = 0; i <= (end - start); ++i) { + int index = i + row + ((row < start) ? 0 : start - end); + insertNewHistoryEntry(new QPersistentModelIndex(m_sourceModel->index(index, 0)), true); + } +} + void HistoryLastVisitDateListModel::updateSourceModelRole() { if (m_sourceModel && m_sourceModel->roleNames().count() > 0) { @@ -198,7 +236,7 @@ void HistoryLastVisitDateListModel::insertNewHistoryEntry(QPersistentModelIndex* index, bool notify) { if (m_sourceModelRole == -1) { - return; + return; } QDate lastVisitDate = index->data(m_sourceModelRole).toDate(); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdatelist-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdatelist-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdatelist-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdatelist-model.h 2016-04-13 15:22:01.000000000 +0000 @@ -55,6 +55,7 @@ private Q_SLOTS: void onRowsInserted(const QModelIndex& parent, int start, int end); void onRowsRemoved(const QModelIndex& parent, int start, int end); + void onRowsMoved(const QModelIndex& parent, int start, int end, const QModelIndex& destination, int row); void onModelReset(); private: diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdate-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdate-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdate-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdate-model.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,141 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "history-lastvisitdate-model.h" -#include "history-model.h" -#include "history-timeframe-model.h" - -// Qt -#include -#include - -/*! - \class HistoryLastVisitDateModel - \brief Proxy model that filters the contents of a model based on last - visit date - - HistoryLastVisitDateModel is a proxy model that filters the contents - of any QAbstractItemModel-derived model based on a role called - "lastVisitDate". - - An entry in the history model matches if the last visit date equals - the filter visit date. - - When no visit date is set, all entries match. If the model does not have - the "lastVisitDate" role, then no entries are returned if a filter visit - date is set, otherwise all entries match. -*/ -HistoryLastVisitDateModel::HistoryLastVisitDateModel(QObject* parent) - : QSortFilterProxyModel(parent) -{ -} - -QVariant HistoryLastVisitDateModel::sourceModel() const -{ - QAbstractItemModel* model = QSortFilterProxyModel::sourceModel(); - return (model) ? QVariant::fromValue(model) : QVariant(); -} - -void HistoryLastVisitDateModel::setSourceModel(QVariant sourceModel) -{ - QAbstractItemModel* newSourceModel = qvariant_cast(sourceModel); - if (sourceModel.isValid() && newSourceModel == 0) { - qWarning() << "Only QAbstractItemModel-derived instances are allowed as" - << "source models"; - } - - if (newSourceModel != QSortFilterProxyModel::sourceModel()) { - beginResetModel(); - - QAbstractItemModel* currentModel = QSortFilterProxyModel::sourceModel(); - if (currentModel != 0) { - currentModel->disconnect(this); - } - QSortFilterProxyModel::setSourceModel(newSourceModel); - updateSourceModelRole(); - - if (newSourceModel != 0) { - connect(newSourceModel, SIGNAL(modelReset()), SLOT(updateSourceModelRole())); - connect(newSourceModel, SIGNAL(layoutChanged(QList, QAbstractItemModel::LayoutChangeHint)), - SLOT(updateSourceModelRole())); - } - - endResetModel(); - Q_EMIT sourceModelChanged(); - } -} - -const QDate& HistoryLastVisitDateModel::lastVisitDate() const -{ - return m_lastVisitDate; -} - -void HistoryLastVisitDateModel::setLastVisitDate(const QDate& lastVisitDate) -{ - if (lastVisitDate != m_lastVisitDate) { - m_lastVisitDate = lastVisitDate; - invalidate(); - Q_EMIT lastVisitDateChanged(); - } -} - -QVariantMap HistoryLastVisitDateModel::get(int i) const -{ - QVariantMap item; - QHash roles = roleNames(); - - QModelIndex modelIndex = index(i, 0); - if (modelIndex.isValid()) { - Q_FOREACH(int role, roles.keys()) { - QString roleName = QString::fromUtf8(roles.value(role)); - item.insert(roleName, data(modelIndex, role)); - } - } - return item; -} - -bool HistoryLastVisitDateModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const -{ - if (m_lastVisitDate.isNull()) { - return true; - } - - if (m_sourceModelRole == -1) { - return false; - } - - QAbstractItemModel* model = QSortFilterProxyModel::sourceModel(); - if (model) { - QModelIndex index = model->index(source_row, 0, source_parent); - return m_lastVisitDate == model->data(index, m_sourceModelRole).toDate(); - } else { - return false; - } -} - -void HistoryLastVisitDateModel::updateSourceModelRole() -{ - QAbstractItemModel* sourceModel = QSortFilterProxyModel::sourceModel(); - if (sourceModel && sourceModel->roleNames().count() > 0) { - m_sourceModelRole = sourceModel->roleNames().key("lastVisitDate", -1); - if (m_sourceModelRole == -1) { - qWarning() << "No results will be returned because the sourceModel" - << "does not have a role named \"lastVisitDate\""; - } - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdate-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdate-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-lastvisitdate-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-lastvisitdate-model.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __HISTORY_LASTVISITDATE_MODEL_H__ -#define __HISTORY_LASTVISITDATE_MODEL_H__ - -// Qt -#include -#include -#include -#include -#include - -class HistoryLastVisitDateModel : public QSortFilterProxyModel -{ - Q_OBJECT - - Q_PROPERTY(QVariant sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) - Q_PROPERTY(QDate lastVisitDate READ lastVisitDate WRITE setLastVisitDate NOTIFY lastVisitDateChanged) - -public: - HistoryLastVisitDateModel(QObject* parent=0); - - QVariant sourceModel() const; - void setSourceModel(QVariant sourceModel); - - const QDate& lastVisitDate() const; - Q_INVOKABLE void setLastVisitDate(const QDate& lastVisitDate); - - Q_INVOKABLE QVariantMap get(int index) const; - -Q_SIGNALS: - void sourceModelChanged() const; - void lastVisitDateChanged() const; - -protected: - // reimplemented from QSortFilterProxyModel - bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; - -private Q_SLOTS: - void updateSourceModelRole(); - -private: - QDate m_lastVisitDate; - int m_sourceModelRole; -}; - -#endif // __HISTORY_LASTVISITDATE_MODEL_H__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-model.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -150,6 +150,7 @@ roles[Visits] = "visits"; roles[LastVisit] = "lastVisit"; roles[LastVisitDate] = "lastVisitDate"; + roles[LastVisitDateString] = "lastVisitDateString"; roles[Hidden] = "hidden"; } return roles; @@ -182,6 +183,8 @@ return entry.lastVisit; case LastVisitDate: return entry.lastVisit.toLocalTime().date(); + case LastVisitDateString: + return entry.lastVisit.toLocalTime().date().toString(Qt::ISODate); case Hidden: return entry.hidden; default: @@ -261,6 +264,10 @@ } count = ++entry.visits; if (now != entry.lastVisit) { + if (now.date() != entry.lastVisit.date()) { + roles << LastVisitDate; + roles << LastVisitDateString; + } entry.lastVisit = now; roles << LastVisit; } @@ -279,6 +286,7 @@ if (now != entry.lastVisit) { if (now.date() != entry.lastVisit.date()) { roles << LastVisitDate; + roles << LastVisitDateString; } entry.lastVisit = now; roles << LastVisit; @@ -293,6 +301,42 @@ } /*! + Update an existing entry in the model. + + If no entry with the same URL exists yet, do nothing (and return false). + Otherwise the title and icon of the existing entry are updated (the number + of visits remains unchanged). + + Return true if an update actually happened, false otherwise. +*/ +bool HistoryModel::update(const QUrl& url, const QString& title, const QUrl& icon) +{ + if (url.isEmpty()) { + return false; + } + int index = getEntryIndex(url); + if (index == -1) { + return false; + } + QVector roles; + const HistoryEntry& entry = m_entries.at(index); + if (title != entry.title) { + m_entries[index].title = title; + roles << Title; + } + if (icon != entry.icon) { + m_entries[index].icon = icon; + roles << Icon; + } + if (roles.isEmpty()) { + return false; + } + Q_EMIT dataChanged(this->index(index, 0), this->index(index, 0), roles); + updateExistingEntryInDatabase(entry); + return true; +} + +/*! Remove a given URL from the history model. If the URL was not previously visited, do nothing. diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-model.h 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -49,6 +49,7 @@ Visits, LastVisit, LastVisitDate, + LastVisitDateString, Hidden, }; @@ -61,6 +62,7 @@ void setDatabasePath(const QString& path); Q_INVOKABLE int add(const QUrl& url, const QString& title, const QUrl& icon); + Q_INVOKABLE bool update(const QUrl& url, const QString& title, const QUrl& icon); Q_INVOKABLE void removeEntryByUrl(const QUrl& url); Q_INVOKABLE void removeEntriesByDate(const QDate& date); Q_INVOKABLE void removeEntriesByDomain(const QString& domain); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-timeframe-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-timeframe-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-timeframe-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-timeframe-model.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -/* - * Copyright 2013 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "history-timeframe-model.h" -#include "history-model.h" - -/*! - \class HistoryTimeframeModel - \brief Proxy model that filters the contents of the history model - excluding all entries that are not contained in a given timeframe - - HistoryTimeframeModel is a proxy model that filters the contents of a - HistoryModel, excluding all entries that are not contained in a given - timeframe specified by a start datetime and an end datetime. - - To leave one side of the timeframe open, do not set either the start or end - datetime (or reset them to an invalid datetime). -*/ -HistoryTimeframeModel::HistoryTimeframeModel(QObject* parent) - : QSortFilterProxyModel(parent) -{ -} - -HistoryModel* HistoryTimeframeModel::sourceModel() const -{ - return qobject_cast(QSortFilterProxyModel::sourceModel()); -} - -void HistoryTimeframeModel::setSourceModel(HistoryModel* sourceModel) -{ - if (sourceModel != this->sourceModel()) { - beginResetModel(); - QSortFilterProxyModel::setSourceModel(sourceModel); - endResetModel(); - Q_EMIT sourceModelChanged(); - } -} - -const QDateTime& HistoryTimeframeModel::start() const -{ - return m_start; -} - -void HistoryTimeframeModel::setStart(const QDateTime& start) -{ - if (start != m_start) { - m_start = start; - invalidate(); - Q_EMIT startChanged(); - } -} - -const QDateTime& HistoryTimeframeModel::end() const -{ - return m_end; -} - -void HistoryTimeframeModel::setEnd(const QDateTime& end) -{ - if (end != m_end) { - m_end = end; - invalidate(); - Q_EMIT endChanged(); - } -} - -bool HistoryTimeframeModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const -{ - QModelIndex index = sourceModel()->index(source_row, 0, source_parent); - QDateTime lastVisit = sourceModel()->data(index, HistoryModel::LastVisit).toDateTime(); - if (m_start.isValid() && (lastVisit < m_start)) { - return false; - } - if (m_end.isValid() && (lastVisit > m_end)) { - return false; - } - return true; -} - -QHash HistoryTimeframeModel::roleNames() const -{ - return (sourceModel()) ? sourceModel()->roleNames() : QHash(); -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-timeframe-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-timeframe-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/history-timeframe-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/history-timeframe-model.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* - * Copyright 2013 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __HISTORY_TIMEFRAME_MODEL_H__ -#define __HISTORY_TIMEFRAME_MODEL_H__ - -// Qt -#include -#include - -class HistoryModel; - -class HistoryTimeframeModel : public QSortFilterProxyModel -{ - Q_OBJECT - - Q_PROPERTY(HistoryModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) - Q_PROPERTY(QDateTime start READ start WRITE setStart NOTIFY startChanged) - Q_PROPERTY(QDateTime end READ end WRITE setEnd NOTIFY endChanged) - -public: - HistoryTimeframeModel(QObject* parent=0); - - HistoryModel* sourceModel() const; - void setSourceModel(HistoryModel* sourceModel); - - const QDateTime& start() const; - void setStart(const QDateTime& start); - - const QDateTime& end() const; - void setEnd(const QDateTime& end); - -Q_SIGNALS: - void sourceModelChanged() const; - void startChanged() const; - void endChanged() const; - -protected: - // reimplemented from QSortFilterProxyModel - bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; - QHash roleNames() const; - -private: - QDateTime m_start; - QDateTime m_end; -}; - -#endif // __HISTORY_TIMEFRAME_MODEL_H__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/HistoryView.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/HistoryView.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/HistoryView.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/HistoryView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -20,11 +20,13 @@ import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.3 as ListItems import webbrowserapp.private 0.1 +import "." as Local -Item { +FocusScope { id: historyView signal seeMoreEntriesClicked(var model) + signal newTabRequested() signal done() Rectangle { @@ -37,28 +39,31 @@ // the view is displayed as early as possible. id: loadModelTimer interval: 1 - onTriggered: historyTimeframeModel.sourceModel = HistoryModel + onTriggered: historyDomainListModel.sourceModel = HistoryModel } function loadModel() { loadModelTimer.restart() } ListView { id: domainsListView + objectName: "domainsListView" + + focus: true + currentIndex: 0 anchors { top: topBar.bottom left: parent.left right: parent.right bottom: toolbar.top - rightMargin: units.gu(2) } - model: HistoryDomainListChronologicalModel { - sourceModel: HistoryDomainListModel { - sourceModel: HistoryTimeframeModel { - id: historyTimeframeModel - } + model: SortFilterModel { + model: HistoryDomainListModel { + id: historyDomainListModel } + sort.property: "lastVisit" + sort.order: Qt.DescendingOrder } section.property: "lastVisitDate" @@ -70,9 +75,12 @@ delegate: UrlDelegate { id: urlDelegate + objectName: "historyViewDomainDelegate" width: parent.width height: units.gu(5) + readonly property int modelIndex: index + title: model.domain url: lastVisitedTitle icon: model.lastVisitedIcon @@ -92,9 +100,15 @@ } } } + + highlight: ListViewHighlight {} + + Keys.onEnterPressed: currentItem.clicked() + Keys.onReturnPressed: currentItem.clicked() + Keys.onDeletePressed: currentItem.removed() } - Toolbar { + Local.Toolbar { id: toolbar height: units.gu(7) @@ -120,6 +134,7 @@ } ToolbarAction { + objectName: "newTabAction" anchors { right: parent.right rightMargin: units.gu(2) @@ -131,13 +146,13 @@ iconName: "tab-new" onClicked: { - browser.openUrlInNewTab("", true) + historyView.newTabRequested() historyView.done() } } } - Toolbar { + Local.Toolbar { id: topBar visible: domainsListView.ViewItems.selectMode @@ -156,6 +171,7 @@ ToolbarAction { iconName: "close" + objectName: "closeButton" text: i18n.tr("Cancel") onClicked: domainsListView.ViewItems.selectMode = false @@ -170,6 +186,7 @@ ToolbarAction { iconName: "select" + objectName: "selectAllButton" text: i18n.tr("Select all") onClicked: { @@ -194,6 +211,7 @@ ToolbarAction { id: deleteButton + objectName: "deleteButton" iconName: "delete" text: i18n.tr("Delete") @@ -203,7 +221,7 @@ var indices = domainsListView.ViewItems.selectedIndices var domains = [] for (var i in indices) { - domains.push(domainsListView.model.get(indices[i])) + domains.push(domainsListView.model.get(indices[i]).domain) } domainsListView.ViewItems.selectMode = false for (var j in domains) { diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/HistoryViewWide.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/HistoryViewWide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/HistoryViewWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/HistoryViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -21,6 +21,7 @@ import Ubuntu.Components.ListItems 1.3 as ListItems import webbrowserapp.private 0.1 import "Highlight.js" as Highlight +import "." as Local FocusScope { id: historyViewWide @@ -45,10 +46,8 @@ Keys.onPressed: { if (event.modifiers === Qt.ControlModifier && event.key === Qt.Key_F) { if (searchMode) searchQuery.focus = true - else { - if (!selectMode) searchMode = true - else event.accepted = true - } + else if (!selectMode) searchMode = true + event.accepted = true } } Keys.onDeletePressed: { @@ -110,7 +109,7 @@ spacing: units.gu(1) - Item { + FocusScope { width: units.gu(40) height: parent.height @@ -119,54 +118,17 @@ objectName: "lastVisitDateListView" anchors.fill: parent + focus: true currentIndex: 0 - onCurrentIndexChanged: { - if (currentItem) { - historyLastVisitDateModel.setLastVisitDate(currentItem.lastVisitDate) - } - urlsListView.ViewItems.selectedIndices = [] - } - - // Manually track the current date, so that we can detect when - // the ListView automatically changes the currentItem as result - // of a change in the model that removes the currentItem. - // When this happens, we reset the currentItem to "all dates". - property date currentDate - - // Ignore currentItemChanged signals while we are changing the - // currentIndex manually (as a result of either UP and DOWN key - // presses, or clicking on items) - // Any other emission of currentItemChanged will therefore be - // from ListView changing it automatically. - function explicitlyChangeCurrentIndex(changeAction) { - explicitlySettingCurrentIndex = true - changeAction() - explicitlySettingCurrentIndex = false - currentDate = currentItem.lastVisitDate - } - property bool explicitlySettingCurrentIndex: false - Keys.onDownPressed: explicitlyChangeCurrentIndex(incrementCurrentIndex) - Keys.onUpPressed: explicitlyChangeCurrentIndex(function() { - if (lastVisitDateListView.currentIndex == 0 && searchMode) { - searchQuery.focus = true - } else { - lastVisitDateListView.decrementCurrentIndex() - } - }) - - onCurrentItemChanged: { - if (explicitlySettingCurrentIndex) return; - if (currentItem.lastVisitDate.valueOf() !== currentDate.valueOf()) { - currentIndex = 0 - } - } + onCurrentIndexChanged: urlsListView.ViewItems.selectedIndices = [] model: HistoryLastVisitDateListModel { - sourceModel: historyLastVisitDateModel.sourceModel + sourceModel: historyLastVisitDateModel.model } delegate: ListItem { + id: lastVisitDateDelegate objectName: "lastVisitDateDelegate" property var lastVisitDate: model.lastVisitDate @@ -180,8 +142,6 @@ width: parent.width height: units.gu(4) - color: lastVisitDateListView.currentIndex == index ? highlightColor : "transparent" - Label { objectName: "lastVisitDateDelegateLabel" @@ -218,11 +178,46 @@ } fontSize: "small" - color: lastVisitDateListView.currentIndex == index ? UbuntuColors.orange : UbuntuColors.darkGrey + color: (!lastVisitDateListView.activeFocus && lastVisitDateDelegate.ListView.isCurrentItem) ? UbuntuColors.orange : UbuntuColors.darkGrey } - onClicked: ListView.view.explicitlyChangeCurrentIndex(function() { ListView.view.currentIndex = index }) - } + divider { + // Hide the divider so that the highlight doesn’t overlap it + // Do not set visible to false, otherwise the content item is resized. + opacity: (!ListView.view.activeFocus || + (index > ListView.view.currentIndex) || + (index < (ListView.view.currentIndex - 1))) ? 1 : 0 + Behavior on opacity { UbuntuNumberAnimation {} } + } + + onClicked: ListView.view.currentIndex = index + + ListView.onRemove: { + if (ListView.isCurrentItem) { + // For some reason, setting the current index here + // results in it being reset to its previous value + // right away. Delaying it with a timer so the + // operation is queued does the trick. + resetIndexTimer.restart() + } + } + } + + highlight: ListViewHighlight {} + + Timer { + id: resetIndexTimer + interval: 0 + onTriggered: lastVisitDateListView.currentIndex = 0 + } + } + + Keys.onUpPressed: { + if (searchMode) { + searchQuery.focus = true + } else { + event.accepted = false + } } Scrollbar { @@ -244,13 +239,18 @@ Keys.onReturnPressed: historyEntrySelected() Keys.onEnterPressed: historyEntrySelected() - model: HistoryLastVisitDateModel { + model: SortFilterModel { id: historyLastVisitDateModel + readonly property date lastVisitDate: lastVisitDateListView.currentItem ? lastVisitDateListView.currentItem.lastVisitDate : "" + filter { + property: "lastVisitDateString" + pattern: new RegExp(lastVisitDate.isValid() ? "^%1$".arg(Qt.formatDate(lastVisitDate, "yyyy-MM-dd")) : "") + } // Until a valid HistoryModel is assigned the TextSearchFilterModel - // will not report role names, and the HistoryLastVisit*Models will emit warnings - // since they need a dateLastVisit role to be present. - // We avoid this by delaying assigning the source model until it is ready. - sourceModel: historySearchModel.sourceModel ? historySearchModel : undefined + // will not report role names, and the HistoryLastVisitDateListModel + // will emit warnings since it needs a dateLastVisit role to be + // present. + model: historySearchModel.sourceModel ? historySearchModel : null } clip: true @@ -287,27 +287,15 @@ width: parent.width - units.gu(1) height: units.gu(5) - color: urlsListView.currentIndex == index ? highlightColor : "transparent" - property url siteUrl: model.url icon: model.icon title: Highlight.highlightTerms(model.title ? model.title : model.url, searchQuery.terms) url: Highlight.highlightTerms(model.url, searchQuery.terms) - headerComponent: Component { - Item { - objectName: "historySectionDelegate" - height: units.gu(3) - width: timeLabel.width - - Label { - id: timeLabel - anchors.centerIn: parent - text: Qt.formatTime(model.lastVisit) - fontSize: "xx-small" - } - } + headerComponent: Label { + text: Qt.formatTime(model.lastVisit) + fontSize: "xx-small" } onClicked: { @@ -333,6 +321,8 @@ } } } + + highlight: ListViewHighlight {} } Scrollbar { @@ -342,7 +332,7 @@ } } - Toolbar { + Local.Toolbar { id: topBar height: units.gu(7) @@ -354,6 +344,14 @@ top: parent.top } + Keys.onEscapePressed: { + if (searchQuery.activeFocus) { + historyViewWide.searchMode = false + } else { + event.accepted = false + } + } + Label { visible: !urlsListView.ViewItems.selectMode && !historyViewWide.searchMode @@ -450,7 +448,6 @@ visible: historyViewWide.searchMode readonly property var terms: text.split(/\s+/g).filter(function(term) { return term.length > 0 }) - Keys.onEscapePressed: historyViewWide.searchMode = false Keys.onDownPressed: urlsListView.focus = true } @@ -481,7 +478,7 @@ } } - Toolbar { + Local.Toolbar { id: bottomToolbar height: units.gu(7) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/IndeterminateProgressBar.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/IndeterminateProgressBar.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/IndeterminateProgressBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/IndeterminateProgressBar.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 + +Rectangle { + id: progressBar + + property real progress + property bool indeterminateProgress: false + + radius: width/3 + color: Theme.palette.normal.base + + Rectangle { + id: currentProgress + height: parent.height + radius: parent.radius + anchors.left: parent.left + anchors.leftMargin: 0 + anchors.top: parent.top + color: UbuntuColors.orange + width: indeterminateProgress ? parent.width / 6 : (progress / 100) * parent.width + + SequentialAnimation { + running: indeterminateProgress + onRunningChanged: { + currentProgress.anchors.leftMargin = 0; + } + loops: Animation.Infinite + PropertyAnimation { target: currentProgress.anchors; property: "leftMargin"; from: 0.0; to: parent.width - parent.width / 6; duration: UbuntuAnimation.SleepyDuration; easing.type: Easing.InOutQuad; } + PropertyAnimation { target: currentProgress.anchors; property: "leftMargin"; from: parent.width - parent.width / 6; to: 0; duration: UbuntuAnimation.SleepyDuration; easing.type: Easing.InOutQuad; } + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/KeyboardShortcut.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/KeyboardShortcut.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/KeyboardShortcut.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/KeyboardShortcut.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 -import Ubuntu.Components 1.3 - -Action { - property int key - property int modifiers: Qt.NoModifier -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/KeyboardShortcuts.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/KeyboardShortcuts.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/KeyboardShortcuts.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/KeyboardShortcuts.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 - -Item { - function processKey(key, modifiers) { - for (var i = 0; i < data.length; i++) { - var shortcut = data[i]; - - if (!shortcut.enabled) continue - if (key !== shortcut.key) continue - - if (shortcut.modifiers === Qt.NoModifier) { - if (modifiers === Qt.NoModifier) { - shortcut.trigger() - return true - } - } else if ((modifiers & shortcut.modifiers) === shortcut.modifiers) { - shortcut.trigger() - return true - } - } - return false - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/limit-proxy-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/limit-proxy-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/limit-proxy-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/limit-proxy-model.h 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014 Canonical Ltd. + * Copyright 2014-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -22,8 +22,6 @@ // Qt #include -class QSortFilterProxyModel; - class LimitProxyModel : public QIdentityProxyModel { Q_OBJECT diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ListViewHighlight.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ListViewHighlight.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ListViewHighlight.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ListViewHighlight.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,39 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import ".." + +Rectangle { + color: "transparent" + border { + width: units.gu(0.18) + color: UbuntuColors.orange + } + radius: units.gu(0.3) + visible: hasKeyboard && + ((ListView.view && ListView.view.activeFocus) || + (GridView.view && GridView.view.activeFocus)) + + readonly property bool hasKeyboard: keyboardModel.count > 0 + + FilteredKeyboardModel { + id: keyboardModel + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/MediaAccessDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/MediaAccessDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/MediaAccessDialog.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/MediaAccessDialog.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 -import Ubuntu.Components 1.3 -import Ubuntu.Components.Popups 1.3 - -Dialog { - property var request - modal: true - - title: request.isForAudio && request.isForVideo ? - i18n.tr("Allow this domain to access your camera and microphone?") : - (request.isForVideo ? i18n.tr("Allow this domain to access your camera?") - : i18n.tr("Allow this domain to access your microphone?")) - - text: request.embedder.toString() !== request.origin.toString() ? - internal.textWhenEmbedded : request.origin - - Row { - id: internal - - // TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it - readonly property string textWhenEmbedded: i18n.tr("%1 (embedded in %2)") - .arg(request.origin).arg(request.embedder) - height: units.gu(4) - spacing: units.gu(2) - anchors.horizontalCenter: parent.horizontalCenter - - Button { - id: allowButton - objectName: "mediaAccessDialog.allowButton" - text: i18n.tr("Yes") - color: UbuntuColors.green - width: units.gu(14) - onClicked: { - request.allow() - hide() - } - } - - Button { - id: denyButton - objectName: "mediaAccessDialog.denyButton" - text: i18n.tr("No") - color: UbuntuColors.red - width: units.gu(14) - onClicked: { - request.deny() - hide() - } - } - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/NavigationBar.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/NavigationBar.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/NavigationBar.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/NavigationBar.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -37,7 +37,9 @@ property alias incognito: addressbar.incognito property alias showFaviconInAddressBar: addressbar.showFavicon readonly property alias bookmarkTogglePlaceHolder: addressbar.bookmarkTogglePlaceHolder + property color fgColor: Theme.palette.normal.baseText property color iconColor: UbuntuColors.darkGrey + property real availableHeight onFindInPageModeChanged: if (findInPageMode) addressbar.text = "" onIncognitoChanged: findInPageMode = false @@ -99,17 +101,22 @@ AddressBar { id: addressbar + fgColor: root.fgColor + focus: true findInPageMode: findInPageMode findController: internal.webview ? internal.webview.findController : null anchors { - left: forwardButton.right - leftMargin: units.gu(1) + left: parent.left + // Work around https://launchpad.net/bugs/1546346 by ensuring + // that the x coordinate of the text field is an integer. + leftMargin: Math.round(backButton.width + forwardButton.width + units.gu(1)) right: rightButtonsBar.left rightMargin: units.gu(1) - verticalCenter: parent.verticalCenter + top: parent.top + bottom: parent.bottom } icon: (internal.webview && internal.webview.certificateError) ? "" : tab ? tab.icon : "" @@ -214,15 +221,18 @@ id: internal property var openDrawer: null readonly property var webview: tab ? tab.webview : null + } - onWebviewChanged: { - if (webview) { - addressbar.actualUrl = webview.url - addressbar.securityStatus = webview.securityStatus - } else { - addressbar.actualUrl = "" - addressbar.securityStatus = null - } + onTabChanged: { + if (tab) { + addressbar.actualUrl = tab.url + addressbar.securityStatus = (tab.webview ? tab.webview.securityStatus : null) + if (!tab.url.toString() && editing) { + addressbar.text = "" + } + } else { + addressbar.actualUrl = "" + addressbar.securityStatus = null } } @@ -246,16 +256,17 @@ right: parent.right } width: units.gu(22) - height: actionsColumn.height - clip: actionsColumn.y != 0 + height: actionsListView.height + clip: actionsListView.y != 0 InverseMouseArea { + anchors.fill: parent enabled: drawer.opened onPressed: drawer.opened = false } Rectangle { - anchors.fill: actionsColumn + anchors.fill: actionsListView color: Theme.palette.normal.background Rectangle { @@ -279,13 +290,17 @@ } } - Column { - id: actionsColumn + ListView { + id: actionsListView anchors { left: parent.left right: parent.right } + height: Math.min(_contentHeight, availableHeight) + // avoid a binding loop + property real _contentHeight: 0 + onContentHeightChanged: _contentHeight = contentHeight y: drawer.opened ? 0 : -height Behavior on y { UbuntuNumberAnimation {} } @@ -295,57 +310,58 @@ } } - Repeater { - model: drawerActions - delegate: AbstractButton { - objectName: action.objectName - anchors { - left: parent.left - right: parent.right - } - height: units.gu(6) - visible: action.enabled + clip: true + + model: drawerActions - action: modelData - onClicked: drawer.opened = false + delegate: AbstractButton { + objectName: action.objectName + anchors { + left: parent.left + right: parent.right + } + height: visible ? units.gu(6) : 0 + visible: action.enabled + + action: modelData + onClicked: drawer.opened = false + + Rectangle { + anchors.fill: parent + color: Theme.palette.selected.background + visible: parent.pressed + } - Rectangle { - anchors.fill: parent - color: Theme.palette.selected.background - visible: parent.pressed + Icon { + id: actionIcon + anchors { + left: parent.left + leftMargin: units.gu(2) + verticalCenter: parent.verticalCenter } + width: units.gu(2) + height: width - Icon { - id: actionIcon - anchors { - left: parent.left - leftMargin: units.gu(2) - verticalCenter: parent.verticalCenter - } - width: units.gu(2) - height: width - - name: model.iconName - Binding on source { - when: model.iconSource.toString() - value: model.iconSource - } - color: UbuntuColors.darkGrey + name: model.iconName + Binding on source { + when: model.iconSource.toString() + value: model.iconSource } + color: root.fgColor + } - Label { - anchors { - left: actionIcon.right - leftMargin: units.gu(2) - verticalCenter: parent.verticalCenter - right: parent.right - rightMargin: units.gu(1) - } - text: model.text - fontSize: "small" - color: UbuntuColors.darkGrey - elide: Text.ElideRight + Label { + anchors { + left: actionIcon.right + leftMargin: units.gu(2) + verticalCenter: parent.verticalCenter + right: parent.right + rightMargin: units.gu(1) } + text: model.text + fontSize: "small" + color: root.fgColor + elide: Text.ElideRight } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/NewTabView.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/NewTabView.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/NewTabView.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/NewTabView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -19,11 +19,11 @@ import QtQuick 2.4 import Qt.labs.settings 1.0 import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItems import webbrowserapp.private 0.1 -import ".." import "." -Item { +FocusScope { id: newTabView property Settings settingsObject @@ -34,10 +34,7 @@ TopSitesModel { id: topSitesModel - sourceModel: HistoryTimeframeModel { - id: historyTimeframeModel - sourceModel: HistoryModel - } + model: HistoryModel } QtObject { @@ -55,6 +52,18 @@ seeMoreBookmarksView = false } } + + function ensureCurrentItemVisible(container, currentItem) { + if (container.activeFocus && currentItem) { + var top = container.y + currentItem.mapToItem(container, 0, 0).y + var height = currentItem.height + if (top < flickable.contentY) { + flickable.contentY = top + } else if ((flickable.contentY + flickable.height) < (top + height)) { + flickable.contentY = top + height - flickable.height + } + } + } } Rectangle { @@ -63,160 +72,259 @@ } Flickable { + id: flickable anchors.fill: parent - contentHeight: internal.seeMoreBookmarksView ? - bookmarksFolderListViewLoader.height + units.gu(6) : - contentColumn.height + contentHeight: contentScope.height + focus: true - Column { - id: contentColumn + onActiveFocusChanged: { + if (activeFocus) { + contentScope.forceActiveFocus() + } + } + + Behavior on contentY { + UbuntuNumberAnimation {} + } + + FocusScope { + id: contentScope anchors { left: parent.left right: parent.right - rightMargin: units.gu(1.5) } height: childrenRect.height - Row { + Item { + id: bookmarkListHeader + objectName: "bookmarkListHeader" height: units.gu(6) anchors { + top: parent.top left: parent.left - leftMargin: units.gu(1.5) right: parent.right } - spacing: units.gu(1.5) - - Icon { - id: starredIcon - color: "#dd4814" - name: "starred" - - height: units.gu(2) - width: height + Row { anchors { - leftMargin: units.gu(1) - topMargin: units.gu(1) - verticalCenter: moreButton.verticalCenter + fill: parent + leftMargin: units.gu(2) + rightMargin: units.gu(2) } - } - - Label { - width: parent.width - starredIcon.width - moreButton.width - units.gu(3) - anchors.verticalCenter: moreButton.verticalCenter + spacing: units.gu(1.5) - text: i18n.tr("Bookmarks") - fontSize: "small" - } + Icon { + id: starredIcon + color: "#dd4814" + name: "starred" + + height: units.gu(2) + width: height + + anchors { + leftMargin: units.gu(1) + topMargin: units.gu(1) + verticalCenter: moreButton.verticalCenter + } + } - Button { - id: moreButton - objectName: "bookmarks.moreButton" - height: parent.height - units.gu(2) + Label { + width: parent.width - starredIcon.width - moreButton.width - units.gu(3) + anchors.verticalCenter: moreButton.verticalCenter - anchors { top: parent.top; topMargin: units.gu(1) } + text: i18n.tr("Bookmarks") + fontSize: "small" + } - strokeColor: UbuntuColors.darkGrey + Button { + id: moreButton + objectName: "bookmarks.moreButton" + height: parent.height - units.gu(2) + anchors { top: parent.top; topMargin: units.gu(1) } + activeFocusOnPress: false + + strokeColor: UbuntuColors.darkGrey + visible: internal.numberOfBookmarks > 4 + text: internal.seeMoreBookmarksView ? i18n.tr("Less") : i18n.tr("More") + + onClicked: { + internal.seeMoreBookmarksView = !internal.seeMoreBookmarksView + bookmarkListHeader.focus = true + } + } + } - visible: internal.numberOfBookmarks > 4 + Keys.onEnterPressed: moreButton.clicked() + Keys.onReturnPressed: moreButton.clicked() + Keys.onSpacePressed: moreButton.clicked() + + Keys.onDownPressed: { + if (internal.seeMoreBookmarksView) { + bookmarksFolderListViewLoader.focus = true + } else { + bookmarkList.focus = true + } + } - text: internal.seeMoreBookmarksView ? i18n.tr("Less") : i18n.tr("More") + onActiveFocusChanged: internal.ensureCurrentItemVisible(this, this) + } - onClicked: internal.seeMoreBookmarksView = !internal.seeMoreBookmarksView - } + ListViewHighlight { + anchors.fill: bookmarkListHeader + visible: hasKeyboard && bookmarkListHeader.activeFocus } - Rectangle { - height: units.gu(0.1) + ListItems.ThinDivider { + id: bookmarkListDivider anchors { + top: bookmarkListHeader.bottom left: parent.left - leftMargin: units.gu(1.5) + leftMargin: units.gu(2) right: parent.right + rightMargin: units.gu(2) } - color: "#d3d3d3" + opacity: bookmarkListHeader.activeFocus ? 0 : 1 } Loader { id: bookmarksFolderListViewLoader - anchors { + top: bookmarkListDivider.bottom left: parent.left right: parent.right } - - height: status == Loader.Ready ? item.height : 0 - active: internal.seeMoreBookmarksView + height: active ? item.height : 0 sourceComponent: BookmarksFoldersView { + focus: true + interactive: false + homeBookmarkUrl: newTabView.settingsObject.homepage onBookmarkClicked: newTabView.bookmarkClicked(url) onBookmarkRemoved: newTabView.bookmarkRemoved(url) + + onCurrentItemChanged: internal.ensureCurrentItemVisible(bookmarksFolderListViewLoader, currentItem) + onActiveFocusChanged: internal.ensureCurrentItemVisible(bookmarksFolderListViewLoader, currentItem) + } + + Keys.onUpPressed: { + if (moreButton.visible) { + bookmarkListHeader.focus = true + } else { + event.accepted = false + } } } - Column { - id: bookmarksColumn + Loader { + id: bookmarkList anchors { + top: bookmarkListDivider.bottom left: parent.left right: parent.right } + active: !internal.seeMoreBookmarksView + height: active ? item.height : 0 + focus: true + + LimitProxyModel { + id: limitedBookmarksModel + sourceModel: BookmarksModel + limit: internal.bookmarksCountLimit + } - opacity: internal.seeMoreBookmarksView ? 0.0 : 1.0 - Behavior on opacity { UbuntuNumberAnimation {} } - visible: opacity > 0 - - // Force the height to be updated when bookmarks are removed - // in another new tab - height: units.gu(5) * (Math.min(internal.bookmarksCountLimit, internal.numberOfBookmarks) + 1) - spacing: 0 + sourceComponent: ListView { + objectName: "bookmarksList" + focus: true + interactive: false + readonly property real delegateHeight: units.gu(5) + height: count * delegateHeight - UrlDelegate { - objectName: "homepageBookmark" - anchors { - left: parent.left - right: parent.right + model: limitedBookmarksModel.count + 1 + + delegate: UrlDelegate { + objectName: (index == 0) ? "homepageBookmark" : "bookmark_%1".arg(index) + anchors { + left: parent.left + right: parent.right + } + height: delegateHeight + removable: index > 0 + + readonly property var data: BookmarksModel.count ? limitedBookmarksModel.get(index - 1) : null + icon: (index > 0) ? data.icon : "" + title: (index > 0) ? data.title : i18n.tr("Homepage") + url: (index > 0) ? data.url : newTabView.settingsObject.homepage + + onClicked: newTabView.bookmarkClicked(url) + onRemoved: { + if (removable) { + newTabView.bookmarkRemoved(url) + } + } } - height: units.gu(5) - title: i18n.tr('Homepage') + highlight: ListViewHighlight {} - leadingActions: null + Keys.onEnterPressed: currentItem.clicked() + Keys.onReturnPressed: currentItem.clicked() + Keys.onDeletePressed: currentItem.removed() + + // Setting 'interactive' to false to prevent flicks also disables + // keyboard navigation, so it needs to be manually implemented. + Keys.onUpPressed: { + var current = currentIndex + decrementCurrentIndex() + if (currentIndex == current) { + event.accepted = false + } + } + Keys.onDownPressed: { + var current = currentIndex + incrementCurrentIndex() + if (currentIndex == current) { + event.accepted = false + } + } - url: newTabView.settingsObject.homepage - onClicked: newTabView.bookmarkClicked(url) + onCurrentItemChanged: internal.ensureCurrentItemVisible(bookmarkList, currentItem) + onActiveFocusChanged: internal.ensureCurrentItemVisible(bookmarkList, currentItem) } - UrlsList { - objectName: "bookmarksList" - anchors { - left: parent.left - right: parent.right + Keys.onUpPressed: { + if (moreButton.visible) { + bookmarkListHeader.focus = true + } else { + event.accepted = false + } + } + Keys.onDownPressed: { + if (topSitesGrid.visible) { + topSitesGrid.focus = true + } else { + event.accepted = false } - - spacing: 0 - limit: internal.bookmarksCountLimit - - model: BookmarksModel - - onUrlClicked: newTabView.bookmarkClicked(url) - onUrlRemoved: newTabView.bookmarkRemoved(url) } } Item { - height: units.gu(6) + id: topSitesHeader anchors { + top: bookmarkList.bottom left: parent.left - leftMargin: units.gu(1.5) right: parent.right } + visible: !internal.seeMoreBookmarksView + height: visible ? units.gu(6) : 0 Label { anchors { left: parent.left + leftMargin: units.gu(2) right: parent.right + rightMargin: units.gu(2) bottom: parent.bottom bottomMargin: units.gu(1) } @@ -229,28 +337,28 @@ } } - Rectangle { - height: units.gu(0.1) + ListItems.ThinDivider { + id: topSitesDivider anchors { + top: topSitesHeader.bottom left: parent.left leftMargin: units.gu(2) right: parent.right + rightMargin: units.gu(2) } - color: "#d3d3d3" - - opacity: internal.seeMoreBookmarksView ? 0.0 : 1.0 - Behavior on opacity { UbuntuNumberAnimation {} } + visible: topSitesHeader.visible } Label { objectName: "notopsites" - height: units.gu(11) anchors { + top: topSitesDivider.bottom left: parent.left right: parent.right } - visible: topSitesModel.count == 0 + visible: !internal.seeMoreBookmarksView && (topSitesModel.count == 0) + height: visible ? units.gu(11) : 0 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -259,38 +367,29 @@ color: UbuntuColors.darkGrey } - Item { + FocusScope { + id: topSitesGrid anchors { + top: topSitesDivider.bottom left: parent.left right: parent.right - - // The UrlPreviewGrid's highlight extends to the left of the - // grid itself by a margin. - // Since we are clipping the parent we need to prevent the - // highlight from being clipped away at the left edge. - // We do this by shifting the parent left and the contents right - // by an amount equal to the highlight's margin. - leftMargin: units.gu(2) - grid.horizontalMargin - - // The right margin should be 2gu, which is set on all cells - // of the UrlPreviewGrid already. However the parent Column - // has 1.5gu right margin, so we are compensating for that - // here instead of removing it from the Column itself and - // reassigning it to all Column children except this one. - rightMargin: - contentColumn.anchors.rightMargin } - height: childrenRect.height + visible: !internal.seeMoreBookmarksView && (topSitesModel.count > 0) + height: visible ? grid.contentHeight + units.gu(1) : 0 clip: true UrlPreviewGrid { id: grid objectName: "topSitesList" + focus: true anchors { left: parent.left - leftMargin: grid.horizontalMargin + leftMargin: units.gu(2) right: parent.right + rightMargin: units.gu(2) top: parent.top topMargin: units.gu(2) + bottom: parent.bottom } horizontalMargin: units.gu(1) @@ -301,9 +400,6 @@ visible: opacity > 0 interactive: false - // No highlight as this view doesn’t support keyboard navigation - highlight: null - model: LimitProxyModel { limit: 10 sourceModel: topSitesModel @@ -315,7 +411,23 @@ HistoryModel.hide(url) PreviewManager.checkDelete(url) } + + // Setting 'interactive' to false to prevent flicks also disables + // keyboard navigation, so it needs to be manually implemented. + Keys.onLeftPressed: moveCurrentIndexLeft() + Keys.onRightPressed: moveCurrentIndexRight() + + onCurrentItemChanged: internal.ensureCurrentItemVisible(topSitesGrid, currentItem) + onActiveFocusChanged: internal.ensureCurrentItemVisible(topSitesGrid, currentItem) + + onCountChanged: { + if (activeFocus && (count == 0)) { + bookmarkList.focus = true + } + } } + + Keys.onUpPressed: bookmarkList.focus = true } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/NewTabViewWide.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/NewTabViewWide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/NewTabViewWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/NewTabViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -17,10 +17,8 @@ */ import QtQuick 2.4 -import Qt.labs.settings 1.0 import Ubuntu.Components 1.3 import webbrowserapp.private 0.1 -import ".." import "." FocusScope { @@ -33,7 +31,6 @@ signal bookmarkClicked(url url) signal bookmarkRemoved(url url) signal historyEntryClicked(url url) - signal releasingKeyboardFocus() Keys.onTabPressed: selectedIndex = (selectedIndex + 1) % 2 Keys.onBacktabPressed: selectedIndex = Math.abs((selectedIndex - 1) % 2) @@ -51,26 +48,16 @@ id: topSitesModel limit: 10 sourceModel: TopSitesModel { - sourceModel: HistoryTimeframeModel { - id: historyTimeframeModel - sourceModel: HistoryModel - } + model: HistoryModel } } BookmarksFoldersViewWide { id: bookmarksFoldersViewWide - Keys.onUpPressed: newTabViewWide.releasingKeyboardFocus() onBookmarkClicked: newTabViewWide.bookmarkClicked(url) onBookmarkRemoved: newTabViewWide.bookmarkRemoved(url) - // Relinquish focus as the presses and releases that compose the - // drag will move the keyboard focus in a location unexpected - // for the user. This way it will go back to the address bar and - // the user can predictably resume keyboard interaction from there. - onDragStarted: newTabViewWide.releasingKeyboardFocus() - anchors { top: sectionsGroup.bottom left: parent.left @@ -110,10 +97,8 @@ onActivated: newTabViewWide.historyEntryClicked(url) onRemoved: { HistoryModel.hide(url) - if (topSitesModel.count === 0) newTabViewWide.releasingKeyboardFocus() PreviewManager.checkDelete(url) } - onReleasingKeyboardFocus: newTabViewWide.releasingKeyboardFocus() } Scrollbar { @@ -127,7 +112,7 @@ left: parent.left right: parent.right } - color: "#f8f8f8" + color: "#ffffff" height: sections.height Sections { @@ -154,5 +139,16 @@ Action { text: i18n.tr("Bookmarks") } ] } + + Rectangle { + // Divider, see Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml + anchors { + left: parent.left + right: parent.right + top: parent.bottom + } + height: units.dp(1) + color: Qt.rgba(0, 0, 0, 0.1) + } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/PreviewManager.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/PreviewManager.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/PreviewManager.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/PreviewManager.qml 2016-04-13 15:22:01.000000000 +0000 @@ -30,9 +30,7 @@ id: topSites limit: 10 sourceModel: TopSitesModel { - sourceModel: HistoryTimeframeModel { - sourceModel: HistoryModel - } + model: HistoryModel } function contains(url) { for (var i = 0; i < topSites.count; i++) { diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/SettingsDeviceSelector.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/SettingsDeviceSelector.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/SettingsDeviceSelector.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/SettingsDeviceSelector.qml 2016-04-13 15:22:01.000000000 +0000 @@ -39,7 +39,9 @@ containerHeight: itemHeight * model.length model: internal.devices - delegate: OptionSelectorDelegate { text: modelData.id } + delegate: OptionSelectorDelegate { + text: modelData.displayName || i18n.tr("Default") + } onDelegateClicked: deviceSelected(model[index].id) } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/SettingsPageHeader.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/SettingsPageHeader.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/SettingsPageHeader.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/SettingsPageHeader.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ - /* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 -import Ubuntu.Components 1.3 -import Ubuntu.Components.ListItems 1.3 as ListItem - -/* - * Component to use as page header in settings page and subpages - * - * It has a back() signal fired when back button is pressed and a text - * property to set the page title - */ - -Column { - id: root - signal back() - property string text - - height: childrenRect.height - - anchors { - left: parent.left - right: parent.right - } - - Rectangle { - id: title - - height: units.gu(7) - divider.height - anchors { left: parent.left; right: parent.right } - - Rectangle { - anchors.fill: parent - color: "#f6f6f6" - } - - AbstractButton { - id: backButton - objectName: "backButton" - - width: height - - onTriggered: root.back() - anchors { - top: parent.top - bottom: parent.bottom - left: parent.left - } - - Rectangle { - anchors.fill: parent - anchors.leftMargin: units.gu(1) - anchors.rightMargin: units.gu(1) - color: "#E6E6E6" - visible: parent.pressed - } - - Icon { - name: "back" - anchors { - fill: parent - topMargin: units.gu(2) - bottomMargin: units.gu(2) - } - } - } - - Label { - anchors { - left: backButton.right - verticalCenter: parent.verticalCenter - } - text: root.text - fontSize: 'x-large' - } - } - - ListItem.Divider { - id: divider - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/SettingsPage.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/SettingsPage.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/SettingsPage.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/SettingsPage.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -20,7 +20,6 @@ import Qt.labs.settings 1.0 import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 -import Ubuntu.Components.ListItems 1.3 as ListItems import Ubuntu.Web 0.2 import webbrowserapp.private 0.1 @@ -43,7 +42,7 @@ searchPaths: searchEnginesSearchPaths } - SettingsPageHeader { + BrowserPageHeader { id: title onBack: settingsItem.done() @@ -68,8 +67,10 @@ width: parent.width - ListItems.Subtitled { + ListItem { + id: searchEngineListItem objectName: "searchengine" + readonly property string currentSearchEngineDisplayName: currentSearchEngine.name SearchEngine { id: currentSearchEngine @@ -77,32 +78,38 @@ filename: settingsObject.searchEngine } - text: i18n.tr("Search engine") - subText: currentSearchEngine.name + ListItemLayout { + title.text: i18n.tr("Search engine") + subtitle.text: searchEngineListItem.currentSearchEngineDisplayName + } visible: searchEngines.engines.count > 1 - onClicked: searchEngineComponent.createObject(subpageContainer) } - ListItems.Subtitled { + ListItem { + id: homepageListItem objectName: "homepage" + readonly property url currentHomepage: settingsObject.homepage - text: i18n.tr("Homepage") - subText: settingsObject.homepage + ListItemLayout { + title.text: i18n.tr("Homepage") + subtitle.text: homepageListItem.currentHomepage + } onClicked: PopupUtils.open(homepageDialog) } - ListItems.Standard { + ListItem { objectName: "restoreSession" - text: i18n.tr("Restore previous session at startup") - highlightWhenPressed: false - - control: CheckBox { - id: restoreSessionCheckbox - onTriggered: settingsObject.restoreSession = checked + ListItemLayout { + title.text: i18n.tr("Restore previous session at startup") + CheckBox { + id: restoreSessionCheckbox + SlotsLayout.position: SlotsLayout.Trailing + onTriggered: settingsObject.restoreSession = checked + } } Binding { @@ -112,37 +119,22 @@ } } - ListItems.Standard { - objectName: "backgroundTabs" - - text: i18n.tr("Allow opening new tabs in background") - highlightWhenPressed: false - - control: CheckBox { - id: allowOpenInBackgroundTabCheckbox - onTriggered: settingsObject.allowOpenInBackgroundTab = checked ? 'true' : 'false' - } - - Binding { - target: allowOpenInBackgroundTabCheckbox - property: "checked" - value: settingsObject.allowOpenInBackgroundTab === 'true' || - (settingsObject.allowOpenInBackgroundTab === 'default' && formFactor === "desktop") - } - } - - ListItems.Standard { + ListItem { objectName: "privacy" - text: i18n.tr("Privacy & permissions") + ListItemLayout { + title.text: i18n.tr("Privacy & permissions") + } onClicked: privacyComponent.createObject(subpageContainer) } - ListItems.Standard { + ListItem { objectName: "reset" - text: i18n.tr("Reset browser settings") + ListItemLayout { + title.text: i18n.tr("Reset browser settings") + } onClicked: settingsObject.restoreDefaults() } @@ -168,7 +160,7 @@ color: "#f6f6f6" } - SettingsPageHeader { + BrowserPageHeader { id: searchEngineTitle onBack: searchEngineItem.destroy() @@ -186,20 +178,25 @@ model: searchEngines.engines - delegate: ListItems.Standard { - objectName: "searchEngineDelegate_" + index + delegate: ListItem { + id: searchEngineDelegate + objectName: "searchEngineDelegate" + readonly property string displayName: delegateSearchEngine.name SearchEngine { - id: searchEngineDelegate + id: delegateSearchEngine searchPaths: searchEngines.searchPaths filename: model.filename } - text: searchEngineDelegate.name - control: CheckBox { - checked: settingsObject.searchEngine == searchEngineDelegate.filename - onClicked: { - settingsObject.searchEngine = searchEngineDelegate.filename - searchEngineItem.destroy() + ListItemLayout { + title.text: searchEngineDelegate.displayName + CheckBox { + SlotsLayout.position: SlotsLayout.Trailing + checked: settingsObject.searchEngine == delegateSearchEngine.filename + onClicked: { + settingsObject.searchEngine = delegateSearchEngine.filename + searchEngineItem.destroy() + } } } } @@ -221,7 +218,7 @@ color: "#f6f6f6" } - SettingsPageHeader { + BrowserPageHeader { id: privacyTitle onBack: privacyItem.destroy() text: i18n.tr("Privacy & permissions") @@ -243,15 +240,19 @@ id: privacyCol width: parent.width - ListItems.Standard { + ListItem { objectName: "privacy.mediaAccess" - text: i18n.tr("Camera & microphone") + ListItemLayout { + title.text: i18n.tr("Camera & microphone") + } onClicked: mediaAccessComponent.createObject(subpageContainer) } - ListItems.Standard { + ListItem { objectName: "privacy.clearHistory" - text: i18n.tr("Clear Browsing History") + ListItemLayout { + title.text: i18n.tr("Clear Browsing History") + } enabled: HistoryModel.count > 0 onClicked: { var dialog = PopupUtils.open(privacyConfirmDialogComponent, privacyItem, {"title": i18n.tr("Clear Browsing History?")}) @@ -259,9 +260,11 @@ } } - ListItems.Standard { + ListItem { objectName: "privacy.clearCache" - text: i18n.tr("Clear Cache") + ListItemLayout { + title.text: i18n.tr("Clear Cache") + } onClicked: { var dialog = PopupUtils.open(privacyConfirmDialogComponent, privacyItem, {"title": i18n.tr("Clear Cache?")}) dialog.confirmed.connect(function() { @@ -379,7 +382,7 @@ color: "#f6f6f6" } - SettingsPageHeader { + BrowserPageHeader { id: mediaAccessTitle onBack: mediaAccessItem.destroy() @@ -402,8 +405,10 @@ id: mediaAccessCol width: parent.width - ListItems.Standard { - text: i18n.tr("Microphone") + ListItem { + ListItemLayout { + title.text: i18n.tr("Microphone") + } } SettingsDeviceSelector { @@ -414,15 +419,17 @@ visible: devicesCount > 0 enabled: devicesCount > 1 - defaultDevice: settings.defaultAudioDevice + defaultDevice: settingsObject.defaultAudioDevice onDeviceSelected: { SharedWebContext.sharedContext.defaultAudioCaptureDeviceId = id - settings.defaultAudioDevice = id + settingsObject.defaultAudioDevice = id } } - ListItems.Standard { - text: i18n.tr("Camera") + ListItem { + ListItemLayout { + title.text: i18n.tr("Camera") + } } SettingsDeviceSelector { @@ -433,10 +440,10 @@ visible: devicesCount > 0 enabled: devicesCount > 1 - defaultDevice: settings.defaultVideoDevice + defaultDevice: settingsObject.defaultVideoDevice onDeviceSelected: { - SharedWebContext.sharedContext.defaultVideoCaptureDeviceId = id - settings.defaultVideoDevice = id + SharedWebContext.sharedContext.defaultVideoCaptureDeviceId = id + settingsObject.defaultVideoDevice = id } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabChrome.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabChrome.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabChrome.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabChrome.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -62,7 +62,10 @@ anchors.top: parent.top anchors.bottom: parent.bottom + active: true hoverable: false + fgColor: "#111111" + onSelected: tabChrome.selected() onClosed: tabChrome.closed() } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabItem.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabItem.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabItem.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabItem.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -35,6 +35,10 @@ property real dragMax: 0 readonly property bool dragging: mouseArea.drag.active + property color fgColor: Theme.palette.normal.baseText + + property bool touchEnabled: true + signal selected() signal closed() signal contextMenu() @@ -45,7 +49,7 @@ anchors.rightMargin: tabItem.rightMargin source: "assets/tab-%1%2.sci".arg((active) ? "active" : (hoverArea.containsMouse ? "hover" : "non-active")) - .arg(formFactor == "desktop" ? "-desktop" : "") + .arg(touchEnabled ? "" : "-desktop") Favicon { id: favicon @@ -69,6 +73,7 @@ verticalAlignment: Text.AlignVCenter clip: true fontSize: "small" + color: tabItem.fgColor } Rectangle { @@ -79,8 +84,8 @@ gradient: Gradient { GradientStop { position: 0.0; - color: active ? "#f8f8f8" : - (hoverArea.containsMouse ? "#cecece" : "#dedede") + color: active ? "#ffffff" : + (hoverArea.containsMouse ? "#c5c5c5" : "#d2d2d2") } GradientStop { position: 0.33; color: "transparent" } } @@ -118,15 +123,14 @@ id: closeButton objectName: "closeButton" - // On mobile the tap area to close the tab occupies the whole right + // On touch the tap area to close the tab occupies the whole right // hand side of the tab, while it covers only the close icon in // other form factors - readonly property bool mobile: formFactor == "mobile" - anchors.fill: mobile ? undefined : closeIcon - anchors.top: mobile ? parent.top : undefined - anchors.bottom: mobile ? parent.bottom : undefined - anchors.right: mobile ? parent.right : undefined - width: mobile ? units.gu(4) : closeIcon.width + anchors.fill: touchEnabled ? undefined : closeIcon + anchors.top: touchEnabled ? parent.top : undefined + anchors.bottom: touchEnabled ? parent.bottom : undefined + anchors.right: touchEnabled ? parent.right : undefined + width: touchEnabled ? units.gu(4) : closeIcon.width onClicked: closed() @@ -145,6 +149,7 @@ anchors.rightMargin: units.gu(1) anchors.verticalCenter: parent.verticalCenter name: "close" + color: tabItem.fgColor } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabPreview.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabPreview.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabPreview.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabPreview.qml 2016-04-13 15:22:01.000000000 +0000 @@ -19,7 +19,7 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 -Column { +Item { id: tabPreview property alias title: chrome.title @@ -36,11 +36,11 @@ signal selected() signal closed() - TabChrome { id: chrome anchors { + top: parent.top left: parent.left right: parent.right } @@ -51,8 +51,14 @@ } Item { - width: parent.width + anchors { + top: chrome.bottom + topMargin: units.dp(-1) + left: parent.left + right: parent.right + } height: parent.height + clip: true Rectangle { anchors.fill: parent diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabsBar.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabsBar.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabsBar.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabsBar.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -32,6 +32,10 @@ property bool incognito: false + property color fgColor: Theme.palette.normal.baseText + + property bool touchEnabled: true + signal switchToTab(int index) signal requestNewTab(int index, bool makeCurrent) signal tabClosed(int index) @@ -67,7 +71,7 @@ height: units.gu(2) anchors.centerIn: parent name: "add" - color: incognito ? "white" : UbuntuColors.darkGrey + color: incognito ? "white" : root.fgColor } onClicked: root.requestNewTab(root.model.count, true) @@ -109,7 +113,6 @@ anchors { top: parent.top bottom: parent.bottom - bottomMargin: tabsContainer.verticalGap left: parent.left } width: tabWidth * root.model.count @@ -149,6 +152,9 @@ incognito: root.incognito title: model.title ? model.title : (model.url.toString() ? model.url : i18n.tr("New tab")) icon: model.icon + fgColor: root.fgColor + + touchEnabled: root.touchEnabled rightMargin: tabDelegate.rightMargin @@ -182,5 +188,16 @@ z: (root.model.currentIndex == index) ? 3 : 1 - index / root.model.count } } + + Rectangle { + anchors { + left: parent.left + bottom: parent.bottom + } + width: root.width + height: units.dp(1) + color: "#cacaca" + z: 2 + } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabsList.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabsList.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TabsList.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TabsList.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -50,7 +50,7 @@ right: parent.right } height: invisibleTabChrome.height - color: "#fbfbfb" + color: "#111111" } Flickable { diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/tabs-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/tabs-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/tabs-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/tabs-model.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -148,7 +148,9 @@ m_currentIndex = 0; Q_EMIT currentIndexChanged(); Q_EMIT currentTabChanged(); - } else if (index <= m_currentIndex) { + } else if (index == m_currentIndex) { + Q_EMIT currentTabChanged(); + } else if (index < m_currentIndex) { // Increment the index if we are inserting items before the current index. m_currentIndex++; Q_EMIT currentIndexChanged(); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/Thumbnailer.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/Thumbnailer.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/Thumbnailer.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/Thumbnailer.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,26 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQml 2.0 +import Ubuntu.Thumbnailer 0.1 + +/* Because Thumbnailer isn't in the main repository the webbrowser can't + depend on it. We use this file to dynamically load the thumbnailer image + provider if it's installed. */ + +QtObject { } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ToolbarAction.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ToolbarAction.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/ToolbarAction.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/ToolbarAction.qml 2016-04-13 15:22:01.000000000 +0000 @@ -28,6 +28,7 @@ opacity: enabled ? 1.0 : 0.3 width: Math.max(label.paintedWidth, icon.width) + activeFocusOnPress: false Item { anchors { diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/top-sites-model.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/top-sites-model.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/top-sites-model.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/top-sites-model.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "history-model.h" -#include "history-timeframe-model.h" -#include "top-sites-model.h" - -/*! - \class TopSitesModel - \brief Proxy model that filters a history model based on hidden role and sorts it by number of visits - - TopSitesModel is a proxy model that filters a HistoryTimeframeModel - based on the hidden rule and sorts it by the number of visits - (i.e. the history with the greatest number of visits first ignoring entries marked as removed by user). -*/ -TopSitesModel::TopSitesModel(QObject* parent) - : QSortFilterProxyModel(parent) -{ - setDynamicSortFilter(true); - setSortRole(HistoryModel::Visits); - sort(0, Qt::DescendingOrder); - connect(this, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SIGNAL(countChanged())); - connect(this, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SIGNAL(countChanged())); - connect(this, SIGNAL(modelReset()), SIGNAL(countChanged())); -} - -HistoryTimeframeModel* TopSitesModel::sourceModel() const -{ - return qobject_cast(QSortFilterProxyModel::sourceModel()); -} - -void TopSitesModel::setSourceModel(HistoryTimeframeModel* sourceModel) -{ - if (sourceModel != this->sourceModel()) { - QSortFilterProxyModel::setSourceModel(sourceModel); - Q_EMIT sourceModelChanged(); - Q_EMIT countChanged(); - } -} - -bool TopSitesModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const -{ - QModelIndex index = sourceModel()->index(source_row, 0, source_parent); - return !sourceModel()->data(index, HistoryModel::Hidden).toBool(); -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/top-sites-model.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/top-sites-model.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/top-sites-model.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/top-sites-model.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __TOP_SITES_MODEL_H__ -#define __TOP_SITES_MODEL_H__ - -// Qt -#include - -class HistoryTimeframeModel; - -class TopSitesModel : public QSortFilterProxyModel -{ - Q_OBJECT - - Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) - Q_PROPERTY(int count READ rowCount NOTIFY countChanged) - -public: - TopSitesModel(QObject* parent=0); - - HistoryTimeframeModel* sourceModel() const; - void setSourceModel(HistoryTimeframeModel* sourceModel); - -Q_SIGNALS: - void sourceModelChanged() const; - void countChanged() const; - -protected: - // reimplemented from QSortFilterProxyModel - bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; -}; - -#endif // __TOP_SITES_MODEL_H__ diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TopSitesModel.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TopSitesModel.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/TopSitesModel.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/TopSitesModel.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,31 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 + +SortFilterModel { + sort { + order: Qt.DescendingOrder + property: "visits" + } + filter { + pattern: /^false$/ + property: "hidden" + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlDelegate.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlDelegate.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlDelegate.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlDelegate.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -17,6 +17,7 @@ */ import QtQuick 2.4 +import QtQuick.Layouts 1.1 import Ubuntu.Components 1.3 import ".." @@ -35,37 +36,37 @@ signal removed() - Row { + RowLayout { anchors { verticalCenter: parent.verticalCenter left: parent.left leftMargin: units.gu(1.5) + right: parent.right + rightMargin: units.gu(1.5) } spacing: units.gu(1) Loader { id: headerComponentLoader - sourceComponent: undefined + anchors.verticalCenter: parent.verticalCenter + visible: status == Loader.Ready } - UbuntuShape { - id: iconContainer - width: units.gu(3) - height: width - - Favicon { - id: icon - anchors.centerIn: parent - } + Favicon { + id: icon + anchors.verticalCenter: parent.verticalCenter } Column { - width: urlDelegate.width - headerComponentLoader.width - iconContainer.width - parent.spacing - height: parent.height + Layout.fillWidth: true + anchors.verticalCenter: parent.verticalCenter Label { id: title - + anchors { + left: parent.left + right: parent.right + } fontSize: "x-small" color: UbuntuColors.darkGrey wrapMode: Text.Wrap @@ -75,7 +76,10 @@ Label { id: url - + anchors { + left: parent.left + right: parent.right + } fontSize: "xx-small" color: UbuntuColors.darkGrey wrapMode: Text.Wrap diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlDelegateWide.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlDelegateWide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlDelegateWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlDelegateWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -26,11 +26,8 @@ property alias icon: icon.source property alias title: title.text property alias url: url.text - property bool highlighted: false property bool removable: true - color: highlighted ? Qt.rgba(0, 0, 0, 0.05) : "transparent" - divider.visible: false height: units.gu(5) @@ -57,7 +54,7 @@ id: title fontSize: "x-small" - color: highlighted ? UbuntuColors.orange : UbuntuColors.darkGrey + color: UbuntuColors.darkGrey wrapMode: Text.Wrap elide: Text.ElideRight maximumLineCount: 1 @@ -67,7 +64,7 @@ id: url fontSize: "xx-small" - color: highlighted ? UbuntuColors.orange : UbuntuColors.darkGrey + color: UbuntuColors.darkGrey wrapMode: Text.Wrap elide: Text.ElideRight maximumLineCount: 1 diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlPreviewDelegate.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlPreviewDelegate.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlPreviewDelegate.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlPreviewDelegate.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -79,10 +79,14 @@ anchors.left: parent.left width: units.gu(26) height: units.gu(16) + backgroundColor: "#f7f7f7" + + property url previewUrl: Qt.resolvedUrl(PreviewManager.previewPathFromUrl(preview.url)) + readonly property bool hasPreview: FileOperations.exists(previewUrl) source: Image { id: previewImage - source: FileOperations.exists(previewShape.previewUrl) ? previewShape.previewUrl : "" + source: previewShape.hasPreview ? previewShape.previewUrl : "" sourceSize.width: previewShape.width cache: false } @@ -90,12 +94,10 @@ sourceHorizontalAlignment: UbuntuShape.AlignLeft sourceVerticalAlignment: UbuntuShape.AlignTop - property url previewUrl: Qt.resolvedUrl(PreviewManager.previewPathFromUrl(preview.url)) - Connections { target: PreviewManager onPreviewSaved: { - if (pageUrl !== preview.url) return + if (pageUrl != preview.url) return previewImage.source = "" previewImage.source = previewShape.previewUrl } @@ -105,6 +107,14 @@ preview.setCurrent() PopupUtils.open(contextMenuComponent, previewShape) } + + Image { + anchors.centerIn: parent + width: units.gu(2.5) + height: units.gu(2.5) + source: previewShape.hasPreview ? "" : "assets/stock_website.png" + fillMode: Image.PreserveAspectFit + } } } @@ -117,12 +127,16 @@ Component { id: contextMenuComponent ActionSelectionPopover { + objectName: "urlPreviewDelegate.contextMenu" grabDismissAreaEvents: true actions: ActionList { Action { objectName: "delete" text: i18n.tr("Remove") - onTriggered: preview.removed() + onTriggered: { + preview.removed() + preview.GridView.view.forceActiveFocus() + } } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlPreviewGrid.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlPreviewGrid.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlPreviewGrid.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlPreviewGrid.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -17,10 +17,7 @@ */ import QtQuick 2.4 -import Qt.labs.settings 1.0 import Ubuntu.Components 1.3 -import webbrowserapp.private 0.1 -import ".." GridView { id: grid @@ -33,15 +30,10 @@ signal activated(url url) signal removed(url url) - signal releasingKeyboardFocus() - - currentIndex: 0 cellWidth: previewWidth + horizontalMargin * 2 cellHeight: previewHeight + verticalMargin * 2 + units.gu(4) // height of text + favicon + margins in delegate - implicitHeight: contentItem.childrenRect.height - delegate: UrlPreviewDelegate { objectName: "topSiteItem" width: grid.cellWidth @@ -60,32 +52,45 @@ onRemoved: grid.removed(model.url) } - highlight: Component { - Item { - visible: grid.activeFocus - UbuntuShape { - anchors.fill: parent - anchors.leftMargin: - grid.horizontalMargin - anchors.rightMargin: grid.horizontalMargin - anchors.topMargin: - grid.verticalMargin - anchors.bottomMargin: grid.verticalMargin - aspect: UbuntuShape.Flat - backgroundColor: Qt.rgba(0, 0, 0, 0.05) + highlight: Item { + visible: viewHighlight.hasKeyboard && GridView.view && GridView.view.activeFocus + ListViewHighlight { + id: viewHighlight + visible: true + width: previewWidth + units.gu(2) + height: previewHeight + units.gu(5) + anchors { + top: parent.top + left: parent.left + topMargin: (grid.cellHeight - height) / 2 - grid.verticalMargin - units.gu(0.5) + leftMargin: (grid.cellWidth - width) / 2 - grid.horizontalMargin } } } Keys.onDeletePressed: removed(currentItem.url) - Keys.onLeftPressed: { - var i = grid.currentIndex - grid.moveCurrentIndexLeft() - if (i === grid.currentIndex) grid.releasingKeyboardFocus() + Keys.onUpPressed: { + var current = currentIndex + moveCurrentIndexUp() + if (current == currentIndex) { + event.accepted = false + } + } + Keys.onDownPressed: { + var current = currentIndex + moveCurrentIndexDown() + if (currentIndex == current) { + event.accepted = false + } } - Keys.onUpPressed: { - var i = grid.currentIndex - grid.moveCurrentIndexUp() - if (i === grid.currentIndex) grid.releasingKeyboardFocus() + Timer { + // Work around a weird issue with the use of a LimitProxyModel in a + // grid view, where the currentIndex is changed when populating the + // model. + running: true + interval: 1 + onTriggered: grid.currentIndex = 0 } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlsList.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlsList.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/UrlsList.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/UrlsList.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -/* - * Copyright 2014-2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.4 -import Ubuntu.Components 1.3 - -Column { - id: urlsList - - property alias model: urlsListRepeater.model - property int limit: -1 - - signal urlClicked(url url) - signal urlRemoved(url url) - - spacing: units.gu(1) - - Repeater { - id: urlsListRepeater - - delegate: Loader { - active: limit < 0 || index < limit - sourceComponent: UrlDelegate{ - id: urlDelegate - width: urlsList.width - height: units.gu(5) - - icon: model ? model.icon : "" - title: model.title ? model.title : model.url - url: model ? model.url : "" - - onClicked: urlsList.urlClicked(model.url) - onRemoved: urlsList.urlRemoved(model.url) - } - } - } -} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app-content-hub.json webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app-content-hub.json --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app-content-hub.json 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app-content-hub.json 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,5 @@ +{ + "source": [ + "all" + ] +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app.cpp webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -20,18 +20,15 @@ #include "bookmarks-folderlist-model.h" #include "cache-deleter.h" #include "config.h" +#include "downloads-model.h" #include "file-operations.h" -#include "history-domainlist-chronological-model.h" #include "history-domainlist-model.h" #include "history-lastvisitdatelist-model.h" -#include "history-lastvisitdate-model.h" #include "history-model.h" -#include "history-timeframe-model.h" #include "limit-proxy-model.h" #include "searchengine.h" #include "text-search-filter-model.h" #include "tabs-model.h" -#include "top-sites-model.h" #include "webbrowser-app.h" // Qt @@ -50,44 +47,25 @@ { } -static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new FileOperations(); -} - -static QObject* CacheDeleter_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new CacheDeleter(); -} - -static QObject* BookmarksModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new BookmarksModel(); -} - -static QObject* HistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new HistoryModel(); -} +#define MAKE_SINGLETON_FACTORY(type) \ + static QObject* type##_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) { \ + Q_UNUSED(engine); \ + Q_UNUSED(scriptEngine); \ + return new type(); \ + } + +MAKE_SINGLETON_FACTORY(FileOperations) +MAKE_SINGLETON_FACTORY(CacheDeleter) +MAKE_SINGLETON_FACTORY(BookmarksModel) +MAKE_SINGLETON_FACTORY(HistoryModel) +MAKE_SINGLETON_FACTORY(DownloadsModel) bool WebbrowserApp::initialize() { const char* uri = "webbrowserapp.private"; qmlRegisterSingletonType(uri, 0, 1, "HistoryModel", HistoryModel_singleton_factory); - qmlRegisterType(uri, 0, 1, "HistoryTimeframeModel"); - qmlRegisterType(uri, 0 , 1, "TopSitesModel"); qmlRegisterType(uri, 0, 1, "HistoryDomainListModel"); - qmlRegisterType(uri, 0, 1, "HistoryDomainListChronologicalModel"); qmlRegisterType(uri, 0, 1, "HistoryLastVisitDateListModel"); - qmlRegisterType(uri, 0, 1, "HistoryLastVisitDateModel"); qmlRegisterType(uri, 0 , 1, "LimitProxyModel"); qmlRegisterType(uri, 0, 1, "TabsModel"); qmlRegisterSingletonType(uri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory); @@ -95,6 +73,7 @@ qmlRegisterSingletonType(uri, 0, 1, "FileOperations", FileOperations_singleton_factory); qmlRegisterType(uri, 0, 1, "SearchEngine"); qmlRegisterSingletonType(uri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory); + qmlRegisterSingletonType(uri, 0, 1, "DownloadsModel", DownloadsModel_singleton_factory); qmlRegisterType(uri, 0, 1, "TextSearchFilterModel"); if (BrowserApplication::initialize("webbrowser/webbrowser-app.qml")) { @@ -103,6 +82,8 @@ searchEnginesSearchPaths << UbuntuBrowserDirectory() + "/webbrowser/searchengines"; m_engine->rootContext()->setContextProperty("searchEnginesSearchPaths", searchEnginesSearchPaths); + m_engine->rootContext()->setContextProperty("__platformName", platformName()); + m_window->setProperty("newSession", m_arguments.contains("--new-session")); QVariantList urls; diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app.h webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app.h --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app.h 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app.qml webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webbrowser/webbrowser-app.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webbrowser/webbrowser-app.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -65,19 +65,10 @@ } } - // Handle runtime requests to open urls as defined - // by the freedesktop application dbus interface's open - // method for DBUS application activation: - // http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus - // The dispatch on the org.freedesktop.Application if is done per appId at the - // url-dispatcher/upstart level. - Connections { - target: UriHandler - onOpened: { - for (var i = 0; i < uris.length; ++i) { - var setCurrent = (i == uris.length - 1) - browser.openUrlInNewTab(uris[i], setCurrent, setCurrent) - } + onOpenUrls: { + for (var i = 0; i < urls.length; ++i) { + var setCurrent = (i == urls.length - 1) + browser.openUrlInNewTab(urls[i], setCurrent, setCurrent) } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/assets/stock_link.svg webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/assets/stock_link.svg --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/assets/stock_link.svg 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/assets/stock_link.svg 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/Chrome.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/Chrome.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/Chrome.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/Chrome.qml 2016-04-13 15:22:01.000000000 +0000 @@ -25,6 +25,7 @@ property bool navigationButtonsVisible: false property bool accountSwitcher: false + property alias chromeTextLabelColor: chromeTextLabel.color signal chooseAccount() @@ -90,6 +91,8 @@ } Label { + id: chromeTextLabel + anchors { left: faviconContainer.right right: reloadButton.left diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -30,17 +30,17 @@ target_link_libraries(${WEBAPP_CONTAINER} Qt5::Core Qt5::DBus + Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Sql - Qt5::Widgets ${COMMONLIB} ) install(TARGETS ${WEBAPP_CONTAINER} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -file(GLOB QML_FILES *.qml) +file(GLOB QML_FILES *.qml *.js) install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webcontainer) install(DIRECTORY actions DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webcontainer FILES_MATCHING PATTERN *.qml) diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ColorUtils.js webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ColorUtils.js --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ColorUtils.js 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ColorUtils.js 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,73 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * Returns the color which has the most contrast with a base color. + * + * The contrast is based on the contrast ration found definition found here: + * https://www.w3.org/TR/WCAG20/#contrast-ratiodef + * + * @param baseColor a string with format ,, corresponding to the base color + * @param darkenedBaseColor the darker version of the base color + * @param lightenedBaseColor the lighter version of the base color + * @return defaultLightenColor or defaultDarkenColor depending on better contrast + * color string for special cases ("white", "black") + */ + +function getMostConstrastedColor( + baseColor, + darkenedBaseColor, + lightenedBaseColor) { + function toLuminanceFactor(cc) { + return (cc <= 0.03928) + ? (cc / 12.92) + : Math.pow(((cc + 0.055) / 1.055), 2.4) + } + function getRelativeLuminance(c) { + return 0.2126 * toLuminanceFactor(c.r) + + 0.7152 * toLuminanceFactor(c.g) + + 0.0722 * toLuminanceFactor(c.b) + } + function getContrastRatio(lighterColorLuminance, darkerColorLuminance) { + return (lighterColorLuminance + 0.05) / (darkerColorLuminance + 0.05) + } + var components = baseColor.split(",") + + // special case for black + if (components[0].trim() === "0" + && components[1].trim() === "0" + && components[2].trim() === "0") { + return "white" + } + if (components[0].trim() === "255" + && components[1].trim() === "255" + && components[2].trim() === "255") { + return "black" + } + + var color = { + r: parseInt(components[0])/255, + g: parseInt(components[1])/255, + b: parseInt(components[2])/255 + } + var CONTRAST_LIGHT_ITEM_THRESHOLD = 3.0 + if (getContrastRatio(0.0, getRelativeLuminance(color)) >= CONTRAST_LIGHT_ITEM_THRESHOLD) { + return darkenedBaseColor + } + return lightenedBaseColor +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContentDownloadDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContentDownloadDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContentDownloadDialog.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContentDownloadDialog.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,68 @@ +/* + * Copyright 2014-2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 +import Ubuntu.Content 1.3 +import webbrowsercommon.private 0.1 +import ".." + +Component { + PopupBase { + id: downloadDialog + objectName: "downloadDialog" + anchors.fill: parent + property var activeTransfer + property var downloadId + property var singleDownload + property var mimeType + property var filename + property var icon: MimeDatabase.iconForMimetype(mimeType) + property alias contentType: peerPicker.contentType + + ContentPeerModel { + id: peerModel + handler: ContentHandler.Destination + contentType: downloadDialog.contentType + } + + Rectangle { + id: pickerRect + anchors.fill: parent + visible: true + ContentPeerPicker { + id: peerPicker + handler: ContentHandler.Destination + objectName: "contentPeerPicker" + visible: parent.visible + + onPeerSelected: { + activeTransfer = peer.request() + activeTransfer.downloadId = downloadDialog.downloadId + activeTransfer.state = ContentTransfer.Downloading + PopupUtils.close(downloadDialog) + } + + onCancelPressed: { + PopupUtils.close(downloadDialog) + } + } + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContentPickerDialog.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContentPickerDialog.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContentPickerDialog.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContentPickerDialog.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,97 @@ +/* + * Copyright 2014-2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 as Popups +import Ubuntu.Content 1.3 +import "../MimeTypeMapper.js" as MimeTypeMapper +import ".." + +Component { + Popups.PopupBase { + id: picker + objectName: "contentPickerDialog" + + // Set the parent at construction time, instead of letting show() + // set it later on, which for some reason results in the size of + // the dialog not being updated. + parent: QuickUtils.rootItem(this) + + property var activeTransfer + + Rectangle { + anchors.fill: parent + + ContentTransferHint { + anchors.fill: parent + activeTransfer: picker.activeTransfer + } + + ContentPeerPicker { + id: peerPicker + anchors.fill: parent + visible: true + contentType: ContentType.All + handler: ContentHandler.Source + + onPeerSelected: { + if (model.allowMultipleFiles) { + peer.selectionType = ContentTransfer.Multiple + } else { + peer.selectionType = ContentTransfer.Single + } + picker.activeTransfer = peer.request() + stateChangeConnection.target = picker.activeTransfer + } + + onCancelPressed: { + model.reject() + } + } + } + + Connections { + id: stateChangeConnection + target: null + onStateChanged: { + if (picker.activeTransfer.state === ContentTransfer.Charged) { + var selectedItems = [] + for(var i in picker.activeTransfer.items) { + selectedItems.push(String(picker.activeTransfer.items[i].url).replace("file://", "")) + } + model.accept(selectedItems) + } + } + } + + Component.onCompleted: { + if(acceptTypes.length === 1) { + var contentType = MimeTypeMapper.mimeTypeToContentType(acceptTypes[0]) + if(contentType == ContentType.Unknown) { + // If we don't recognise the type, allow uploads from any app + contentType = ContentType.All + } + peerPicker.contentType = contentType + } else { + peerPicker.contentType = ContentType.All + } + show() + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContextMenuMobile.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContextMenuMobile.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContextMenuMobile.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContextMenuMobile.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,162 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItems +import Ubuntu.Components.Popups 1.3 as Popups +import com.canonical.Oxide 1.8 as Oxide + +Popups.Dialog { + property QtObject contextModel: model + property ActionList actions: null + + objectName: "contextMenuMobile" + + QtObject { + id: internal + readonly property bool isImage: (contextModel.mediaType === Oxide.WebView.MediaTypeImage) || + (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas) + } + + Row { + id: header + spacing: units.gu(2) + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + height: units.gu(2 * title.lineCount + 3) + visible: title.text + + Icon { + width: units.gu(2) + height: units.gu(2) + anchors { + top: parent.top + topMargin: units.gu(2) + } + name: internal.isImage ? "stock_image" : "" + // work around the lack of a standard stock_link symbolic icon in the theme + Component.onCompleted: { + if (!name) { + source = "assets/stock_link.svg" + } + } + } + + Label { + id: title + objectName: "titleLabel" + text: contextModel.srcUrl.toString() ? contextModel.srcUrl : contextModel.linkUrl + width: parent.width - units.gu(4) + anchors { + top: parent.top + topMargin: units.gu(2) + bottom: parent.bottom + } + fontSize: "x-small" + maximumLineCount: 2 + wrapMode: Text.Wrap + height: contentHeight + } + } + + ListItems.ThinDivider { + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + visible: header.visible + } + + Repeater { + model: actions.actions + delegate: ListItems.Empty { + action: actions.actions[index] + objectName: action.objectName + "_item" + visible: action.enabled + showDivider: false + + height: units.gu(5) + + Label { + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + verticalCenter: parent.verticalCenter + } + fontSize: "x-small" + text: action.text + } + + ListItems.ThinDivider { + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + bottom: parent.bottom + } + } + + onTriggered: contextModel.close() + } + } + + ListItems.Empty { + objectName: "cancelAction" + height: units.gu(5) + showDivider: false + Label { + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + verticalCenter: parent.verticalCenter + } + fontSize: "x-small" + text: i18n.tr("Cancel") + } + onTriggered: contextModel.close() + } + + // adjust default dialog visuals to custom requirements for the context menu + Binding { + target: __foreground + property: "margins" + value: 0 + } + Binding { + target: __foreground + property: "itemSpacing" + value: 0 + } + + // We can’t prevent the dialog from stealing the focus from + // the webview, but we can at least restore it when the + // dialog is closed (https://launchpad.net/bugs/1526884). + Component.onDestruction: Oxide.WebView.view.forceActiveFocus() +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContextMenuWide.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContextMenuWide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/ContextMenuWide.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/ContextMenuWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,158 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 as ListItems +import Ubuntu.Components.Popups 1.3 as Popups +import com.canonical.Oxide 1.8 as Oxide + +Popups.Popover { + id: contextMenu + + objectName: "contextMenuWide" + + property QtObject contextModel: model + property ActionList actions: null + property var associatedWebview: null + + QtObject { + id: internal + + readonly property int lastEnabledActionIndex: { + var last = -1 + for (var i in actions.actions) { + if (actions.actions[i].enabled) { + last = i + } + } + return last + } + + readonly property real locationBarOffset: contextMenu.associatedWebview.locationBarController.height + + contextMenu.associatedWebview.locationBarController.offset + } + + Rectangle { + anchors.fill: parent + color: "#ececec" + } + + Column { + anchors { + left: parent.left + right: parent.right + } + + Label { + id: titleLabel + objectName: "titleLabel" + text: contextModel.srcUrl.toString() ? contextModel.srcUrl : contextModel.linkUrl + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + height: units.gu(5) + visible: text + fontSize: "x-small" + color: "#888888" + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + } + + ListItems.ThinDivider { + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + visible: titleLabel.visible + } + + Repeater { + model: actions.actions + delegate: ListItems.Empty { + action: actions.actions[index] + objectName: action.objectName + "_item" + visible: action.enabled + showDivider: false + + height: units.gu(5) + + Label { + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + verticalCenter: parent.verticalCenter + } + fontSize: "small" + text: action.text + } + + ListItems.ThinDivider { + visible: index < internal.lastEnabledActionIndex + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + bottom: parent.bottom + } + } + + onTriggered: contextMenu.hide() + } + } + } + + Item { + id: positioner + visible: false + parent: contextMenu.associatedWebview + x: contextModel.position.x + y: contextModel.position.y + internal.locationBarOffset + } + caller: positioner + + onVisibleChanged: { + if (!visible) { + contextModel.close() + } + } + + // Override default implementation to prevent context menu from stealing + // active focus when shown (https://launchpad.net/bugs/1526884). + function show() { + visible = true + __foreground.show() + } + + Binding { + // Ensure the context menu doesn’t steal focus from + // the webview when one of its actions is activated + // (https://launchpad.net/bugs/1526884). + target: __foreground + property: "activeFocusOnPress" + value: false + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/PopupWindowController.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/PopupWindowController.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/PopupWindowController.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/PopupWindowController.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -20,6 +20,7 @@ import com.canonical.Oxide 1.0 as Oxide import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 +import Qt.labs.settings 1.0 Item { id: controller @@ -28,14 +29,67 @@ property var mainWebappView property var views: [] property bool blockOpenExternalUrls: false + property var mediaAccessDialogComponent + property bool wide: false // Used to access runtime behavior during tests signal openExternalUrlTriggered(string url) signal newViewCreated(string url) signal windowOverlayOpenAnimationDone() + signal initializeOverlayViewsWithUrls(var urls) + readonly property int maxSimultaneousViews: 3 + Settings { + id: webviewOverlayUrlsSettings + property string overlayUrls + } + + QtObject { + id: internal + property var urlPerOverlayView + } + + function updateOverlayUrlsSettings() { + var urls = [] + webviewOverlayUrlsSettings.overlayUrls = "[]" + for (var i in internal.urlPerOverlayView) { + urls.push(internal.urlPerOverlayView[i].toString()) + } + webviewOverlayUrlsSettings.overlayUrls = JSON.stringify(urls) + } + function onUrlUpdatedForOverlay(overlayView, url) { + if (!internal.urlPerOverlayView) { + internal.urlPerOverlayView = {} + } + + internal.urlPerOverlayView[overlayView] = url + + updateOverlayUrlsSettings() + } + + Connections { + target: Qt.application + onAboutToQuit: { + webviewOverlayUrlsSettings.overlayUrls = "[]" + } + } + + Component.onCompleted: { + if (webviewOverlayUrlsSettings.overlayUrls + && webviewOverlayUrlsSettings.overlayUrls.length > 0) { + try { + var urls = JSON.parse(webviewOverlayUrlsSettings.overlayUrls) + if (typeof(urls) === 'object' + && urls.length != undefined + && urls.length > 0) { + initializeOverlayViewsWithUrls(urls) + } + } catch (e) {} + } + } + function openUrlExternally(url) { if (!blockOpenExternalUrls) { Qt.openUrlExternally(url) @@ -53,6 +107,10 @@ var topView = views[views.length-1] } views.push(view) + + view.webviewUrlChanged.connect(function(webviewUrl) { + onUrlUpdatedForOverlay(view, webviewUrl) + }) } function handleOpenInUrlBrowserForView(url, view) { handleViewRemoved(view) @@ -84,6 +142,10 @@ return } views.pop() + if (internal.urlPerOverlayView) { + delete internal.urlPerOverlayView[topMostView] + updateOverlayUrlsSettings() + } var parentHeight = topMostView.parent.height var nextView = topViewOnStack() @@ -100,12 +162,15 @@ topMostView.yChanged.connect(onViewSlidingOut) topMostView.y = topMostView.parent.height } - function createPopupView(parentView, request, isRequestFromMainWebappWebview, context) { + function updateViewVisibility(view, visible) { + if (view) { + view.opacity = visible ? 1.0 : 0.0 + } + } + function createPopupView(parentView, params, isRequestFromMainWebappWebview, context) { var view = popupWebOverlayFactory.createObject( parentView, - { request: request, - webContext: context, - popupWindowController: controller }); + params); var topMostView = topViewOnStack() @@ -129,10 +194,28 @@ handleNewViewAdded(view) newViewCreated(view.url) } - function updateViewVisibility(view, visible) { - if (view) { - view.opacity = visible ? 1.0 : 0.0 - } + function createPopupViewForRequest(parentView, request, isRequestFromMainWebappWebview, context) { + createPopupView(parentView, + { request: request, + webContext: context, + popupWindowController: controller, + mediaAccessDialogComponent: mediaAccessDialogComponent + }, + isRequestFromMainWebappWebview, + context) + } + function createPopupViewForUrl(parentView, + overlayUrl, + isRequestFromMainWebappWebview, + context) { + createPopupView(parentView, + { url: overlayUrl, + webContext: context, + popupWindowController: controller, + mediaAccessDialogComponent: mediaAccessDialogComponent + }, + isRequestFromMainWebappWebview, + context) } Component { @@ -143,6 +226,8 @@ height: parent.height width: parent.width + wide: controller.wide + y: overlay.parent.height // Poor mans heuristic to know when an overlay has been @@ -174,8 +259,8 @@ console.log("Maximum number of popup overlay opened, opening: " + url + " in the browser") - return + return false } - request.action = Oxide.NavigationRequest.ActionAccept + return true } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/PopupWindowOverlay.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/PopupWindowOverlay.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/PopupWindowOverlay.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/PopupWindowOverlay.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -20,6 +20,7 @@ import QtQuick.Window 2.2 import com.canonical.Oxide 1.4 as Oxide import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 import ".." Item { @@ -30,7 +31,11 @@ property alias currentWebview: popupWebview property alias request: popupWebview.request property alias url: popupWebview.url - + property var mediaAccessDialogComponent + property alias wide: popupWebview.wide + + signal webviewUrlChanged(url webviewUrl) + Rectangle { color: "#F2F1F0" anchors.fill: parent @@ -154,13 +159,34 @@ } } - WebViewImpl { + WebappWebview { id: popupWebview objectName: "overlayWebview" context: webContext + onUrlChanged: webviewUrlChanged(popupWebview.url) + + Connections { + target: popupWebview.visible ? popupWebview : null + + /** + * We are only connecting to the mediaAccessPermission signal if we are the currently + * visible overlay. If other overlays slide over this one, oxide will deny (by default) + * all media access requests for this overlay. + * + * See the browser's webbrowser/Browser.qml source for additional comments. + */ + onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request }) + } + + onOpenUrlExternallyRequested: { + if (popupWindowController) { + popupWindowController.openUrlExternally(url) + } + } + anchors { bottom: parent.bottom left: parent.left @@ -170,7 +196,7 @@ onNewViewRequested: { if (popupWindowController) { - popupWindowController.createPopupView( + popupWindowController.createPopupViewForRequest( popup.parent, request, false, context) } } @@ -182,12 +208,15 @@ onNavigationRequested: { var url = request.url.toString() + request.action = Oxide.NavigationRequest.ActionAccept if (isNewForegroundWebViewDisposition(request.disposition)) { - popupWindowController.handleNewForegroundNavigationRequest( - url, request, false) - return + var shouldAcceptRequest = + popupWindowController.handleNewForegroundNavigationRequest( + url, request, false); + if (!shouldAcceptRequest) { + request.action = Oxide.NavigationRequest.ActionReject + } } - request.action = Oxide.NavigationRequest.ActionAccept } onCloseRequested: { diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/url-pattern-utils.cpp webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/url-pattern-utils.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/url-pattern-utils.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/url-pattern-utils.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -63,7 +63,9 @@ * := :// * := 'http' | 'https' * := + '.google' - * := '.' + + * := '.' ( | ) + * := ('com' | 'co') '.' + * := + * := '/' * * So for example we allow 'https://accounts.google.* /' but not 'https://*.google.* /' @@ -72,12 +74,16 @@ * IMPORTAN NOTE: the '*' wildcard in the TLD position is not a REAL wildcard in the * sense that it corresponds to [^\\./], so it wont match ('google.com.evildomain') as usual. * + * The non-terminal in the grammar above comes from: + * + * https://en.wikipedia.org/wiki/List_of_Google_domains + * * @param pattern pattern that is to be tested for validity * @return true if the url is valid, false otherwise */ bool isValidGoogleUrlPattern(const QString& pattern) { - static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\?\\*]+\\.google\\.[^\\.\\?]+/.*$"); + static QRegularExpression grammar("^http(s|s\\?)?://[^\\.\\?\\*]+\\.google\\.((com|co)\\.)?[^\\.\\?]+/.*$"); return grammar.match(pattern).hasMatch(); } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container.cpp webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -33,18 +33,17 @@ #include #include #include -#include #include +#include +#include #include +#include #include #include #include #include #include -#include -#include - static const char privateModuleUri[] = "webcontainer.private"; namespace @@ -88,6 +87,7 @@ m_backForwardButtonsVisible(false), m_addressBarVisible(false), m_localWebappManifest(false), + m_openExternalUrlInOverlay(false), m_webappContainerHelper(new WebappContainerHelper()) { } @@ -127,6 +127,7 @@ m_window->setProperty("chromeVisible", m_addressBarVisible); m_window->setProperty("accountProvider", m_accountProvider); m_window->setProperty("accountSwitcher", m_accountSwitcher); + m_window->setProperty("openExternalUrlInOverlay", m_openExternalUrlInOverlay); m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns); QQmlContext* context = m_engine->rootContext(); @@ -291,6 +292,7 @@ out << " --store-session-cookies store session cookies on disk" << endl; out << " --enable-media-hub-audio enable media-hub for audio playback" << endl; out << " --user-agent-string=USER_AGENT overrides the default User Agent with the provided one." << endl; + out << " --open-external-url-in-overlay if url patterns are defined, all external urls are opened in overlay instead of browser" << endl; out << "Chrome options (if none specified, no chrome is shown by default):" << endl; out << " --enable-back-forward enable the display of the back and forward buttons (implies --enable-addressbar)" << endl; out << " --enable-addressbar enable the display of a minimal chrome (favicon and title)" << endl; @@ -346,6 +348,8 @@ m_localCookieStoreDbPath = argument.split("--local-cookie-db-path=")[1]; } else if (argument.startsWith("--user-agent-string=")) { m_userAgentOverride = argument.split("--user-agent-string=")[1]; + } else if (argument == "--open-external-url-in-overlay") { + m_openExternalUrlInOverlay = true; } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container.h webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container.h --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container.h 2016-04-13 15:22:01.000000000 +0000 @@ -21,8 +21,6 @@ #include "browserapplication.h" -#include "webapp-container-helper.h" - // Qt #include #include @@ -30,6 +28,7 @@ class SchemeFilter; class QQmlContext; +class WebappContainerHelper; class WebappContainer : public BrowserApplication { @@ -67,6 +66,7 @@ bool m_backForwardButtonsVisible; bool m_addressBarVisible; bool m_localWebappManifest; + bool m_openExternalUrlInOverlay; QString m_popupRedirectionUrlPrefixPattern; QString m_localCookieStoreDbPath; QString m_userAgentOverride; diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container-helper.cpp webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container-helper.cpp --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container-helper.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container-helper.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,9 +18,11 @@ #include "webapp-container-helper.h" +#include #include #include - +#include +#include WebappContainerHelper::WebappContainerHelper(QObject* parent) : QObject(parent) @@ -38,15 +40,46 @@ void WebappContainerHelper::browseToUrl(QObject* webview, const QUrl& url) { - if ( ! webview) + if ( ! webview) { return; + } const QMetaObject* metaobject = webview->metaObject(); int urlPropIdx = metaobject->indexOfProperty("url"); - if (urlPropIdx == -1) + if (urlPropIdx == -1) { return; + } metaobject->property(urlPropIdx).write(webview, QVariant(url)); } - - - +QString WebappContainerHelper::rgbColorFromCSSColor(const QString& cssColor) +{ + QString color = cssColor.trimmed().toLower(); + if (color.isEmpty()) { + return QString(); + } + QString returnColorFormat = "%1,%2,%3"; + if (color.startsWith("rgb")) { + QRegExp rgbColorRe("rgb\\s*\\(\\s*(\\d+)\\s*,\\s*(\\d+)\\s*,\\s*(\\d+)\\s*\\)"); + if (rgbColorRe.exactMatch(color)) { + return returnColorFormat + .arg(rgbColorRe.cap(1).toInt()) + .arg(rgbColorRe.cap(2).toInt()) + .arg(rgbColorRe.cap(3).toInt()); + } + return QString(); + } else if (color.startsWith("#")) { + QString hexColor = color.mid(1); + if (hexColor.size() < 6 && hexColor.size() != 3) { + color = "#" + QString(6 - hexColor.size(), '0') + hexColor; + } + } + + QColor returnColor(color); + return returnColor.isValid() + ? returnColorFormat + .arg(returnColor.red()) + .arg(returnColor.green()) + .arg(returnColor.blue()) + .toLower() + : QString(); +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container-helper.h webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container-helper.h --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container-helper.h 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container-helper.h 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014 Canonical Ltd. + * Copyright 2014, 2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -31,6 +31,15 @@ WebappContainerHelper(QObject* parent = 0); ~WebappContainerHelper(); + /** + * Expects a CSS color string http://www.w3schools.com/css/css_colors.asp + * and returns a rr,gg,bb formatted string. + * + * If the provided string is not a valid CSS color string, an empty string + * is returned. + */ + Q_INVOKABLE QString rgbColorFromCSSColor(const QString& cssColor); + private Q_SLOTS: void browseToUrl(QObject* webview, const QUrl& url); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-container.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-container.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -45,6 +45,7 @@ property alias webContextSessionCookieMode: webappViewLoader.webContextSessionCookieMode property string localUserAgentOverride: "" property bool blockOpenExternalUrls: false + property bool openExternalUrlInOverlay: false currentWebview: webappViewLoader.item ? webappViewLoader.item.currentWebview : null @@ -81,13 +82,13 @@ accountSwitcher: root.accountSwitcher dataPath: webappDataLocation - webappName: root.webappName chromeVisible: root.chromeVisible backForwardButtonsVisible: root.backForwardButtonsVisible developerExtrasEnabled: root.developerExtrasEnabled webappModelSearchPath: root.webappModelSearchPath webappUrlPatterns: root.webappUrlPatterns blockOpenExternalUrls: root.blockOpenExternalUrls + openExternalUrlInOverlay: root.openExternalUrlInOverlay popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern @@ -217,6 +218,9 @@ function startBrowsing() { console.log("Start browsing") + // This will activate the UnityWebApp element used in WebApp.qml + webappViewLoader.item.webappName = root.webappName + // As we use StateSaver to restore the URL, we need to check first if // it has not been set previously before setting the URL to the default property // homepage. @@ -285,37 +289,28 @@ return uri } - // Handle runtime requests to open urls as defined - // by the freedesktop application dbus interface's open - // method for DBUS application activation: - // http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus - // The dispatch on the org.freedesktop.Application if is done per appId at the - // url-dispatcher/upstart level. - Connections { - target: UriHandler - onOpened: { - // only consider the first one (if multiple) - if (uris.length === 0 || !root.currentWebview) { - return; - } - var requestedUrl = uris[0].toString(); - - if (popupRedirectionUrlPrefixPattern.length !== 0 - && requestedUrl.match(popupRedirectionUrlPrefixPattern)) { - return; - } + onOpenUrls: { + // only consider the first one (if multiple) + if (urls.length === 0 || !root.currentWebview) { + return; + } + var requestedUrl = urls[0].toString(); - requestedUrl = translateHandlerUri(requestedUrl); + if (popupRedirectionUrlPrefixPattern.length !== 0 + && requestedUrl.match(popupRedirectionUrlPrefixPattern)) { + return; + } - // Add a small guard to prevent browsing to invalid urls - if (currentWebview - && currentWebview.shouldAllowNavigationTo - && !currentWebview.shouldAllowNavigationTo(requestedUrl)) { - return; - } + requestedUrl = translateHandlerUri(requestedUrl); - root.url = requestedUrl - root.currentWebview.url = requestedUrl + // Add a small guard to prevent browsing to invalid urls + if (currentWebview + && currentWebview.shouldAllowNavigationTo + && !currentWebview.shouldAllowNavigationTo(requestedUrl)) { + return; } + + root.url = requestedUrl + root.currentWebview.url = requestedUrl } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebappContainerWebview.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebappContainerWebview.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebappContainerWebview.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebappContainerWebview.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -39,8 +39,25 @@ property url webviewOverrideFile: "" property bool blockOpenExternalUrls: false property bool runningLocalApplication: false + property bool wide: false + property bool openExternalUrlInOverlay: false signal samlRequestUrlPatternReceived(string urlPattern) + signal themeColorMetaInformationDetected(string theme_color) + + onWideChanged: { + if (webappContainerWebViewLoader.item + && webappContainerWebViewLoader.item.wide !== undefined) { + webappContainerWebViewLoader.item.wide = wide + } + } + + Component { + id: mediaAccessDialogComponent + MediaAccessDialog { + objectName: "mediaAccessDialog" + } + } PopupWindowController { id: popupController @@ -48,6 +65,18 @@ webappUrlPatterns: containerWebview.webappUrlPatterns mainWebappView: containerWebview.currentWebview blockOpenExternalUrls: containerWebview.blockOpenExternalUrls + mediaAccessDialogComponent: mediaAccessDialogComponent + wide: containerWebview.wide + onInitializeOverlayViewsWithUrls: { + if (webappContainerWebViewLoader.item) { + for (var i in urls) { + webappContainerWebViewLoader + .item + .openOverlayForUrl(urls[i]) + } + } + } + } Connections { @@ -57,6 +86,13 @@ } } + Connections { + target: webappContainerWebViewLoader.item + onThemeColorMetaInformationDetected: { + themeColorMetaInformationDetected(theme_color) + } + } + Loader { id: webappContainerWebViewLoader objectName: "containerWebviewLoader" @@ -87,7 +123,10 @@ , blockOpenExternalUrls: containerWebview.blockOpenExternalUrls , runningLocalApplication: containerWebview.runningLocalApplication , popupController: popupController - , overlayViewsParent: containerWebview.parent}) + , overlayViewsParent: containerWebview.parent + , wide: containerWebview.wide + , mediaAccessDialogComponent: mediaAccessDialogComponent + , openExternalUrlInOverlay: containerWebview.openExternalUrlInOverlay}) } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebApp.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebApp.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebApp.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebApp.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -24,6 +24,7 @@ import Qt.labs.settings 1.0 import "../actions" as Actions import ".." +import "ColorUtils.js" as ColorUtils BrowserView { id: webapp @@ -44,12 +45,14 @@ property alias localUserAgentOverride: containerWebView.localUserAgentOverride property alias dataPath: containerWebView.dataPath property alias runningLocalApplication: containerWebView.runningLocalApplication + property alias openExternalUrlInOverlay: containerWebView.openExternalUrlInOverlay property string webappName: "" property bool backForwardButtonsVisible: false property bool chromeVisible: false readonly property bool chromeless: !chromeVisible && !backForwardButtonsVisible && !accountSwitcher + readonly property real themeColorTextContrastFactor: 3.0 signal chooseAccount() @@ -78,15 +81,22 @@ } function addGeneratedUrlPattern(urlPattern) { - var patterns - try { - patterns = JSON.parse(urlPatternSettings.generatedUrlPatterns) - } catch(e) { - console.error("Invalid JSON content found in url patterns file") - } - if (! (patterns instanceof Array)) { - console.error("Invalid JSON content type found in url patterns file (not an array)") - patterns = [] + if (urlPattern.trim().length === 0) { + return; + } + + var patterns = [] + if (urlPatternSettings.generatedUrlPatterns + && urlPatternSettings.generatedUrlPatterns.trim().length !== 0) { + try { + patterns = JSON.parse(urlPatternSettings.generatedUrlPatterns) + } catch(e) { + console.error("Invalid JSON content found in url patterns file") + } + if (! (patterns instanceof Array)) { + console.error("Invalid JSON content type found in url patterns file (not an array)") + patterns = [] + } } if (patterns.indexOf(urlPattern) < 0) { patterns.push(urlPattern) @@ -124,6 +134,7 @@ id: containerWebView objectName: "webview" + wide: webapp.wide anchors { left: parent.left right: parent.right @@ -132,6 +143,17 @@ height: parent.height - osk.height developerExtrasEnabled: webapp.developerExtrasEnabled + onThemeColorMetaInformationDetected: { + var color = webappContainerHelper.rgbColorFromCSSColor(theme_color) + if (!webapp.chromeless && chromeLoader.item && color.length) { + chromeLoader.item.backgroundColor = theme_color + chromeLoader.item.chromeTextLabelColor = + ColorUtils.getMostConstrastedColor( + color, + Qt.darker(theme_color, themeColorTextContrastFactor), + Qt.lighter(theme_color, themeColorTextContrastFactor)) + } + } onSamlRequestUrlPatternReceived: { addGeneratedUrlPattern(urlPattern) } @@ -237,8 +259,9 @@ ChromeController { webview: webapp.currentWebview forceHide: webapp.chromeless - defaultMode: (formFactor == "desktop") ? Oxide.LocationBarController.ModeShown - : Oxide.LocationBarController.ModeAuto + defaultMode: webapp.hasTouchScreen + ? Oxide.LocationBarController.ModeAuto + : Oxide.LocationBarController.ModeShown } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-specific-page-metadata-collector.js webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-specific-page-metadata-collector.js --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/webapp-specific-page-metadata-collector.js 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/webapp-specific-page-metadata-collector.js 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,65 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +(function() { + function detectThemeColorMetaInformation() { + var theme_color_meta = + document.head.querySelector('meta[name="theme-color"]'); + if (theme_color_meta) { + oxide.sendMessage( + 'webapp-specific-page-metadata-detected', { + type: 'theme-color', + baseurl: document.location.href, + theme_color: theme_color_meta.getAttribute('content') + }); + return true; + } + return false; + } + function detectManifestMetaInformation() { + var manifest = document.head.querySelector('link[rel="manifest"]'); + + if (manifest && manifest.getAttribute('href')) { + oxide.sendMessage( + 'webapp-specific-page-metadata-detected', { + type: 'manifest', + baseurl: document.location.href, + manifest: manifest.href + }); + return true; + } + + return false; + } + + function extractWebAppMetaInfo() { + var detectors = [detectThemeColorMetaInformation, detectManifestMetaInformation] + for (var i in detectors) { + if (detectors[i]()) { + break; + } + } + } + extractWebAppMetaInfo(); + + var MutationObserver = window.MutationObserver || window.WebKitMutationObserver; + var observer = new MutationObserver(function(mutations) { + extractWebAppMetaInfo(); + }); + observer.observe(document, {childList: true, subtree: true, attributes: true }); +})(); diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebappWebview.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebappWebview.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebappWebview.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebappWebview.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,234 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import com.canonical.Oxide 1.8 as Oxide +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.3 +import Ubuntu.Web 0.2 +import "../actions" as Actions +import ".." + +WebViewImpl { + id: webappWebview + + property bool wide: false + + signal openUrlExternallyRequested(string url) + + filePicker: filePickerLoader.item + + property QtObject contextModel: null + contextualActions: ActionList { + Actions.OpenLinkInWebBrowser { + objectName: "OpenLinkInWebBrowser" + enabled: contextModel && contextModel.linkUrl.toString() + onTriggered: openUrlExternallyRequested(contextModel.linkUrl) + } + Actions.CopyLink { + enabled: contextModel && contextModel.linkUrl.toString() + onTriggered: Clipboard.push(["text/plain", contextModel.linkUrl.toString()]) + objectName: "CopyLinkContextualAction" + } + Actions.SaveLink { + enabled: contextModel && contextModel.linkUrl.toString() + onTriggered: contextModel.saveLink() + objectName: "SaveLinkContextualAction" + } + Actions.Share { + objectName: "ShareContextualAction" + enabled: (contentHandlerLoader.status == Loader.Ready) && contextModel && + (contextModel.linkUrl.toString() || contextModel.selectionText) + onTriggered: { + if (contextModel.linkUrl.toString()) { + internal.shareLink(contextModel.linkUrl.toString(), contextModel.linkText) + } else if (contextModel.selectionText) { + internal.shareText(contextModel.selectionText) + } + } + } + Actions.CopyImage { + enabled: contextModel && + (contextModel.mediaType === Oxide.WebView.MediaTypeImage) && + contextModel.srcUrl.toString() + onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()]) + objectName: "CopyImageContextualAction" + } + Actions.SaveImage { + enabled: contextModel && + ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) || + (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)) && + contextModel.hasImageContents + onTriggered: contextModel.saveMedia() + objectName: "SaveImageContextualAction" + } + Actions.Undo { + enabled: contextModel && + contextModel.isEditable && + (contextModel.editFlags & Oxide.WebView.UndoCapability) + onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandUndo) + objectName: "UndoContextualAction" + } + Actions.Redo { + enabled: contextModel && + contextModel.isEditable && + (contextModel.editFlags & Oxide.WebView.RedoCapability) + onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandRedo) + objectName: "RedoContextualAction" + } + Actions.Cut { + enabled: contextModel && + contextModel.isEditable && + (contextModel.editFlags & Oxide.WebView.CutCapability) + onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandCut) + objectName: "CutContextualAction" + } + Actions.Copy { + enabled: contextModel && + contextModel.isEditable && + (contextModel.editFlags & Oxide.WebView.CopyCapability) + onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandCopy) + objectName: "CopyContextualAction" + } + Actions.Paste { + enabled: contextModel && + contextModel.isEditable && + (contextModel.editFlags & Oxide.WebView.PasteCapability) + onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandPaste) + objectName: "PasteContextualAction" + } + Actions.Erase { + enabled: contextModel && + contextModel.isEditable && + (contextModel.editFlags & Oxide.WebView.EraseCapability) + onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandErase) + objectName: "EraseContextualAction" + } + Actions.SelectAll { + enabled: contextModel && + contextModel.isEditable && + (contextModel.editFlags & Oxide.WebView.SelectAllCapability) + onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandSelectAll) + objectName: "SelectAllContextualAction" + } + } + function contextMenuOnCompleted(menu) { + if (!menu || !menu.contextModel) { + return + } + contextModel = menu.contextModel + + var isImageMediaType = + ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) || + (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)) + && contextModel.hasImageContents; + + if (contextModel.linkUrl.toString() || + contextModel.srcUrl.toString() || + contextModel.selectionText || + (contextModel.isEditable && contextModel.editFlags) || + isImageMediaType) { + menu.show() + } else { + contextModel.close() + } + } + Component { + id: contextMenuNarrowComponent + ContextMenuMobile { + actions: contextualActions + Component.onCompleted: webappWebview.contextMenuOnCompleted(this) + } + } + Component { + id: contextMenuWideComponent + ContextMenuWide { + associatedWebview: webappWebview + parent: webappWebview + actions: contextualActions + Component.onCompleted: webappWebview.contextMenuOnCompleted(this) + } + } + contextMenu: webappWebview.wide ? contextMenuWideComponent : contextMenuNarrowComponent + + onGeolocationPermissionRequested: { + if (__runningConfined && (request.origin == request.embedder)) { + // When running confined, querying the location service will trigger + // a system prompt (trust store), so no need for a custom one. + request.allow() + } else { + requestGeolocationPermission(request) + } + } + + Loader { + id: contentHandlerLoader + source: "../ContentHandler.qml" + asynchronous: true + } + + QtObject { + id: internal + + function instantiateShareComponent() { + var component = Qt.createComponent("../Share.qml") + if (component.status === Component.Ready) { + var share = component.createObject(webappWebview) + share.onDone.connect(share.destroy) + return share + } + return null + } + + function shareLink(url, title) { + var share = instantiateShareComponent() + if (share) share.shareLink(url, title) + } + + function shareText(text) { + var share = instantiateShareComponent() + if (share) share.shareText(text) + } + } + + onShowDownloadDialog: { + if (downloadDialogLoader.status === Loader.Ready) { + var downloadDialog = + PopupUtils.open(downloadDialogLoader.item, + webappWebview, + {"contentType" : contentType, + "downloadId" : downloadId, + "singleDownload" : downloader, + "filename" : filename, + "mimeType" : mimeType}) + downloadDialog.startDownload.connect(startDownload) + } + } + + Loader { + id: downloadDialogLoader + source: "ContentDownloadDialog.qml" + asynchronous: true + } + + Loader { + id: filePickerLoader + source: "ContentPickerDialog.qml" + asynchronous: true + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebViewImplOxide.qml webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebViewImplOxide.qml --- webbrowser-app-0.23+16.04.20151124/src/app/webcontainer/WebViewImplOxide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/webcontainer/WebViewImplOxide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -23,10 +23,9 @@ import Ubuntu.Components.Popups 1.3 import Ubuntu.UnityWebApps 0.1 as UnityWebApps import Ubuntu.Web 0.2 -import "../actions" as Actions import ".." -WebViewImpl { +WebappWebview { id: webview property bool developerExtrasEnabled: false @@ -37,6 +36,8 @@ property url dataPath property var popupController property var overlayViewsParent: webview.parent + property var mediaAccessDialogComponent + property bool openExternalUrlInOverlay: false // Mostly used for testing & avoid external urls to // "leak" in the default browser. External URLs corresponds @@ -45,6 +46,7 @@ property bool blockOpenExternalUrls: false signal samlRequestUrlPatternReceived(string urlPattern) + signal themeColorMetaInformationDetected(string theme_color) // Those signals are used for testing purposes to externally // track down the various internal logic & steps of a popup lifecycle. @@ -52,66 +54,68 @@ signal gotRedirectionUrl(string url) property bool runningLocalApplication: false + function openOverlayForUrl(overlayUrl) { + if (popupController) { + popupController.createPopupViewForUrl( + overlayViewsParent, + overlayUrl, + true, + context) + } + } + currentWebview: webview context: WebContext { dataPath: webview.dataPath userAgent: localUserAgentOverride ? localUserAgentOverride : defaultUserAgent + + userScripts: [ + Oxide.UserScript { + context: "oxide://webapp-specific-page-metadata-collector/" + url: Qt.resolvedUrl("webapp-specific-page-metadata-collector.js") + incognitoEnabled: false + matchAllFrames: false + } + ] + } + + Component.onCompleted: webappSpecificMessageHandler.createObject( + webview, + { + msgId: "webapp-specific-page-metadata-detected", + contexts: ["oxide://webapp-specific-page-metadata-collector/"], + callback: function(msg, frame) { + handlePageMetadata(msg.args) + } + }); + + Component { + id: webappSpecificMessageHandler + Oxide.ScriptMessageHandler { } } + onOpenUrlExternallyRequested: openUrlExternally(url, false) + preferences.allowFileAccessFromFileUrls: runningLocalApplication preferences.allowUniversalAccessFromFileUrls: runningLocalApplication preferences.localStorageEnabled: true preferences.appCacheEnabled: true - onNewViewRequested: popupController.createPopupView(overlayViewsParent, request, true, context) + onNewViewRequested: popupController.createPopupViewForRequest(overlayViewsParent, request, true, context) - contextualActions: ActionList { - Actions.CopyLink { - enabled: webview.contextModel && webview.contextModel.linkUrl.toString() - onTriggered: Clipboard.push(["text/plain", contextModel.linkUrl.toString()]) - } - Actions.CopyImage { - enabled: webview.contextModel && - (webview.contextModel.mediaType === Oxide.WebView.MediaTypeImage) && - webview.contextModel.srcUrl.toString() - onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()]) - } - Actions.Undo { - enabled: webview.contextModel && webview.contextModel.isEditable && - (webview.contextModel.editFlags & Oxide.WebView.UndoCapability) - onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandUndo) - } - Actions.Redo { - enabled: webview.contextModel && webview.contextModel.isEditable && - (webview.contextModel.editFlags & Oxide.WebView.RedoCapability) - onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandRedo) - } - Actions.Cut { - enabled: webview.contextModel && webview.contextModel.isEditable && - (webview.contextModel.editFlags & Oxide.WebView.CutCapability) - onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandCut) - } - Actions.Copy { - enabled: webview.contextModel && webview.contextModel.isEditable && - (webview.contextModel.editFlags & Oxide.WebView.CopyCapability) - onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandCopy) - } - Actions.Paste { - enabled: webview.contextModel && webview.contextModel.isEditable && - (webview.contextModel.editFlags & Oxide.WebView.PasteCapability) - onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandPaste) - } - Actions.Erase { - enabled: webview.contextModel && webview.contextModel.isEditable && - (webview.contextModel.editFlags & Oxide.WebView.EraseCapability) - onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandErase) - } - Actions.SelectAll { - enabled: webview.contextModel && webview.contextModel.isEditable && - (webview.contextModel.editFlags & Oxide.WebView.SelectAllCapability) - onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandSelectAll) - } + Connections { + target: webview.visible ? webview : null + + /** + * We are only connecting to the mediaAccessPermission signal if we are + * the only webview currently visible (no overlay present). In the case of an overlay + * and the absence of a signal handler in this main view, oxide's default behavior + * is triggered and the request is denied. + * + * See the browser's webbrowser/Browser.qml source for additional comments. + */ + onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request }) } StateSaver.properties: "url" @@ -123,10 +127,6 @@ samlRequestUrlPatternReceived(urlPattern) } - function shouldOpenPopupsInDefaultBrowser() { - return formFactor !== "desktop"; - } - function isRunningAsANamedWebapp() { return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0 } @@ -140,10 +140,15 @@ disposition === Oxide.NavigationRequest.DispositionNewForegroundTab; } - function openUrlExternally(url) { - webview.openExternalUrlTriggered(url) - if (! webview.blockOpenExternalUrls) { - Qt.openUrlExternally(url) + function openUrlExternally(url, isTriggeredByUserNavigation) { + if (openExternalUrlInOverlay && isTriggeredByUserNavigation) { + popupController.createPopupViewForUrl(overlayViewsParent, url, true, context) + return + } else { + webview.openExternalUrlTriggered(url) + if (! webview.blockOpenExternalUrls) { + Qt.openUrlExternally(url) + } } } @@ -175,15 +180,19 @@ var url = request.url.toString() if (runningLocalApplication && url.indexOf("file://") !== 0) { request.action = Oxide.NavigationRequest.ActionReject - openUrlExternally(url) + openUrlExternally(url, true) return } request.action = Oxide.NavigationRequest.ActionReject if (isNewForegroundWebViewDisposition(request.disposition)) { request.action = Oxide.NavigationRequest.ActionAccept - popupController.handleNewForegroundNavigationRequest(url, request, true) - return + var shouldAcceptRequest = + popupWindowController.handleNewForegroundNavigationRequest( + url, request, true); + if (shouldAcceptRequest) { + request.action = Oxide.NavigationRequest.ActionAccept + } } // Pass-through if we are not running as a named webapp (--webapp='Gmail') @@ -219,7 +228,7 @@ if (request.action === Oxide.NavigationRequest.ActionReject) { console.debug('Opening: ' + url + ' in the browser window.') - openUrlExternally(url) + openUrlExternally(url, true) } } @@ -243,14 +252,27 @@ return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers) } - onGeolocationPermissionRequested: { - if (formFactor == "desktop") { - requestGeolocationPermission(request) - } else { - // On devices where webapps are confined, trying to access the - // location service will trigger a system prompt from the trust - // store, so we don’t need a custom prompt. - request.accept() + function handlePageMetadata(metadata) { + if (metadata.type === 'manifest') { + var request = new XMLHttpRequest(); + request.onreadystatechange = function() { + if (request.readyState === XMLHttpRequest.DONE) { + try { + var manifest = JSON.parse(request.responseText); + if (manifest['theme_color'] + && manifest['theme_color'].length !== 0) { + themeColorMetaInformationDetected(manifest['theme_color']) + } + } catch(e) {} + } + } + request.open("GET", metadata.manifest); + request.send(); + } else if (metadata.type === 'theme-color') { + if (metadata['theme_color'] + && metadata['theme_color'].length !== 0) { + themeColorMetaInformationDetected(metadata['theme_color']) + } } } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/app/WebViewImpl.qml webbrowser-app-0.23+16.04.20160413/src/app/WebViewImpl.qml --- webbrowser-app-0.23+16.04.20151124/src/app/WebViewImpl.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/app/WebViewImpl.qml 2016-04-13 15:22:01.000000000 +0000 @@ -34,7 +34,8 @@ confirmDialog: ConfirmDialog {} promptDialog: PromptDialog {} beforeUnloadDialog: BeforeUnloadDialog {} - filePicker: filePickerLoader.item + + signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType) QtObject { id: internal @@ -62,9 +63,10 @@ } headers["User-Agent"] = webview.context.userAgent // Work around https://launchpad.net/bugs/1487090 by guessing the mime type - // from the suggested filename or URL if oxide hasn’t provided one. + // from the suggested filename or URL if oxide hasn’t provided one, or if + // the server has provided the generic application/octet-stream mime type. var mimeType = request.mimeType - if (!mimeType) { + if (!mimeType || mimeType == "application/octet-stream") { mimeType = MimeDatabase.filenameToMimeType(request.suggestedFilename) } if (!mimeType) { @@ -87,18 +89,16 @@ } Loader { - id: filePickerLoader - source: formFactor == "desktop" ? "FilePickerDialog.qml" : "ContentPickerDialog.qml" + id: downloadLoader + source: "Downloader.qml" asynchronous: true } - Loader { - id: downloadLoader - // TODO: Use the ubuntu download manager on desktop as well - // (https://launchpad.net/bugs/1477310). This will require to have - // ubuntu-download-manager in main (https://launchpad.net/bugs/1488425). - source: formFactor == "desktop" ? "" : "Downloader.qml" - asynchronous: true + Connections { + target: downloadLoader.item + onShowDownloadDialog: { + showDownloadDialog(downloadId, contentType, downloader, filename, mimeType) + } } function requestGeolocationPermission(request) { diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,7 +18,7 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 -import Ubuntu.Components.ListItems 1.3 as ListItem +import Ubuntu.Components.ListItems 1.3 as ListItems import Ubuntu.Components.Popups 1.3 Popover { @@ -38,8 +38,10 @@ model: selectorModel.items - delegate: ListItem.Standard { - text: model.text + delegate: ListItem { + ListItemLayout { + title.text: model.text + } enabled: model.enabled selected: model.selected onClicked: { @@ -49,7 +51,7 @@ } section.property: "group" - section.delegate: ListItem.Header { + section.delegate: ListItems.Header { text: section } diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/plugin.cpp webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/plugin.cpp --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/plugin.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/plugin.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -27,7 +27,10 @@ #include #include #include +#include #include +#include +#include #include #include @@ -37,7 +40,7 @@ Q_PROPERTY(QString cacheLocation READ cacheLocation NOTIFY cacheLocationChanged) Q_PROPERTY(QString dataLocation READ dataLocation NOTIFY dataLocationChanged) - Q_PROPERTY(QString formFactor READ formFactor CONSTANT) + Q_PROPERTY(qreal screenDiagonal READ screenDiagonal NOTIFY screenDiagonalChanged) Q_PROPERTY(int cacheSizeHint READ cacheSizeHint NOTIFY cacheSizeHintChanged) Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT) Q_PROPERTY(int webviewDevtoolsDebugPort READ devtoolsPort CONSTANT) @@ -48,7 +51,7 @@ QString cacheLocation() const; QString dataLocation() const; - QString formFactor(); + qreal screenDiagonal() const; int cacheSizeHint() const; QString devtoolsHost(); int devtoolsPort(); @@ -57,10 +60,15 @@ Q_SIGNALS: void cacheLocationChanged() const; void dataLocationChanged() const; + void screenDiagonalChanged() const; void cacheSizeHintChanged() const; +private Q_SLOTS: + void onFocusWindowChanged(QWindow* window); + void updateScreen(); + private: - QString m_formFactor; + qreal m_screenDiagonal; // in millimeters QString m_devtoolsHost; int m_devtoolsPort; QStringList m_hostMappingRules; @@ -69,15 +77,31 @@ UbuntuWebPluginContext::UbuntuWebPluginContext(QObject* parent) : QObject(parent) + , m_screenDiagonal(0) , m_devtoolsPort(-2) , m_hostMappingRulesQueried(false) { - connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), - this, SIGNAL(cacheLocationChanged())); - connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), - this, SIGNAL(dataLocationChanged())); - connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), - this, SIGNAL(cacheSizeHintChanged())); + connect(qApp, SIGNAL(applicationNameChanged()), SIGNAL(cacheLocationChanged())); + connect(qApp, SIGNAL(applicationNameChanged()), SIGNAL(dataLocationChanged())); + connect(qApp, SIGNAL(applicationNameChanged()), SIGNAL(cacheSizeHintChanged())); + updateScreen(); + connect(qApp, SIGNAL(focusWindowChanged(QWindow*)), SLOT(onFocusWindowChanged(QWindow*))); +} + +void UbuntuWebPluginContext::updateScreen() +{ + QWindow* window = qApp->focusWindow(); + if (window) { + QScreen* screen = window->screen(); + if (screen) { + QSizeF size = screen->physicalSize(); + qreal diagonal = qSqrt(size.width() * size.width() + size.height() * size.height()); + if (diagonal != m_screenDiagonal) { + m_screenDiagonal = diagonal; + Q_EMIT screenDiagonalChanged(); + } + } + } } QString UbuntuWebPluginContext::cacheLocation() const @@ -102,38 +126,9 @@ return location.absolutePath(); } -QString UbuntuWebPluginContext::formFactor() +qreal UbuntuWebPluginContext::screenDiagonal() const { - if (m_formFactor.isEmpty()) { - // This implementation only considers two possible form factors: desktop, - // and mobile (which includes phones and tablets). - // XXX: do we need to consider other form factors, such as tablet? - const char* DESKTOP = "desktop"; - const char* MOBILE = "mobile"; - - // The "DESKTOP_MODE" environment variable can be used to force the form - // factor to desktop, when set to any valid value other than 0. - const char* DESKTOP_MODE_ENV_VAR = "DESKTOP_MODE"; - if (qEnvironmentVariableIsSet(DESKTOP_MODE_ENV_VAR)) { - QByteArray stringValue = qgetenv(DESKTOP_MODE_ENV_VAR); - bool ok = false; - int value = stringValue.toInt(&ok); - if (ok) { - m_formFactor = (value == 0) ? MOBILE : DESKTOP; - return m_formFactor; - } - } - - // XXX: Assume that QtUbuntu means mobile, which is currently the case, - // but may not remain true forever. - QString platform = QGuiApplication::platformName(); - if ((platform == "ubuntu") || (platform == "ubuntumirclient")) { - m_formFactor = MOBILE; - } else { - m_formFactor = DESKTOP; - } - } - return m_formFactor; + return m_screenDiagonal; } int UbuntuWebPluginContext::cacheSizeHint() const @@ -210,6 +205,14 @@ return m_devtoolsPort; } +void UbuntuWebPluginContext::onFocusWindowChanged(QWindow* window) +{ + updateScreen(); + if (window) { + connect(window, SIGNAL(screenChanged(QScreen*)), SLOT(updateScreen())); + } +} + void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri) { Q_UNUSED(uri); diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/ua-overrides-desktop.js webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/ua-overrides-desktop.js --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/ua-overrides-desktop.js 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/ua-overrides-desktop.js 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -22,5 +22,6 @@ ["^https?:\/\/(www\.)?google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/35.0.1870.2 Chrome/35.0.1870.2 Safari/537.36"], ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1284158 ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1412880 - ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/35.0.1870.2 Safari/537.36"], // http://pad.lv/1503506 + ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649 + ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/47.0.2526.106 Safari/537.36"], // http://pad.lv/1452616 ]; diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml 2016-04-13 15:22:01.000000000 +0000 @@ -20,6 +20,8 @@ import com.canonical.Oxide 1.9 as Oxide Oxide.WebContext { + id: oxideContext + readonly property string defaultUserAgent: __ua.defaultUA dataPath: dataLocation @@ -67,26 +69,34 @@ } ] - property QtObject __ua: UserAgent02 {} + property QtObject __ua: UserAgent02 { + onSmallScreenChanged: reloadOverrides() + Component.onCompleted: reloadOverrides() + + property string _target: "" + + function reloadOverrides() { + var target = smallScreen ? "mobile" : "desktop" + if (target == _target) return + _target = target + var script = "ua-overrides-%1.js".arg(target) + var temp = null + try { + temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), oxideContext) + } catch (e) { + console.error("No overrides found for", target) + } + if (temp !== null) { + console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script))) + userAgentOverrides = temp.overrides + temp.destroy() + } + } + } devtoolsEnabled: webviewDevtoolsDebugPort !== -1 devtoolsPort: webviewDevtoolsDebugPort devtoolsIp: webviewDevtoolsDebugHost hostMappingRules: webviewHostMappingRules - - Component.onCompleted: { - var script = "ua-overrides-%1.js".arg(formFactor) - var temp = null - try { - temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), this) - } catch (e) { - console.error("No overrides found for", formFactor) - } - if (temp !== null) { - console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script))) - userAgentOverrides = temp.overrides - temp.destroy() - } - } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,7 +18,7 @@ import QtQuick 2.4 import QtQuick.Window 2.2 -import com.canonical.Oxide 1.9 as Oxide +import com.canonical.Oxide 1.12 as Oxide import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 import "." // QTBUG-34418 @@ -51,7 +51,7 @@ navigationRequestedDelegate(request); } - preferences.passwordEchoEnabled: formFactor === "mobile" + preferences.passwordEchoEnabled: Qt.inputMethod.visible popupMenu: ItemSelector02 { automaticOrientation: false @@ -83,6 +83,14 @@ objectName: "contextMenu" actions: contextualActions caller: contextualRectangle + + // Override default implementation to prevent context menu from stealing + // active focus when shown (https://launchpad.net/bugs/1526884). + function show() { + visible = true + __foreground.show() + } + Component.onCompleted: { internal.dismissCurrentContextualMenu() internal.contextModel = model @@ -112,6 +120,15 @@ internal.dismissCurrentContextualMenu() } } + + Binding { + // Ensure the context menu doesn’t steal focus from + // the webview when one of its actions is activated + // (https://launchpad.net/bugs/1526884). + target: __foreground + property: "activeFocusOnPress" + value: false + } } readonly property QtObject contextModel: internal.contextModel @@ -121,6 +138,106 @@ console.warn("WARNING: the copy() function is deprecated and does nothing.") } + touchSelectionController.handle: Image { + objectName: "touchSelectionHandle" + readonly property int handleOrientation: orientation + width: units.gu(1.5) + height: units.gu(1.5) + source: "handle.png" + Component.onCompleted: horizontalPaddingRatio = 0.5 + } + + UbuntuShape { + objectName: "touchSelectionActions" + // FIXME: hide contextual actions while resizing the + // selection (needs an additional API in oxide?) + visible: _webview.activeFocus && _webview.touchSelectionController.active && !selectionOutOfSight + aspect: UbuntuShape.DropShadow + backgroundColor: "white" + readonly property int padding: units.gu(1) + width: touchSelectionActionsRow.width + padding * 2 + height: childrenRect.height + padding * 2 + + readonly property rect bounds: _webview.touchSelectionController.bounds + readonly property bool selectionOutOfSight: (bounds.x > _webview.width) || ((bounds.x + bounds.width) < 0) || (bounds.y > _webview.height) || ((bounds.y + bounds.height) < 0) + readonly property real handleHeight: units.gu(1.5) + readonly property real spacing: units.gu(1) + readonly property bool fitsBelow: (bounds.y + bounds.height + handleHeight + spacing + height) <= _webview.height + readonly property bool fitsAbove: (bounds.y - spacing - height) >= (_webview.locationBarController.height + _webview.locationBarController.offset) + readonly property real xCentered: bounds.x + (bounds.width - width) / 2 + x: ((xCentered >= 0) && ((xCentered + width) <= _webview.width)) + ? xCentered : (xCentered < 0) ? 0 : _webview.width - width + y: fitsBelow ? (bounds.y + bounds.height + handleHeight + spacing) + : fitsAbove ? (bounds.y - spacing - height) + : (_webview.height + _webview.locationBarController.height + _webview.locationBarController.offset - height) / 2 + + ActionList { + id: touchSelectionActions + Action { + name: "selectall" + text: i18n.dtr('ubuntu-ui-toolkit', "Select All") + iconName: "edit-select-all" + enabled: _webview.editingCapabilities & Oxide.WebView.SelectAllCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandSelectAll) + } + Action { + name: "cut" + text: i18n.dtr('ubuntu-ui-toolkit', "Cut") + iconName: "edit-cut" + enabled: _webview.editingCapabilities & Oxide.WebView.CutCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandCut) + } + Action { + name: "copy" + text: i18n.dtr('ubuntu-ui-toolkit', "Copy") + iconName: "edit-copy" + enabled: _webview.editingCapabilities & Oxide.WebView.CopyCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandCopy) + } + Action { + name: "paste" + text: i18n.dtr('ubuntu-ui-toolkit', "Paste") + iconName: "edit-paste" + enabled: _webview.editingCapabilities & Oxide.WebView.PasteCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandPaste) + } + } + + Row { + id: touchSelectionActionsRow + x: parent.padding + y: parent.padding + width: { + // work around what seems to be a bug in Row’s childrenRect.width + var w = 0 + for (var i in visibleChildren) { + w += visibleChildren[i].width + } + return w + } + height: units.gu(6) + + Repeater { + model: touchSelectionActions.actions.length + AbstractButton { + objectName: "touchSelectionAction_" + action.name + anchors { + top: parent.top + bottom: parent.bottom + } + width: Math.max(units.gu(5), implicitWidth) + units.gu(2) + action: touchSelectionActions.actions[modelData] + styleName: "ToolbarButtonStyle" + activeFocusOnPress: false + } + } + } + } + QtObject { id: internal property int lastLoadRequestStatus: -1 diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/UserAgent02.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/UserAgent02.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Components/Extras/Browser/UserAgent02.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Components/Extras/Browser/UserAgent02.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -28,6 +28,10 @@ */ QtObject { + // Empirical value: screens smaller than 19cm are considered small enough that a + // mobile UA string is used, screens bigger than that will get desktop content. + readonly property bool smallScreen: screenDiagonal < 190 + // %1: Ubuntu version, e.g. "14.04" // %2: optional token to specify further attributes of the platform, e.g. "like Android" // %3: optional hardware ID token @@ -35,7 +39,7 @@ // %5: Chromium version, e.g. "35.0.1870.2" // %6: Optional token to provide additional free-form information, e.g. "Mobile" // %7: Safari version, e.g. "537.36" - // %8: Optional token, in case some extra bits are needed to make things work (e.g. an extra formfactor info etc.) + // %8: Optional token, in case some extra bits are needed to make things work (e.g. an extra form factor info etc.) // // note #1: "Mozilla/5.0" is misinformation, but it is a legacy token that // virtually every single UA out there has, it seems unwise to remove it @@ -46,7 +50,7 @@ // FIXME: compute at build time (using lsb_release) readonly property string _ubuntuVersion: "14.04" - readonly property string _attributes: (formFactor === "mobile") ? "like Android 4.4" : "" + readonly property string _attributes: smallScreen ? "like Android 4.4" : "" readonly property string _hardwareID: "" @@ -59,7 +63,7 @@ // every time we rebase on a newer chromium. readonly property string _chromiumVersion: "35.0.1870.2" - readonly property string _formFactor: (formFactor === "mobile") ? "Mobile" : "" + readonly property string _formFactor: smallScreen ? "Mobile" : "" readonly property string _more: "" diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -17,17 +17,17 @@ Qt5::Qml ) -file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir *.js) +file(GLOB PLUGIN_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir *.js *.png) install(TARGETS ${PLUGIN} DESTINATION ${UBUNTU_WEB_IMPORTS_DIR}) -install(FILES ${QML_FILES} DESTINATION ${UBUNTU_WEB_IMPORTS_DIR}) +install(FILES ${PLUGIN_FILES} DESTINATION ${UBUNTU_WEB_IMPORTS_DIR}) if(NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) # copy qml files over to build dir to be able to import them uninstalled - foreach(_file ${QML_FILES}) + foreach(_file ${PLUGIN_FILES}) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}) endforeach(_file) - add_custom_target(copy_files_to_build_dir DEPENDS ${QML_FILES}) + add_custom_target(copy_files_to_build_dir DEPENDS ${PLUGIN_FILES}) add_dependencies(${PLUGIN} copy_files_to_build_dir) endif() Binary files /tmp/tmpeTICod/CCc7Osmu6L/webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/handle@27.png and /tmp/tmpeTICod/dpPWbtEBof/webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/handle@27.png differ diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/ItemSelector02.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/ItemSelector02.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/ItemSelector02.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/ItemSelector02.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,7 +18,7 @@ import QtQuick 2.4 import Ubuntu.Components 1.3 -import Ubuntu.Components.ListItems 1.3 as ListItem +import Ubuntu.Components.ListItems 1.3 as ListItems import Ubuntu.Components.Popups 1.3 Popover { @@ -38,8 +38,10 @@ model: selectorModel.items - delegate: ListItem.Standard { - text: model.text + delegate: ListItem { + ListItemLayout { + title.text: model.text + } enabled: model.enabled selected: model.selected onClicked: { @@ -49,7 +51,7 @@ } section.property: "group" - section.delegate: ListItem.Header { + section.delegate: ListItems.Header { text: section } diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/plugin.cpp webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/plugin.cpp --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/plugin.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/plugin.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -27,7 +27,10 @@ #include #include #include +#include #include +#include +#include #include #include @@ -37,7 +40,7 @@ Q_PROPERTY(QString cacheLocation READ cacheLocation NOTIFY cacheLocationChanged) Q_PROPERTY(QString dataLocation READ dataLocation NOTIFY dataLocationChanged) - Q_PROPERTY(QString formFactor READ formFactor CONSTANT) + Q_PROPERTY(qreal screenDiagonal READ screenDiagonal NOTIFY screenDiagonalChanged) Q_PROPERTY(int cacheSizeHint READ cacheSizeHint NOTIFY cacheSizeHintChanged) Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT) Q_PROPERTY(int webviewDevtoolsDebugPort READ devtoolsPort CONSTANT) @@ -48,7 +51,7 @@ QString cacheLocation() const; QString dataLocation() const; - QString formFactor(); + qreal screenDiagonal() const; int cacheSizeHint() const; QString devtoolsHost(); int devtoolsPort(); @@ -57,10 +60,15 @@ Q_SIGNALS: void cacheLocationChanged() const; void dataLocationChanged() const; + void screenDiagonalChanged() const; void cacheSizeHintChanged() const; +private Q_SLOTS: + void onFocusWindowChanged(QWindow* window); + void updateScreen(); + private: - QString m_formFactor; + qreal m_screenDiagonal; // in millimeters QString m_devtoolsHost; int m_devtoolsPort; QStringList m_hostMappingRules; @@ -69,15 +77,31 @@ UbuntuWebPluginContext::UbuntuWebPluginContext(QObject* parent) : QObject(parent) + , m_screenDiagonal(0) , m_devtoolsPort(-2) , m_hostMappingRulesQueried(false) { - connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), - this, SIGNAL(cacheLocationChanged())); - connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), - this, SIGNAL(dataLocationChanged())); - connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), - this, SIGNAL(cacheSizeHintChanged())); + connect(qApp, SIGNAL(applicationNameChanged()), SIGNAL(cacheLocationChanged())); + connect(qApp, SIGNAL(applicationNameChanged()), SIGNAL(dataLocationChanged())); + connect(qApp, SIGNAL(applicationNameChanged()), SIGNAL(cacheSizeHintChanged())); + updateScreen(); + connect(qApp, SIGNAL(focusWindowChanged(QWindow*)), SLOT(onFocusWindowChanged(QWindow*))); +} + +void UbuntuWebPluginContext::updateScreen() +{ + QWindow* window = qApp->focusWindow(); + if (window) { + QScreen* screen = window->screen(); + if (screen) { + QSizeF size = screen->physicalSize(); + qreal diagonal = qSqrt(size.width() * size.width() + size.height() * size.height()); + if (diagonal != m_screenDiagonal) { + m_screenDiagonal = diagonal; + Q_EMIT screenDiagonalChanged(); + } + } + } } QString UbuntuWebPluginContext::cacheLocation() const @@ -102,38 +126,9 @@ return location.absolutePath(); } -QString UbuntuWebPluginContext::formFactor() +qreal UbuntuWebPluginContext::screenDiagonal() const { - if (m_formFactor.isEmpty()) { - // This implementation only considers two possible form factors: desktop, - // and mobile (which includes phones and tablets). - // XXX: do we need to consider other form factors, such as tablet? - const char* DESKTOP = "desktop"; - const char* MOBILE = "mobile"; - - // The "DESKTOP_MODE" environment variable can be used to force the form - // factor to desktop, when set to any valid value other than 0. - const char* DESKTOP_MODE_ENV_VAR = "DESKTOP_MODE"; - if (qEnvironmentVariableIsSet(DESKTOP_MODE_ENV_VAR)) { - QByteArray stringValue = qgetenv(DESKTOP_MODE_ENV_VAR); - bool ok = false; - int value = stringValue.toInt(&ok); - if (ok) { - m_formFactor = (value == 0) ? MOBILE : DESKTOP; - return m_formFactor; - } - } - - // XXX: Assume that QtUbuntu means mobile, which is currently the case, - // but may not remain true forever. - QString platform = QGuiApplication::platformName(); - if ((platform == "ubuntu") || (platform == "ubuntumirclient")) { - m_formFactor = MOBILE; - } else { - m_formFactor = DESKTOP; - } - } - return m_formFactor; + return m_screenDiagonal; } int UbuntuWebPluginContext::cacheSizeHint() const @@ -210,6 +205,14 @@ return m_devtoolsPort; } +void UbuntuWebPluginContext::onFocusWindowChanged(QWindow* window) +{ + updateScreen(); + if (window) { + connect(window, SIGNAL(screenChanged(QScreen*)), SLOT(updateScreen())); + } +} + void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri) { Q_UNUSED(uri); diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/ua-overrides-desktop.js webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/ua-overrides-desktop.js --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/ua-overrides-desktop.js 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/ua-overrides-desktop.js 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -22,5 +22,6 @@ ["^https?:\/\/(www\.)?google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/35.0.1870.2 Chrome/35.0.1870.2 Safari/537.36"], ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1284158 ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1412880 - ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/35.0.1870.2 Safari/537.36"], // http://pad.lv/1503506 + ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649 + ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/47.0.2526.106 Safari/537.36"], // http://pad.lv/1452616 ]; diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/UbuntuWebContext.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/UbuntuWebContext.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/UbuntuWebContext.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/UbuntuWebContext.qml 2016-04-13 15:22:01.000000000 +0000 @@ -20,6 +20,8 @@ import com.canonical.Oxide 1.9 as Oxide Oxide.WebContext { + id: oxideContext + readonly property string defaultUserAgent: __ua.defaultUA dataPath: dataLocation @@ -67,26 +69,34 @@ } ] - property QtObject __ua: UserAgent02 {} + property QtObject __ua: UserAgent02 { + onSmallScreenChanged: reloadOverrides() + Component.onCompleted: reloadOverrides() + + property string _target: "" + + function reloadOverrides() { + var target = smallScreen ? "mobile" : "desktop" + if (target == _target) return + _target = target + var script = "ua-overrides-%1.js".arg(target) + var temp = null + try { + temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), oxideContext) + } catch (e) { + console.error("No overrides found for", target) + } + if (temp !== null) { + console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script))) + userAgentOverrides = temp.overrides + temp.destroy() + } + } + } devtoolsEnabled: webviewDevtoolsDebugPort !== -1 devtoolsPort: webviewDevtoolsDebugPort devtoolsIp: webviewDevtoolsDebugHost hostMappingRules: webviewHostMappingRules - - Component.onCompleted: { - var script = "ua-overrides-%1.js".arg(formFactor) - var temp = null - try { - temp = Qt.createQmlObject('import QtQml 2.0; import "%1" as Overrides; QtObject { readonly property var overrides: Overrides.overrides }'.arg(script), this) - } catch (e) { - console.error("No overrides found for", formFactor) - } - if (temp !== null) { - console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script))) - userAgentOverrides = temp.overrides - temp.destroy() - } - } } diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/UbuntuWebView02.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/UbuntuWebView02.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/UbuntuWebView02.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/UbuntuWebView02.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,7 +18,7 @@ import QtQuick 2.4 import QtQuick.Window 2.2 -import com.canonical.Oxide 1.9 as Oxide +import com.canonical.Oxide 1.12 as Oxide import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 import "." // QTBUG-34418 @@ -51,7 +51,7 @@ navigationRequestedDelegate(request); } - preferences.passwordEchoEnabled: formFactor === "mobile" + preferences.passwordEchoEnabled: Qt.inputMethod.visible popupMenu: ItemSelector02 { automaticOrientation: false @@ -83,6 +83,14 @@ objectName: "contextMenu" actions: contextualActions caller: contextualRectangle + + // Override default implementation to prevent context menu from stealing + // active focus when shown (https://launchpad.net/bugs/1526884). + function show() { + visible = true + __foreground.show() + } + Component.onCompleted: { internal.dismissCurrentContextualMenu() internal.contextModel = model @@ -112,6 +120,15 @@ internal.dismissCurrentContextualMenu() } } + + Binding { + // Ensure the context menu doesn’t steal focus from + // the webview when one of its actions is activated + // (https://launchpad.net/bugs/1526884). + target: __foreground + property: "activeFocusOnPress" + value: false + } } readonly property QtObject contextModel: internal.contextModel @@ -121,6 +138,106 @@ console.warn("WARNING: the copy() function is deprecated and does nothing.") } + touchSelectionController.handle: Image { + objectName: "touchSelectionHandle" + readonly property int handleOrientation: orientation + width: units.gu(1.5) + height: units.gu(1.5) + source: "handle.png" + Component.onCompleted: horizontalPaddingRatio = 0.5 + } + + UbuntuShape { + objectName: "touchSelectionActions" + // FIXME: hide contextual actions while resizing the + // selection (needs an additional API in oxide?) + visible: _webview.activeFocus && _webview.touchSelectionController.active && !selectionOutOfSight + aspect: UbuntuShape.DropShadow + backgroundColor: "white" + readonly property int padding: units.gu(1) + width: touchSelectionActionsRow.width + padding * 2 + height: childrenRect.height + padding * 2 + + readonly property rect bounds: _webview.touchSelectionController.bounds + readonly property bool selectionOutOfSight: (bounds.x > _webview.width) || ((bounds.x + bounds.width) < 0) || (bounds.y > _webview.height) || ((bounds.y + bounds.height) < 0) + readonly property real handleHeight: units.gu(1.5) + readonly property real spacing: units.gu(1) + readonly property bool fitsBelow: (bounds.y + bounds.height + handleHeight + spacing + height) <= _webview.height + readonly property bool fitsAbove: (bounds.y - spacing - height) >= (_webview.locationBarController.height + _webview.locationBarController.offset) + readonly property real xCentered: bounds.x + (bounds.width - width) / 2 + x: ((xCentered >= 0) && ((xCentered + width) <= _webview.width)) + ? xCentered : (xCentered < 0) ? 0 : _webview.width - width + y: fitsBelow ? (bounds.y + bounds.height + handleHeight + spacing) + : fitsAbove ? (bounds.y - spacing - height) + : (_webview.height + _webview.locationBarController.height + _webview.locationBarController.offset - height) / 2 + + ActionList { + id: touchSelectionActions + Action { + name: "selectall" + text: i18n.dtr('ubuntu-ui-toolkit', "Select All") + iconName: "edit-select-all" + enabled: _webview.editingCapabilities & Oxide.WebView.SelectAllCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandSelectAll) + } + Action { + name: "cut" + text: i18n.dtr('ubuntu-ui-toolkit', "Cut") + iconName: "edit-cut" + enabled: _webview.editingCapabilities & Oxide.WebView.CutCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandCut) + } + Action { + name: "copy" + text: i18n.dtr('ubuntu-ui-toolkit', "Copy") + iconName: "edit-copy" + enabled: _webview.editingCapabilities & Oxide.WebView.CopyCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandCopy) + } + Action { + name: "paste" + text: i18n.dtr('ubuntu-ui-toolkit', "Paste") + iconName: "edit-paste" + enabled: _webview.editingCapabilities & Oxide.WebView.PasteCapability + visible: enabled + onTriggered: _webview.executeEditingCommand(Oxide.WebView.EditingCommandPaste) + } + } + + Row { + id: touchSelectionActionsRow + x: parent.padding + y: parent.padding + width: { + // work around what seems to be a bug in Row’s childrenRect.width + var w = 0 + for (var i in visibleChildren) { + w += visibleChildren[i].width + } + return w + } + height: units.gu(6) + + Repeater { + model: touchSelectionActions.actions.length + AbstractButton { + objectName: "touchSelectionAction_" + action.name + anchors { + top: parent.top + bottom: parent.bottom + } + width: Math.max(units.gu(5), implicitWidth) + units.gu(2) + action: touchSelectionActions.actions[modelData] + styleName: "ToolbarButtonStyle" + activeFocusOnPress: false + } + } + } + } + QtObject { id: internal property int lastLoadRequestStatus: -1 diff -Nru webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/UserAgent02.qml webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/UserAgent02.qml --- webbrowser-app-0.23+16.04.20151124/src/Ubuntu/Web/UserAgent02.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/src/Ubuntu/Web/UserAgent02.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -28,6 +28,10 @@ */ QtObject { + // Empirical value: screens smaller than 19cm are considered small enough that a + // mobile UA string is used, screens bigger than that will get desktop content. + readonly property bool smallScreen: screenDiagonal < 190 + // %1: Ubuntu version, e.g. "14.04" // %2: optional token to specify further attributes of the platform, e.g. "like Android" // %3: optional hardware ID token @@ -35,7 +39,7 @@ // %5: Chromium version, e.g. "35.0.1870.2" // %6: Optional token to provide additional free-form information, e.g. "Mobile" // %7: Safari version, e.g. "537.36" - // %8: Optional token, in case some extra bits are needed to make things work (e.g. an extra formfactor info etc.) + // %8: Optional token, in case some extra bits are needed to make things work (e.g. an extra form factor info etc.) // // note #1: "Mozilla/5.0" is misinformation, but it is a legacy token that // virtually every single UA out there has, it seems unwise to remove it @@ -46,7 +50,7 @@ // FIXME: compute at build time (using lsb_release) readonly property string _ubuntuVersion: "14.04" - readonly property string _attributes: (formFactor === "mobile") ? "like Android 4.4" : "" + readonly property string _attributes: smallScreen ? "like Android 4.4" : "" readonly property string _hardwareID: "" @@ -59,7 +63,7 @@ // every time we rebase on a newer chromium. readonly property string _chromiumVersion: "35.0.1870.2" - readonly property string _formFactor: (formFactor === "mobile") ? "Mobile" : "" + readonly property string _formFactor: smallScreen ? "Mobile" : "" readonly property string _more: "" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/fake_servers.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/fake_servers.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/fake_servers.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/fake_servers.py 2016-04-13 15:22:01.000000000 +0000 @@ -18,6 +18,7 @@ import http.server as http import logging import threading +import urllib class RequestHandler(http.BaseHTTPRequestHandler): @@ -66,7 +67,7 @@ """ - def targetted_click_content(self): + def external_href_with_link_content(self, path="open-close-content"): return """ @@ -74,14 +75,14 @@
- +
- """ + """.format(path) def display_ua_content(self): return """ @@ -117,6 +118,85 @@ """.format(loopcount) + def media_access(self): + return """ + + +open-close + + + + + + +
+ +
+ + + """ + + def manifest_json_content(self): + return """ +{ + "name": "Theme Color", + "short_name": "Theme Color", + "icons": [], + "theme_color": "#FF0000" +} """ + + def theme_color_content(self, + color, + with_manifest=False, + delayed_color_update=''): + color_content = '' + if color: + color_content = """ + +""".format(color) + + manifest_content = '' + if with_manifest: + manifest_content = "" + + delayed_color_code = '' + if len(delayed_color_update) != 0: + delayed_color_code = """ +setTimeout(function() { + var e=document.head.querySelector('meta[name="theme-color"]'); + e.content = '%s'; +}, 2000)""" % delayed_color_update + + return """ + + +{} +{} + + +theme-color + + + + + """.format(color_content, manifest_content, delayed_color_code) + def open_close_content(self): return """ @@ -138,6 +218,11 @@ """ + base64_png_data = \ + "iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAACXBIWXMAAAsTAAALEwE" \ + "AmpwYAAAAOUlEQVRYw+3OAQ0AAAgDoGv/zlpDN0hATS7qaGlpaWlpaWlpaWlpaWlpaW" \ + "lpaWlpaWlpaWlpab1qLUGqAWNyFWTYAAAAAElFTkSuQmCC" + def do_GET(self): if self.path == '/': self.send_response(200) @@ -151,15 +236,58 @@ elif self.path == '/with-external-link': self.send_response(200) self.serve_content(self.external_click_content()) + elif self.path == "/image": + self.send_response(200) + html = '' + html += '' + html += '' + self.serve_content(html) + elif self.path == "/imagelink": + self.send_response(200) + html = '' + html += '' + html += '' + self.serve_content(html) + elif self.path == "/textarea": + self.send_response(200) + html = '' + html += '' + self.serve_content(html) elif self.path == '/with-targetted-link': self.send_response(200) - self.serve_content(self.targetted_click_content()) + self.serve_content(self.external_href_with_link_content()) elif self.path == '/show-user-agent': self.send_response(200) self.serve_content(self.display_ua_content()) elif self.path == '/open-close-content': self.send_response(200) self.serve_content(self.open_close_content()) + elif self.path == '/theme-color/manifest.json': + self.send_response(200) + self.serve_content(self.manifest_json_content()) + elif self.path.startswith('/theme-color/'): + q = urllib.parse.parse_qs( + urllib.parse.urlparse( + self.path).query) + self.send_response(200) + color = '' + if 'color' in q: + color = q['color'][0] + color_update = '' + if 'delaycolorupdate' in q: + color_update = q['delaycolorupdate'][0] + with_manifest = False + if 'manifest' in q and q['manifest'][0] == 'true': + with_manifest = True + self.send_response(200) + self.serve_content( + self.theme_color_content( + color, with_manifest, color_update)) elif self.path.startswith('/saml/'): args = self.path[len('/saml/'):] loopCount = 0 @@ -181,6 +309,14 @@ self.send_response(302) self.send_header("Location", locationTarget) self.end_headers() + elif self.path == '/media-access': + self.send_response(200) + self.serve_content(self.media_access()) + elif self.path.startswith('/with-overlay-link'): + qs = urllib.parse.parse_qs(urllib.parse.urlparse(self.path).query) + self.send_response(200) + self.serve_content( + self.external_href_with_link_content(qs['path'][0])) else: self.send_error(404) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/__init__.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/__init__.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/__init__.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/__init__.py 2016-04-13 15:22:01.000000000 +0000 @@ -122,6 +122,10 @@ webview.url = url self.assert_page_eventually_loaded(url) + def kill_app(self, signal=signal.SIGKILL): + os.kill(self.app.pid, signal) + self.app.process.wait() + def kill_web_processes(self, signal=signal.SIGKILL): children = psutil.Process(self.app.pid).children(True) for child in children: diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_context_menu.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_context_menu.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_context_menu.py 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_context_menu.py 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,339 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- +# +# Copyright 2015-2016 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import time + +from autopilot.platform import model +from autopilot.matchers import Eventually +import testtools +from testtools.matchers import Equals, GreaterThan, StartsWith + +from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase + +import ubuntuuitoolkit as uitk + + +class ContextMenuBase(uitk.UbuntuUIToolkitCustomProxyObjectBase): + def get_title_label(self): + return self.select_single(objectName="titleLabel") + + def get_visible_actions(self): + return self.select_many("Empty", visible=True) + + def get_action(self, objectName): + name = objectName + "_item" + return self.select_single("Empty", objectName=name) + + def click_action(self, objectName): + name = objectName + "_item" + action = self.select_single("Empty", visible=True, + enabled=True, objectName=name) + self.pointing_device.click_object(action) + self.wait_until_destroyed() + + +class ContextMenuWide(ContextMenuBase): + pass + + +class ContextMenuMobile(ContextMenuBase): + def click_cancel_action(self): + action = self.select_single("Empty", objectName="cancelAction") + self.pointing_device.click_object(action) + + +class TestContextMenuBase(WebappContainerTestCaseWithLocalContentBase): + data_uri_prefix = "data:image/png;base64," + + def _get_context_menu(self): + if self.get_webcontainer_webview().wide: + return self.app.wait_select_single( + ContextMenuWide, + objectName="contextMenuWide") + else: + return self.app.wait_select_single( + ContextMenuMobile, + objectName="contextMenuMobile") + + def _open_context_menu(self, webview): + gr = webview.globalRect + x = gr.x + webview.width // 2 + y = gr.y + webview.height // 2 + self.pointing_device.move(x, y) + if model() == 'Desktop': + self.pointing_device.click(button=3) + else: + self.pointing_device.press() + time.sleep(1.5) + self.pointing_device.release() + return self._get_context_menu() + + def _dismiss_context_menu(self, menu): + if self.get_webcontainer_webview().wide: + # Dismiss by clicking outside of the menu + webview_rect = self.get_webview().globalRect + actions = menu.get_visible_actions() + outside_x = (webview_rect.x + actions[0].globalRect.x) // 2 + outside_y = webview_rect.y + webview_rect.height // 2 + self.pointing_device.move(outside_x, outside_y) + self.pointing_device.click() + else: + # Dismiss by clicking the cancel action + menu.click_cancel_action() + menu.wait_until_destroyed() + + def _click_window_open(self): + webview = self.get_oxide_webview() + gr = webview.globalRect + self.pointing_device.move( + gr.x + webview.width*3/4, + gr.y + webview.height*3/4) + self.pointing_device.click() + + def _launch_application(self, path): + args = [] + self.launch_webcontainer_app_with_local_http_server( + args, + path, + {'WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY': '1'}) + self.get_webcontainer_window().visible.wait_for(True) + + def _setup_overlay_webview_context_menu(self, path): + overlay_path = "/with-overlay-link?path={}".format(path) + self._launch_application(overlay_path) + + popup_controller = self.get_popup_controller() + animation_watcher = popup_controller.watch_signal( + 'windowOverlayOpenAnimationDone()') + animation_signal_emission = animation_watcher.num_emissions + + self._click_window_open() + + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + self.assertThat( + lambda: animation_watcher.num_emissions, + Eventually(GreaterThan(animation_signal_emission))) + + self.webview = self.get_popup_overlay_views()[0].select_single( + objectName="overlayWebview") + self.menu = self._open_context_menu(self.webview) + + def _setup_webview_context_menu(self, path): + self._launch_application("/{}".format(path)) + + self.webview = self.get_oxide_webview() + self.menu = self._open_context_menu(self.webview) + + +class TestContextMenuLink(TestContextMenuBase): + + def _test_open_link_(self): + signal = self.webview.watch_signal( + 'openUrlExternallyRequested(QString)') + self.assertThat(signal.was_emitted, Equals(False)) + + self.menu.click_action("OpenLinkInWebBrowser") + + self.assertThat(lambda: signal.was_emitted, Eventually(Equals(True))) + self.assertThat(signal.num_emissions, Equals(1)) + + def _test_copy_link(self): + self.menu.click_action("CopyLinkContextualAction") + + @testtools.skipIf(model() == "Desktop", "on devices only") + def _test_share_link(self): + self.menu.click_action("ShareContextualAction") + self.app.wait_select_single("ContentShareDialog") + + +class TestContextMenuLinkOverlayWebView(TestContextMenuLink): + + def setUp(self): + super(TestContextMenuLinkOverlayWebView, self).setUp() + self._setup_overlay_webview_context_menu("with-external-link") + + def test_open_link_(self): + self._test_open_link_() + + def test_copy_link(self): + self._test_copy_link() + + @testtools.skipIf(model() == "Desktop", "on devices only") + def test_share_link(self): + self._test_share_link() + + +class TestContextMenuLinkMainWebView(TestContextMenuLink): + + def setUp(self): + super(TestContextMenuLinkMainWebView, self).setUp() + self._setup_webview_context_menu("with-external-link") + + def test_open_link_(self): + self._test_open_link_() + + def test_copy_link(self): + self._test_copy_link() + + @testtools.skipIf(model() == "Desktop", "on devices only") + def test_share_link(self): + self._test_share_link() + + +class TestContextMenuImage(TestContextMenuBase): + + def _test_copy_image(self): + # There is no easy way to test the contents of the clipboard, + # but we can at least verify that the context menu was dismissed. + self.menu.click_action("CopyImageContextualAction") + + +class TestContextMenuImageMainWebview(TestContextMenuImage): + + def setUp(self): + super(TestContextMenuImageMainWebview, self).setUp() + self._setup_webview_context_menu("image") + self.assertThat(self.menu.get_title_label().text, + StartsWith(self.data_uri_prefix)) + + def test_copy_image(self): + self._test_copy_image() + + +class TestContextMenuImageOverlayWebView(TestContextMenuImage): + + def setUp(self): + super(TestContextMenuImageOverlayWebView, self).setUp() + self._setup_overlay_webview_context_menu("image") + self.assertThat(self.menu.get_title_label().text, + StartsWith(self.data_uri_prefix)) + + def test_copy_image(self): + self._test_copy_image() + + +class TestContextMenuImageAndLink(TestContextMenuBase): + + def _test_open_link_in_webbrowser(self): + signal = self.webview.watch_signal( + 'openUrlExternallyRequested(QString)') + self.assertThat(signal.was_emitted, Equals(False)) + + self.menu.click_action("OpenLinkInWebBrowser") + + self.assertThat(lambda: signal.was_emitted, Eventually(Equals(True))) + self.assertThat(signal.num_emissions, Equals(1)) + + def _test_share_link(self): + self.menu.click_action("ShareContextualAction") + self.app.wait_select_single("ContentShareDialog") + + def _test_copy_link(self): + # There is no easy way to test the contents of the clipboard, + # but we can at least verify that the context menu was dismissed. + self.menu.click_action("CopyLinkContextualAction") + + def _test_copy_image(self): + # There is no easy way to test the contents of the clipboard, + # but we can at least verify that the context menu was dismissed. + self.menu.click_action("CopyImageContextualAction") + + +class TestContextMenuImageAndLinkMainWebView(TestContextMenuImageAndLink): + + def setUp(self): + super(TestContextMenuImageAndLinkMainWebView, self).setUp() + self._setup_webview_context_menu("imagelink") + self.assertThat(self.menu.get_title_label().text, + StartsWith(self.data_uri_prefix)) + + def test_open_link_in_webbrowser(self): + self._test_open_link_in_webbrowser() + + @testtools.skipIf(model() == "Desktop", "on devices only") + def test_share_link(self): + self._test_share_link() + + def test_copy_link(self): + self._test_copy_link() + + def test_copy_image(self): + self._test_copy_image() + + +class TestContextMenuImageAndLinkOverlayWebView(TestContextMenuImageAndLink): + + def setUp(self): + super(TestContextMenuImageAndLinkOverlayWebView, self).setUp() + self._setup_overlay_webview_context_menu("imagelink") + self.assertThat(self.menu.get_title_label().text, + StartsWith(self.data_uri_prefix)) + + def test_open_link_in_webbrowser(self): + self._test_open_link_in_webbrowser() + + @testtools.skipIf(model() == "Desktop", "on devices only") + def test_share_link(self): + self._test_share_link() + + def test_copy_link(self): + self._test_copy_link() + + def test_copy_image(self): + self._test_copy_image() + + +class TestContextMenuTextArea(TestContextMenuBase): + + def _test_actions(self): + actions = ["SelectAll", + "Cut", + "Undo", + "Redo", + "Paste", + "SelectAll", + "Copy", + "Erase"] + for action in actions: + self.menu.click_action("{}ContextualAction".format(action)) + webview = self.get_webview() + self.menu = self._open_context_menu(webview) + + +@testtools.skipIf(model() != "Desktop", "on desktop only") +class TestContextMenuTextAreaMainWebView(TestContextMenuTextArea): + + def setUp(self): + super(TestContextMenuTextAreaMainWebView, self).setUp() + self._setup_webview_context_menu("textarea") + self.assertThat(self.menu.get_title_label().visible, Equals(False)) + + def test_actions(self): + self._test_actions() + + +@testtools.skipIf(model() != "Desktop", "on desktop only") +class TestContextMenuTextAreaOverlayWebView(TestContextMenuTextArea): + + def setUp(self): + super(TestContextMenuTextAreaOverlayWebView, self).setUp() + self._setup_overlay_webview_context_menu("textarea") + self.assertThat(self.menu.get_title_label().visible, Equals(False)) + + def test_actions(self): + self._test_actions() diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_media_permission.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_media_permission.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_media_permission.py 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_media_permission.py 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,70 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- +# Copyright 2016 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import testtools + +from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase + +from testtools.matchers import Equals, GreaterThan +from autopilot.matchers import Eventually + + +class TestMediaPermission(WebappContainerTestCaseWithLocalContentBase): + def _click_window_open(self): + webview = self.get_oxide_webview() + gr = webview.globalRect + self.pointing_device.move( + gr.x + webview.width*3/4, + gr.y + webview.height*3/4) + self.pointing_device.click() + + @testtools.skip("Skipping due to the lack of HTTPS support in the " + "test suite, see https://launchpad.net/bugs/1505995") + def test_access_media_from_main_view(self): + args = [] + self.launch_webcontainer_app_with_local_http_server( + args, + '/media-access') + self.get_webcontainer_window().visible.wait_for(True) + + self.app.wait_select_single( + objectName="mediaAccessDialog") + + @testtools.skip("Skipping due to the lack of HTTPS support in the " + "test suite, see https://launchpad.net/bugs/1505995") + def test_access_media_from_overlay(self): + args = [] + overlay_link = "/with-overlay-link?path=media-access" + self.launch_webcontainer_app_with_local_http_server( + args, + overlay_link) + self.get_webcontainer_window().visible.wait_for(True) + + popup_controller = self.get_popup_controller() + animation_watcher = popup_controller.watch_signal( + 'windowOverlayOpenAnimationDone()') + animation_signal_emission = animation_watcher.num_emissions + + self._click_window_open() + + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + self.assertThat( + lambda: animation_watcher.num_emissions, + Eventually(GreaterThan(animation_signal_emission))) + + self.app.wait_select_single( + objectName="mediaAccessDialog") diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_overlay_recovery.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_overlay_recovery.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_overlay_recovery.py 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_overlay_recovery.py 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,147 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- +# Copyright 2015 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import signal + +from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase + +from testtools.matchers import Equals, Contains, GreaterThan +from autopilot.matchers import Eventually + + +class TestOverlayRecovery(WebappContainerTestCaseWithLocalContentBase): + def _click_href_target_blank(self): + webview = self.get_oxide_webview() + self.assertThat(webview.url, Contains('/open-close-content')) + gr = webview.globalRect + self.pointing_device.move( + gr.x + gr.width/4, + gr.y + gr.height/4) + self.pointing_device.click() + + def _click_overlay(self): + popup_controller = self.get_popup_controller() + new_view_watcher = popup_controller.watch_signal( + 'newViewCreated(QString)') + animation_watcher = popup_controller.watch_signal( + 'windowOverlayOpenAnimationDone()') + animation_signal_emission = animation_watcher.num_emissions + + views = self.get_popup_overlay_views() + self.assertThat(len(views), Equals(0)) + + self._click_href_target_blank() + + self.assertThat( + lambda: new_view_watcher.was_emitted, + Eventually(Equals(True))) + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + views = self.get_popup_overlay_views() + overlay = views[0] + self.assertThat( + overlay.select_single(objectName="overlayWebview").url, + Contains('/open-close-content')) + + self.assertThat( + lambda: animation_watcher.num_emissions, + Eventually(GreaterThan(animation_signal_emission))) + + def test_crash_app_overlay_reloaded(self): + args = [] + self.launch_webcontainer_app_with_local_http_server( + args, + '/open-close-content') + self.get_webcontainer_window().visible.wait_for(True) + + self._click_overlay() + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + + self.kill_app(signal.SIGABRT) + + self.launch_webcontainer_app_with_local_http_server( + args, + '/open-close-content') + self.get_webcontainer_window().visible.wait_for(True) + + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + + views = self.get_popup_overlay_views() + overlay = views[0] + self.assertThat( + lambda: overlay.wait_select_single( + objectName="overlayWebview").url, + Eventually(Contains('/open-close-content'))) + + def test_crash_app_closed_overlay_not_reloaded(self): + args = [] + self.launch_webcontainer_app_with_local_http_server( + args, + '/open-close-content') + self.get_webcontainer_window().visible.wait_for(True) + + self._click_overlay() + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + + views = self.get_popup_overlay_views() + overlay = views[0] + closeButton = overlay.select_single( + objectName='overlayCloseButton') + self.pointing_device.click_object(closeButton) + + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(0))) + + self.kill_app(signal.SIGABRT) + + self.launch_webcontainer_app_with_local_http_server( + args, + '/open-close-content') + self.get_webcontainer_window().visible.wait_for(True) + + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(0))) + + def test_closed_app_overlay_not_reloaded(self): + args = [] + self.launch_webcontainer_app_with_local_http_server( + args, + '/open-close-content') + self.get_webcontainer_window().visible.wait_for(True) + + self._click_overlay() + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + + self.kill_app(signal.SIGTERM) + + self.launch_webcontainer_app_with_local_http_server( + args, + '/open-close-content') + self.get_webcontainer_window().visible.wait_for(True) + + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(0))) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_page_meta_collector.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_page_meta_collector.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_page_meta_collector.py 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_page_meta_collector.py 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,67 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- +# Copyright 2015 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase + +from testtools.matchers import Equals +from autopilot.matchers import Eventually + + +class TestPageMetaCollector(WebappContainerTestCaseWithLocalContentBase): + def test_update_theme_color(self): + args = ['--enable-addressbar'] + self.launch_webcontainer_app_with_local_http_server( + args, + '/theme-color/?color=red') + self.get_webcontainer_window().visible.wait_for(True) + + chrome_base = self.app.wait_select_single( + objectName="chromeBase") + + self.assertThat( + lambda: str(chrome_base.backgroundColor), + Eventually(Equals("Color(255, 0, 0, 255)"))) + + def test_update_theme_color_with_manifest(self): + args = ['--enable-addressbar'] + self.launch_webcontainer_app_with_local_http_server( + args, + '/theme-color/?manifest=true') + self.get_webcontainer_window().visible.wait_for(True) + + chrome_base = self.app.wait_select_single( + objectName="chromeBase") + + self.assertThat( + lambda: str(chrome_base.backgroundColor), + Eventually(Equals("Color(255, 0, 0, 255)"))) + + def test_track_theme_color_live_updates(self): + args = ['--enable-addressbar'] + self.launch_webcontainer_app_with_local_http_server( + args, + '/theme-color/?color=red&delaycolorupdate=black') + self.get_webcontainer_window().visible.wait_for(True) + + chrome_base = self.app.wait_select_single( + objectName="chromeBase") + + self.assertThat( + lambda: str(chrome_base.backgroundColor), + Eventually(Equals("Color(255, 0, 0, 255)"))) + + self.assertThat( + lambda: str(chrome_base.backgroundColor), + Eventually(Equals("Color(0, 0, 0, 255)"))) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_url_patterns.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_url_patterns.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webapp_container/tests/test_url_patterns.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webapp_container/tests/test_url_patterns.py 2016-04-13 15:22:01.000000000 +0000 @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from testtools.matchers import Equals +from testtools.matchers import Equals, Contains from autopilot.matchers import Eventually from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase @@ -43,3 +43,44 @@ self.assertThat( lambda: external_open_watcher.was_emitted, Eventually(Equals(True))) + + def test_pattern_with_external_url_in_overlay(self): + args = ["--webappUrlPatterns=http://www.test.com/*", + "--open-external-url-in-overlay"] + rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname() + self.launch_webcontainer_app_with_local_http_server( + args, + '', + {'WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY': '1', + 'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule}, + "http://www.test.com/with-external-link") + self.get_webcontainer_window().visible.wait_for(True) + + popup_controller = self.get_popup_controller() + new_view_watcher = popup_controller.watch_signal( + 'newViewCreated(QString)') + + views = self.get_popup_overlay_views() + self.assertThat(len(views), Equals(0)) + + webview = self.get_oxide_webview() + external_open_watcher = webview.watch_signal( + 'openExternalUrlTriggered(QString)') + + self.pointing_device.click_object(webview) + + self.assertThat( + lambda: new_view_watcher.was_emitted, + Eventually(Equals(True))) + self.assertThat( + lambda: len(self.get_popup_overlay_views()), + Eventually(Equals(1))) + views = self.get_popup_overlay_views() + overlay = views[0] + self.assertThat( + overlay.select_single(objectName="overlayWebview").url, + Contains('ubuntu')) + + self.assertThat( + external_open_watcher.was_emitted, + Equals(False)) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/emulators/browser.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/emulators/browser.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/emulators/browser.py 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/emulators/browser.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2013-2015 Canonical +# Copyright 2013-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -149,13 +149,45 @@ def get_settings_page(self): return self.wait_select_single(SettingsPage, visible=True) + def get_downloads_page(self): + return self.wait_select_single(DownloadsPage, visible=True) + def get_content_picker_dialog(self): # only on devices return self.wait_select_single("PopupBase", objectName="contentPickerDialog") - def get_bottom_edge_hint(self): - return self.select_single("QQuickImage", objectName="bottomEdgeHint") + def get_download_dialog(self): + return self.wait_select_single("PopupBase", + objectName="downloadDialog") + + def get_peer_picker(self): + return self.wait_select_single(objectName="contentPeerPicker") + + def get_download_options_dialog(self): + return self.wait_select_single("Dialog", + objectName="downloadOptionsDialog") + + def click_cancel_download_button(self): + button = self.select_single("Button", + objectName="cancelDownloadButton") + self.pointing_device.click_object(button) + + def click_choose_app_button(self): + button = self.select_single("Button", + objectName="chooseAppButton") + self.pointing_device.click_object(button) + + def click_download_file_button(self): + button = self.select_single("Button", + objectName="downloadFileButton") + self.pointing_device.click_object(button) + + def get_bottom_edge_handle(self): + return self.select_single(objectName="bottomEdgeHandle") + + def get_bottom_edge_bar(self): + return self.select_single(objectName="bottomEdgeBar", visible=True) def get_bookmark_options(self): return self.select_single(BookmarkOptions) @@ -473,36 +505,37 @@ class SettingsPage(uitk.UbuntuUIToolkitCustomProxyObjectBase): def get_header(self): - return self.select_single(SettingsPageHeader) + return self.select_single(BrowserPageHeader) def get_searchengine_entry(self): - return self.select_single("Subtitled", objectName="searchengine") + return self.select_single(objectName="searchengine") def get_searchengine_page(self): - return self.wait_select_single("QQuickItem", - objectName="searchEnginePage") + return self.wait_select_single(objectName="searchEnginePage") def get_homepage_entry(self): - return self.select_single("Subtitled", objectName="homepage") + return self.select_single(objectName="homepage") def get_restore_session_entry(self): - return self.select_single("Standard", objectName="restoreSession") - - def get_background_tabs_entry(self): - return self.select_single("Standard", objectName="backgroundTabs") + return self.select_single(objectName="restoreSession") def get_privacy_entry(self): - return self.select_single("Standard", objectName="privacy") + return self.select_single(objectName="privacy") def get_privacy_page(self): - return self.wait_select_single("QQuickItem", - objectName="privacySettings") + return self.wait_select_single(objectName="privacySettings") def get_reset_settings_entry(self): - return self.select_single("Standard", objectName="reset") + return self.select_single(objectName="reset") + + +class DownloadsPage(uitk.UbuntuUIToolkitCustomProxyObjectBase): + + def get_header(self): + return self.select_single(BrowserPageHeader) -class SettingsPageHeader(uitk.UbuntuUIToolkitCustomProxyObjectBase): +class BrowserPageHeader(uitk.UbuntuUIToolkitCustomProxyObjectBase): @autopilot.logging.log_action(logger.info) def click_back_button(self): @@ -523,9 +556,15 @@ return sorted(self.select_many("UrlDelegate"), key=lambda item: item.globalRect.y) + def get_search_field(self): + return self.select_single(objectName="searchQuery") + class ExpandedHistoryView(uitk.UbuntuUIToolkitCustomProxyObjectBase): + def get_header(self): + return self.select_single(objectName="header") + def get_entries(self): return sorted(self.select_many("UrlDelegate", objectName="entriesDelegate"), @@ -556,7 +595,12 @@ return self.select_single(UrlDelegate, objectName="homepageBookmark") def get_bookmarks_list(self): - return self.select_single(UrlsList, objectName="bookmarksList") + return self.select_single(objectName="bookmarksList") + + def get_bookmark_delegates(self): + list = self.get_bookmarks_list() + return sorted(list.select_many(UrlDelegate), + key=lambda delegate: delegate.globalRect.y) def get_top_sites_list(self): return self.select_single(UrlPreviewGrid, objectName="topSitesList") @@ -622,16 +666,6 @@ return [folder.name for folder in self.get_folders_list()] -class UrlsList(uitk.UbuntuUIToolkitCustomProxyObjectBase): - - def get_delegates(self): - return sorted(self.select_many(UrlDelegate), - key=lambda delegate: delegate.globalRect.y) - - def get_urls(self): - return [delegate.url for delegate in self.get_delegates()] - - class UrlPreviewGrid(uitk.UbuntuUIToolkitCustomProxyObjectBase): def get_delegates(self): @@ -698,13 +732,11 @@ class BookmarksFoldersView(uitk.UbuntuUIToolkitCustomProxyObjectBase): def get_delegates(self): - return sorted(self.select_many("QQuickItem", - objectName="bookmarkFolderDelegate"), + return sorted(self.select_many(objectName="bookmarkFolderDelegate"), key=lambda delegate: delegate.globalRect.y) def get_folder_delegate(self, folder): - return self.select_single("QQuickItem", - objectName="bookmarkFolderDelegate", + return self.select_single(objectName="bookmarkFolderDelegate", folderName=folder) def get_urls_from_folder(self, folder): @@ -712,8 +744,7 @@ key=lambda delegate: delegate.globalRect.y) def get_header_from_folder(self, folder): - return folder.wait_select_single("QQuickItem", - objectName="bookmarkFolderHeader") + return folder.wait_select_single(objectName="bookmarkFolderHeader") class ContextMenuBase(uitk.UbuntuUIToolkitCustomProxyObjectBase): diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/http_server.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/http_server.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/http_server.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/http_server.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright 2013-2015 Canonical +# Copyright 2013-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -180,6 +180,18 @@ self.send_response(200) name = self.path[len("/tab/"):] self.send_html('' + name + '') + elif self.path.startswith("/downloadpdfgenericmime"): + self.send_response(200) + self.send_header("Content-Type", "application/octet-stream") + self.send_header("Content-Disposition", + "attachment; filename='test.pdf'") + self.end_headers() + elif self.path.startswith("/downloadpdf"): + self.send_response(200) + self.send_header("Content-Type", "application/pdf") + self.send_header("Content-Disposition", + "attachment; filename='test.pdf'") + self.end_headers() elif self.path.startswith("/basicauth"): login = "user" password = "pass" @@ -203,6 +215,43 @@ "}, function() { location.href = '/test1' } " + ", function() { location.href = '/test2' })" ) + elif self.path == "/favicon": + self.send_response(200) + html = '. + +from webbrowser_app.tests import StartOpenRemotePageTestCaseBase + +from autopilot.matchers import Eventually +from autopilot.platform import model + +from testtools.matchers import Equals + +import testtools + + +@testtools.skipIf(model() == "Desktop", "Don't run on desktop, as " + "dependencies aren't guaranteed") +class TestDownloads(StartOpenRemotePageTestCaseBase): + + def test_open_close_downloads_page(self): + downloads_page = self.open_downloads() + downloads_page.get_header().click_back_button() + downloads_page.wait_until_destroyed() + + def test_mimetype_download(self): + self.main_window.go_to_url(self.base_url + "/downloadpdf") + dialog = self.main_window.get_download_dialog() + options_dialog = self.main_window.get_download_options_dialog() + self.assertThat(options_dialog.visible, Eventually(Equals(True))) + self.assertThat(dialog.mimeType, Eventually(Equals("application/pdf"))) + + def test_generic_mimetype_download(self): + self.main_window.go_to_url(self.base_url + "/downloadpdfgenericmime") + dialog = self.main_window.get_download_dialog() + options_dialog = self.main_window.get_download_options_dialog() + self.assertThat(options_dialog.visible, Eventually(Equals(True))) + self.assertThat(dialog.mimeType, Eventually(Equals("application/pdf"))) + + def test_filename(self): + self.main_window.go_to_url(self.base_url + "/downloadpdf") + dialog = self.main_window.get_download_dialog() + options_dialog = self.main_window.get_download_options_dialog() + self.assertThat(options_dialog.visible, Eventually(Equals(True))) + self.assertThat(dialog.filename, Eventually(Equals("test.pdf"))) + + def test_close_dialog(self): + self.main_window.go_to_url(self.base_url + "/downloadpdf") + options_dialog = self.main_window.get_download_options_dialog() + self.assertThat(options_dialog.visible, Eventually(Equals(True))) + self.main_window.click_cancel_download_button() + + def test_picker(self): + self.main_window.go_to_url(self.base_url + "/downloadpdf") + options_dialog = self.main_window.get_download_options_dialog() + self.assertThat(options_dialog.visible, Eventually(Equals(True))) + self.main_window.click_choose_app_button() + picker = self.main_window.get_peer_picker() + self.assertThat(picker.visible, Eventually(Equals(True))) + + def test_download(self): + self.main_window.go_to_url(self.base_url + "/downloadpdf") + options_dialog = self.main_window.get_download_options_dialog() + self.assertThat(options_dialog.visible, Eventually(Equals(True))) + self.main_window.click_download_file_button() + downloads_page = self.main_window.get_downloads_page() + self.assertThat(downloads_page.visible, Eventually(Equals(True))) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_history.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_history.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_history.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_history.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2015 Canonical +# Copyright 2015-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -14,7 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from testtools.matchers import Equals +import time + +from testtools.matchers import EndsWith, Equals, StartsWith from autopilot.matchers import Eventually from webbrowser_app.tests import StartOpenRemotePageTestCaseBase @@ -22,8 +24,25 @@ class TestHistory(StartOpenRemotePageTestCaseBase): - def test_history_not_save_404(self): - url = self.base_url + "/404page" + def expect_history_entries(self, ordered_urls): + history = self.main_window.get_history_view() + if self.main_window.wide: + self.assertThat(lambda: len(history.get_entries()), + Eventually(Equals(len(ordered_urls)))) + entries = history.get_entries() + else: + self.assertThat(lambda: len(history.get_domain_entries()), + Eventually(Equals(1))) + self.pointing_device.click_object(history.get_domain_entries()[0]) + expanded_history = self.main_window.get_expanded_history_view() + self.assertThat(lambda: len(expanded_history.get_entries()), + Eventually(Equals(len(ordered_urls)))) + entries = expanded_history.get_entries() + self.assertThat([entry.url for entry in entries], Equals(ordered_urls)) + return entries + + def test_404_not_saved(self): + url = self.base_url + "/notfound" self.main_window.go_to_url(url) self.main_window.wait_until_page_loaded(url) @@ -33,31 +52,75 @@ self.main_window.go_to_url(url) self.main_window.wait_until_page_loaded(url) - history = self.open_history() + self.open_history() + self.expect_history_entries([url, self.url]) - # We have domains with subsections only on mobiles. - # On wide we take all the entries directly + def test_expanded_history_view_header_swallows_clicks(self): + # Regression test for https://launchpad.net/bugs/1518904 if self.main_window.wide: - delegates = history.get_entries() - - # 2 addresses: /test1 and /test2 - self.assertThat(lambda: len(history.get_entries()), - Eventually(Equals(2))) - self.assertThat(sorted([delegate.url for delegate in delegates]), - Equals(sorted([self.url, url]))) - else: - # 1 domain: the local one - domain_entries = history.get_domain_entries() - self.assertThat(lambda: len(history.get_domain_entries()), - Eventually(Equals(1))) - - self.pointing_device.click_object(domain_entries[0]) - expanded_history = self.main_window.get_expanded_history_view() - - # 2 addresses: /test1 and /test2 - self.assertThat(lambda: len(expanded_history.get_entries()), - Eventually(Equals(2))) + self.skipTest("Only on narrow form factors") + history = self.open_history() + self.pointing_device.click_object(history.get_domain_entries()[0]) + expanded_history = self.main_window.get_expanded_history_view() + hr = expanded_history.get_header().globalRect + self.pointing_device.move(hr.x + hr.width // 2, hr.y + hr.height - 5) + self.pointing_device.click() + time.sleep(1) + # There should be only one instance on the expanded history view. + # If there’s more, the following call will raise an exception. + self.main_window.get_expanded_history_view() + + def test_favicon_saved(self): + # Regression test for https://launchpad.net/bugs/1549780 + url = self.base_url + "/favicon" + self.main_window.go_to_url(url) + self.main_window.wait_until_page_loaded(url) + self.open_history() + first = self.expect_history_entries([url, self.url])[0] + self.assertThat(first.url, Equals(url)) + favicon = self.base_url + "/assets/icon1.png" + self.assertThat(first.icon, Equals(favicon)) + + def test_favicon_updated(self): + # Verify that a page dynamically updating its favicon + # triggers an update in the history database. + url = self.base_url + "/changingfavicon" + self.main_window.go_to_url(url) + self.main_window.wait_until_page_loaded(url) + self.open_history() + first = self.expect_history_entries([url, self.url])[0] + indexes = set() + while len(indexes) < 3: + self.assertThat(first.url, Equals(url)) + icon = first.icon + self.assertThat(icon, StartsWith(self.base_url)) + self.assertThat(icon, EndsWith(".png")) + indexes.add(int(first.icon[(len(self.base_url)+1):-4])) + + def test_title_saved(self): + self.open_history() + entry = self.expect_history_entries([self.url])[0] + self.assertThat(entry.title, Equals("test page 1")) + + def test_title_not_updated(self): + # Verify that a page dynamically updating its title + # does NOT trigger an update in the history database. + url = self.base_url + "/changingtitle" + self.main_window.go_to_url(url) + self.main_window.wait_until_page_loaded(url) + self.open_history() + first = self.expect_history_entries([url, self.url])[0] + for i in range(10): + self.assertThat(first.title, Equals("title0")) + time.sleep(0.5) - delegates = expanded_history.get_entries() - self.assertThat(sorted([delegate.url for delegate in delegates]), - Equals(sorted([self.url, url]))) + def test_pushstate_updates_history(self): + url = self.base_url + "/pushstate" + self.main_window.go_to_url(url) + self.main_window.wait_until_page_loaded(url) + webview = self.main_window.get_current_webview() + self.pointing_device.click_object(webview) + pushed = self.base_url + "/statepushed" + self.main_window.wait_until_page_loaded(pushed) + self.open_history() + self.expect_history_entries([pushed, url, self.url]) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_keyboard.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_keyboard.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_keyboard.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_keyboard.py 2016-04-13 15:22:06.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2015 Canonical +# Copyright 2015-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -87,7 +87,6 @@ def test_new_tab(self): self.main_window.press_key('Ctrl+t') - webview = self.main_window.get_current_webview() self.assertThat(webview.url, Equals("")) new_tab_view = self.main_window.get_new_tab_view() @@ -104,7 +103,7 @@ self.check_tab_number(2) self.main_window.press_key('Ctrl+Page_Down') self.check_tab_number(0) - self.main_window.press_key('Shift+Ctrl+Tab') + self.main_window.press_key('Ctrl+Shift+Tab') if self.main_window.wide: self.check_tab_number(2) else: @@ -148,26 +147,28 @@ self.check_tab_number(0) def test_close_tabs_ctrl_f4(self): + wide = self.main_window.wide self.open_tabs(1) self.check_tab_number(1) self.main_window.press_key('Ctrl+F4') self.check_tab_number(0) self.main_window.press_key('Ctrl+F4') - if model() == 'Desktop': - # On desktop, closing the last open tab exits the application + if wide: + # closing the last open tab exits the application self.app.process.wait() else: webview = self.main_window.get_current_webview() self.assertThat(webview.url, Equals("")) def test_close_tabs_ctrl_w(self): + wide = self.main_window.wide self.open_tabs(1) self.check_tab_number(1) self.main_window.press_key('Ctrl+w') self.check_tab_number(0) self.main_window.press_key('Ctrl+w') - if model() == 'Desktop': - # On desktop, closing the last open tab exits the application + if wide: + # closing the last open tab exits the application self.app.process.wait() else: webview = self.main_window.get_current_webview() @@ -182,12 +183,8 @@ self.main_window.press_key('Ctrl+w') self.check_tab_number(0) self.main_window.press_key('Ctrl+F4') - if model() == 'Desktop': - # On desktop, closing the last open tab exits the application - self.app.process.wait() - else: - webview = self.main_window.get_current_webview() - self.assertThat(webview.url, Equals("")) + webview = self.main_window.get_current_webview() + self.assertThat(webview.url, Equals("")) def test_select_address_bar_ctrl_l(self): self.main_window.press_key('Ctrl+l') @@ -279,6 +276,16 @@ self.assertThat(lambda: self.main_window.get_current_webview().url, Eventually(Equals(url))) + def test_backspace_does_not_go_back_when_html_text_field_focused(self): + # Regression test for https://launchpad.net/bugs/1569938 + url = self.base_url + "/textarea" + self.main_window.go_to_url(url) + webview = self.main_window.get_current_webview() + self.pointing_device.click_object(webview) + self.main_window.press_key('Backspace') + time.sleep(2) + self.assertThat(webview.url, Equals(url)) + def test_toggle_bookmarks(self): self.assertThat(self.main_window.get_bookmarks_view(), Equals(None)) self.main_window.press_key('Ctrl+Shift+o') @@ -345,6 +352,74 @@ new_tab_view = self.main_window.get_new_tab_view() self.assertThat(new_tab_view.visible, Eventually(Equals(True))) + def test_search_in_history(self): + if not self.main_window.wide: + self.skipTest("Only on wide form factors") + + self.assertThat(self.main_window.get_history_view(), Equals(None)) + self.main_window.press_key('Ctrl+h') + self.assertThat(lambda: self.main_window.get_history_view(), + Eventually(NotEquals(None))) + history_view = self.main_window.get_history_view() + + self.main_window.press_key('Ctrl+f') + self.assertThat(history_view.searchMode, Eventually(Equals(True))) + search_field = history_view.get_search_field() + self.assertThat(search_field.visible, Equals(True)) + self.assertThat(search_field.activeFocus, Eventually(Equals(True))) + + self.main_window.press_key('Escape') + self.assertThat(history_view.searchMode, Eventually(Equals(False))) + self.assertThat(search_field.visible, Equals(False)) + + self.main_window.press_key('Escape') + history_view.wait_until_destroyed() + + def test_open_history_exits_findinpage(self): + address_bar = self.main_window.chrome.address_bar + self.main_window.press_key('Ctrl+f') + self.assertThat(address_bar.findInPageMode, Eventually(Equals(True))) + self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) + + self.main_window.press_key('Ctrl+h') + self.assertThat(lambda: self.main_window.get_history_view(), + Eventually(NotEquals(None))) + history_view = self.main_window.get_history_view() + self.assertThat(address_bar.findInPageMode, Eventually(Equals(False))) + self.assertThat(address_bar.activeFocus, Eventually(Equals(False))) + + self.main_window.press_key('Escape') + history_view.wait_until_destroyed() + + def test_open_bookmarks_exits_findinpage(self): + address_bar = self.main_window.chrome.address_bar + self.main_window.press_key('Ctrl+f') + self.assertThat(address_bar.findInPageMode, Eventually(Equals(True))) + self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) + + self.main_window.press_key('Ctrl+Shift+o') + self.assertThat(lambda: self.main_window.get_bookmarks_view(), + Eventually(NotEquals(None))) + bookmarks_view = self.main_window.get_bookmarks_view() + self.assertThat(address_bar.findInPageMode, Eventually(Equals(False))) + self.assertThat(address_bar.activeFocus, Eventually(Equals(False))) + + self.main_window.press_key('Escape') + bookmarks_view.wait_until_destroyed() + + def test_open_settings_exits_findinpage(self): + address_bar = self.main_window.chrome.address_bar + self.main_window.press_key('Ctrl+f') + self.assertThat(address_bar.findInPageMode, Eventually(Equals(True))) + self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) + + settings = self.open_settings() + self.assertThat(address_bar.findInPageMode, Eventually(Equals(False))) + self.assertThat(address_bar.activeFocus, Eventually(Equals(False))) + + self.main_window.press_key('Escape') + settings.wait_until_destroyed() + def test_escape_settings(self): settings = self.open_settings() self.main_window.press_key('Escape') @@ -364,3 +439,88 @@ self.open_new_tab() self.main_window.press_key('Ctrl+f') self.assertThat(address_bar.findInPageMode, Equals(False)) + + def test_find_previous_and_next(self): + url = self.base_url + "/findinpage" + self.main_window.go_to_url(url) + self.main_window.wait_until_page_loaded(url) + address_bar = self.main_window.chrome.address_bar + self.main_window.press_key('Ctrl+f') + self.assertThat(address_bar.findInPageMode, Eventually(Equals(True))) + address_bar.write("e") + counter = address_bar.get_find_in_page_counter() + self.assertThat(counter.count, Eventually(Equals(4))) + self.assertThat(counter.current, Eventually(Equals(1))) + for i in [2, 3, 4, 1, 2, 3, 4, 1, 2]: + self.main_window.press_key('Ctrl+g') + self.assertThat(counter.current, Eventually(Equals(i))) + for i in [1, 4, 3, 2, 1, 4, 3, 2]: + self.main_window.press_key('Ctrl+Shift+g') + self.assertThat(counter.current, Eventually(Equals(i))) + + def test_navigate_between_address_bar_and_new_tab_view(self): + if not self.main_window.wide: + self.skipTest("Only on wide form factors") + + address_bar = self.main_window.chrome.address_bar + + self.main_window.press_key('Ctrl+t') + new_tab_view = self.main_window.get_new_tab_view() + self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) + + self.main_window.press_key('Down') + self.assertThat(address_bar.activeFocus, Eventually(Equals(False))) + self.assertThat(new_tab_view.activeFocus, Eventually(Equals(True))) + + self.main_window.press_key('Up') + self.assertThat(new_tab_view.activeFocus, Eventually(Equals(False))) + self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) + + def test_ctrl_w_closes_tabs_only_from_main_view(self): + # Verify that Ctrl+w doesn’t work when either the history + # view, the bookmarks view or the settings view are shown + # (https://launchpad.net/bugs/1524353). + self.main_window.press_key('Ctrl+t') + self.assert_number_webviews_eventually(2) + + history_view = self.open_history() + self.main_window.press_key('Ctrl+w') + self.main_window.press_key('Escape') + history_view.wait_until_destroyed() + self.assert_number_webviews_eventually(2) + + bookmarks_view = self.open_bookmarks() + self.main_window.press_key('Ctrl+w') + self.main_window.press_key('Escape') + bookmarks_view.wait_until_destroyed() + self.assert_number_webviews_eventually(2) + + settings_view = self.open_settings() + self.main_window.press_key('Ctrl+w') + self.main_window.press_key('Escape') + settings_view.wait_until_destroyed() + self.assert_number_webviews_eventually(2) + + self.main_window.press_key('Ctrl+w') + self.assert_number_webviews_eventually(1) + + def test_addressbar_cleared_when_opening_new_tab(self): + # Verify that when opening a new tab while the address bar was focused, + # the address bar is cleared. + self.main_window.press_key('Ctrl+l') + self.address_bar.activeFocus.wait_for(True) + self.assertThat(self.address_bar.text, Eventually(Equals(self.url))) + self.main_window.press_key('Ctrl+t') + self.address_bar.activeFocus.wait_for(True) + self.assertThat(self.address_bar.text, Eventually(Equals(""))) + + def test_addressbar_cleared_when_switching_between_new_tabs(self): + # Verify that when opening a new tab while a new tab was already open + # with text input in the address bar, the address bar is cleared. + self.main_window.press_key('Ctrl+t') + self.address_bar.activeFocus.wait_for(True) + self.assertThat(self.address_bar.text, Eventually(Equals(""))) + self.address_bar.write("abc") + self.main_window.press_key('Ctrl+t') + self.address_bar.activeFocus.wait_for(True) + self.assertThat(self.address_bar.text, Eventually(Equals(""))) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_media_access_permission.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_media_access_permission.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_media_access_permission.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_media_access_permission.py 2016-04-13 15:22:01.000000000 +0000 @@ -63,6 +63,8 @@ self.main_window.go_to_url(url) self.main_window.wait_until_page_loaded(self.allowed_url) + @testtools.skip("Skipping due to the lack of HTTPS support in the " + "test suite, see https://launchpad.net/bugs/1505995") def test_deny(self): # verify that trying to access any media raises an authorization dialog # and we get redirected to the denial page in case we refuse to give diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_new_tab_view.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_new_tab_view.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_new_tab_view.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_new_tab_view.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2015 Canonical +# Copyright 2015-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -26,8 +26,6 @@ from webbrowser_app.tests import StartOpenRemotePageTestCaseBase -from ubuntuuitoolkit import ToolkitException - class TestNewTabViewLifetime(StartOpenRemotePageTestCaseBase): @@ -240,8 +238,7 @@ self.main_window.wait_until_page_loaded(url) def test_open_bookmark(self): - bookmarks = self.new_tab_view.get_bookmarks_list() - bookmark = bookmarks.get_delegates()[1] + bookmark = self.new_tab_view.get_bookmark_delegates()[2] url = bookmark.url self.pointing_device.click_object(bookmark) self.new_tab_view.wait_until_destroyed() @@ -266,9 +263,8 @@ bookmarks = self.new_tab_view.get_bookmarks_list() top_sites = self.new_tab_view.get_top_sites_list() self.assertThat(top_sites.visible, Equals(True)) - # When the bookmarks list is collapsed, it shows a maximum of 4 entries - self.assertThat(lambda: len(bookmarks.get_delegates()), - Eventually(Equals(4))) + # When the bookmarks list is collapsed, it shows a maximum of 5 entries + self.assertThat(bookmarks.count, Eventually(Equals(5))) # When expanded, it shows all entries more_button = self.new_tab_view.get_bookmarks_more_button() self.assertThat(more_button.visible, Equals(True)) @@ -282,18 +278,17 @@ # Collapse again self.assertThat(more_button.visible, Equals(True)) self.pointing_device.click_object(more_button) - self.assertThat(lambda: len(bookmarks.get_delegates()), - Eventually(Equals(4))) + bookmarks = self.new_tab_view.get_bookmarks_list() + self.assertThat(bookmarks.count, Eventually(Equals(5))) self.assertThat(top_sites.visible, Eventually(Equals(True))) def _remove_first_bookmark(self): - bookmarks = self.new_tab_view.get_bookmarks_list() - delegate = bookmarks.get_delegates()[0] - url = delegate.url - delegate.trigger_leading_action("leadingAction.delete", - delegate.wait_until_destroyed) - self.assertThat(lambda: bookmarks.get_urls()[0], - Eventually(NotEquals(url))) + bookmark = self.new_tab_view.get_bookmark_delegates()[1] + url = bookmark.url + bookmark.trigger_leading_action("leadingAction.delete", lambda: None) + self.assertThat( + lambda: self.new_tab_view.get_bookmark_delegates()[1].url, + Eventually(NotEquals(url))) def _remove_first_bookmark_from_folder(self, folder): folders = self.new_tab_view.get_bookmarks_folder_list_view() @@ -316,14 +311,12 @@ def test_remove_bookmarks_when_collapsed(self): bookmarks = self.new_tab_view.get_bookmarks_list() - self.assertThat(lambda: len(bookmarks.get_delegates()), - Eventually(Equals(4))) + self.assertThat(bookmarks.count, Eventually(Equals(5))) more_button = self.new_tab_view.get_bookmarks_more_button() for i in range(3): self._remove_first_bookmark() self.assertThat(more_button.visible, Eventually(Equals(i < 1))) - self.assertThat(len(bookmarks.get_delegates()), - Equals(4 if (i < 2) else 3)) + self.assertThat(bookmarks.count, Equals(5 if (i < 2) else 4)) def test_remove_bookmarks_when_expanded(self): more_button = self.new_tab_view.get_bookmarks_more_button() @@ -453,25 +446,15 @@ if not self.main_window.wide: self.skipTest("Only on wide form factors") - def test_remove_bookmarks(self): + def test_remove_bookmark(self): view = self.new_tab_view bookmarks = view.get_bookmarks_list() previous_count = len(bookmarks) - bookmarks[1].trigger_leading_action("leadingAction.delete", - bookmarks[1].wait_until_destroyed) + bookmark = bookmarks[1] + bookmark.trigger_leading_action("leadingAction.delete", + bookmark.wait_until_destroyed) bookmarks = view.get_bookmarks_list() self.assertThat(len(bookmarks), Equals(previous_count - 1)) - previous_count = len(bookmarks) - - # verify that trying to delete the homepage bookmark is not going to - # do anything because there is no delete action on the delegate - no_delete_action = False - try: - bookmarks[0].trigger_leading_action("leadingAction.delete") - except ToolkitException: - no_delete_action = True - self.assertThat(no_delete_action, Equals(True)) - self.assertThat(len(view.get_bookmarks_list()), Equals(previous_count)) def test_remove_top_sites(self): view = self.new_tab_view diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_private.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_private.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_private.py 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_private.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2015 Canonical +# Copyright 2015-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_sad_tab.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_sad_tab.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_sad_tab.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_sad_tab.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2015 Canonical +# Copyright 2015-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -17,8 +17,6 @@ import signal import time -from autopilot.platform import model - from webbrowser_app.tests import StartOpenRemotePageTestCaseBase @@ -43,10 +41,11 @@ self.assert_home_page_eventually_loaded() def test_close_tab_web_process_killed(self): + wide = self.main_window.wide sad_tab = self._kill_web_process() sad_tab.click_close_tab_button() - if model() == 'Desktop': - # On desktop, closing the last open tab exits the application + if wide: + # closing the last open tab exits the application self.app.process.wait() return sad_tab.wait_until_destroyed() @@ -64,9 +63,10 @@ self.assert_home_page_eventually_loaded() def test_close_tab_web_process_crashed(self): + wide = self.main_window.wide sad_tab = self._crash_web_process() sad_tab.click_close_tab_button() - if model() == 'Desktop': + if wide: # On desktop, closing the last open tab exits the application self.app.process.wait() return diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_settings.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_settings.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_settings.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_settings.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2015 Canonical +# Copyright 2015-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -20,7 +20,6 @@ from testtools.matchers import Equals, GreaterThan, NotEquals from autopilot.matchers import Eventually -from autopilot.platform import model import ubuntuuitoolkit as uitk @@ -45,26 +44,29 @@ def test_open_close_searchengine_page(self): settings = self.open_settings() searchengine = settings.get_searchengine_entry() - old_engine = searchengine.subText + old_engine = searchengine.currentSearchEngineDisplayName self.assertThat(old_engine, NotEquals("")) self.pointing_device.click_object(searchengine) searchengine_page = settings.get_searchengine_page() searchengine_header = searchengine_page.select_single( - browser.SettingsPageHeader) + browser.BrowserPageHeader) searchengine_header.click_back_button() searchengine_page.wait_until_destroyed() - self.assertThat(searchengine.subText, Equals(old_engine)) + self.assertThat(searchengine.currentSearchEngineDisplayName, + Equals(old_engine)) def test_change_searchengine(self): settings = self.open_settings() searchengine = settings.get_searchengine_entry() - old_engine = searchengine.subText + old_engine = searchengine.currentSearchEngineDisplayName self.assertThat(old_engine, NotEquals("")) self.pointing_device.click_object(searchengine) searchengine_page = settings.get_searchengine_page() - self.assertThat(lambda: len(searchengine_page.select_many("Standard")), - Eventually(GreaterThan(1))) - delegates = searchengine_page.select_many("Standard") + self.assertThat(lambda: len(searchengine_page.select_many( + objectName="searchEngineDelegate")), + Eventually(GreaterThan(1))) + delegates = searchengine_page.select_many( + objectName="searchEngineDelegate") delegates.sort(key=lambda delegate: delegate.objectName) new_index = -1 for (i, delegate) in enumerate(delegates): @@ -72,18 +74,19 @@ if (new_index == -1) and not checkbox.checked: new_index = i self.assertThat(checkbox.checked, - Equals(delegate.text == old_engine)) - new_engine = delegates[new_index].text + Equals(delegate.displayName == old_engine)) + new_engine = delegates[new_index].displayName self.assertThat(new_engine, NotEquals(old_engine)) self.pointing_device.click_object( delegates[new_index].select_single(uitk.CheckBox)) searchengine_page.wait_until_destroyed() - self.assertThat(searchengine.subText, Eventually(Equals(new_engine))) + self.assertThat(searchengine.currentSearchEngineDisplayName, + Eventually(Equals(new_engine))) def test_change_homepage(self): settings = self.open_settings() homepage = settings.get_homepage_entry() - old = homepage.subText + old = homepage.currentHomepage self.assertThat(old, NotEquals("")) # First test cancelling the edition @@ -97,7 +100,7 @@ objectName="homepageDialog.cancelButton") self.pointing_device.click_object(cancel_button) dialog.wait_until_destroyed() - self.assertThat(homepage.subText, Equals(old)) + self.assertThat(homepage.currentHomepage, Equals(old)) # Then test actually changing the homepage self.pointing_device.click_object(homepage) @@ -113,14 +116,14 @@ objectName="homepageDialog.saveButton") self.pointing_device.click_object(save_button) dialog.wait_until_destroyed() - self.assertThat(homepage.subText, Eventually(Equals(new))) + self.assertThat(homepage.currentHomepage, Eventually(Equals(new))) def test_open_close_privacy_settings(self): settings = self.open_settings() privacy = settings.get_privacy_entry() self.pointing_device.click_object(privacy) privacy_page = settings.get_privacy_page() - privacy_header = privacy_page.select_single(browser.SettingsPageHeader) + privacy_header = privacy_page.select_single(browser.BrowserPageHeader) privacy_header.click_back_button() privacy_page.wait_until_destroyed() @@ -130,7 +133,6 @@ self.pointing_device.click_object(privacy) privacy_page = settings.get_privacy_page() clear_history = privacy_page.select_single( - "Standard", objectName="privacy.clearHistory") self.assertThat(clear_history.enabled, Equals(True)) @@ -158,7 +160,6 @@ self.pointing_device.click_object(privacy) privacy_page = settings.get_privacy_page() clear_cache = privacy_page.select_single( - "Standard", objectName="privacy.clearCache") self.assertThat(clear_cache.enabled, Equals(True)) @@ -186,18 +187,13 @@ self.pointing_device.click_object(reset) searchengine = settings.get_searchengine_entry() - self.assertThat(searchengine.subText, + self.assertThat(searchengine.currentSearchEngineDisplayName, Eventually(Equals("Google"))) homepage = settings.get_homepage_entry() - self.assertThat(homepage.subText, + self.assertThat(homepage.currentHomepage, Eventually(Equals("http://start.ubuntu.com"))) restore_session = settings.get_restore_session_entry() checkbox = restore_session.select_single(uitk.CheckBox) self.assertThat(checkbox.checked, Eventually(Equals(True))) - - background_tabs = settings.get_background_tabs_entry() - checkbox = background_tabs.select_single(uitk.CheckBox) - self.assertThat(checkbox.checked, - Eventually(Equals(model() == 'Desktop'))) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_site_previews.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_site_previews.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_site_previews.py 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_site_previews.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2015 Canonical +# Copyright 2015-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -91,12 +91,14 @@ self.populate_captures_dir(history + [other_url, not_hash, not_image]) self.launch_app() - time.sleep(0.5) # wait for file system to settle + time.sleep(1) # wait for file system to settle # verify that non-image files and top 10 sites are left alone, # everything else is cleaned up topsites = history[0:10] - self.assertThat(self.captures_dir, DirContains(topsites + [not_image])) + current_tab = self.capture_file(self.url) + self.assertThat(self.captures_dir, + DirContains(topsites + [not_image, current_tab])) class TestSitePreviews(TestSitePreviewsBase): diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_tabs.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_tabs.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_tabs.py 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_tabs.py 2016-04-13 15:22:01.000000000 +0000 @@ -1,6 +1,6 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- # -# Copyright 2013-2015 Canonical +# Copyright 2013-2016 Canonical # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License version 3, as published @@ -59,16 +59,9 @@ def test_close_last_open_tab(self): tabs_view = self.main_window.get_tabs_view() tabs_view.get_previews()[0].close() - if model() == 'Desktop': - # On desktop, closing the last open tab exits the application - self.app.process.wait() - return tabs_view.visible.wait_for(False) self.assert_number_webviews_eventually(1) self.main_window.get_new_tab_view() - if model() == 'Desktop': - address_bar = self.main_window.address_bar - self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) webview = self.main_window.get_current_webview() self.assertThat(webview.url, Equals("")) @@ -140,6 +133,9 @@ """Test that switching between tabs correctly resets focus to the webview if a page is loaded, and to the address bar if we are in the new page view""" + if not self.main_window.wide: + self.skipTest("only on wide form factors") + address_bar = self.main_window.address_bar self.main_window.press_key('Ctrl+t') @@ -174,7 +170,8 @@ self.main_window.press_key('Ctrl+t') self.main_window.press_key('Ctrl+w') - self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) + if self.main_window.wide: + self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) self.main_window.press_key('Ctrl+w') webview = self.main_window.get_current_webview() @@ -185,7 +182,8 @@ self.assertThat(webview.activeFocus, Eventually(Equals(True))) self.main_window.press_key('Ctrl+w') - self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) + if self.main_window.wide: + self.assertThat(address_bar.activeFocus, Eventually(Equals(True))) class TestTabsManagement(StartOpenRemotePageTestCaseBase, TestTabsMixin): @@ -271,9 +269,10 @@ toolbar.click_button("doneButton") tabs_view.visible.wait_for(False) webview = self.main_window.get_current_webview() + wide = self.main_window.wide self.pointing_device.click_object(webview) - if model() == 'Desktop': - # On desktop, closing the last open tab exits the application + if wide: + # closing the last open tab exits the application self.app.process.wait() return webview.wait_until_destroyed() @@ -282,10 +281,9 @@ @testtools.skipIf(model() != "Desktop", "on desktop only") def test_undo_close_tab(self): - tabs = self.main_window.chrome.get_tabs_bar() url0 = self.main_window.get_current_webview().url - self.open_new_tab() + self.open_new_tab(open_tabs_view=not self.main_window.wide) url1 = self.base_url + "/tab/1" self.main_window.go_to_url(url1) self.main_window.wait_until_page_loaded(url1) @@ -293,19 +291,19 @@ # Insert a "new tab view" page in the middle, without any page loaded # so that we can verify that it will not be restored - self.open_new_tab() + self.open_new_tab(open_tabs_view=not self.main_window.wide) - self.open_new_tab() + self.open_new_tab(open_tabs_view=not self.main_window.wide) url2 = self.base_url + "/tab/2" self.main_window.go_to_url(url2) self.main_window.wait_until_page_loaded(url2) self.assert_number_webviews_eventually(4) - tabs.close_tab(3) + self.main_window.press_key('Ctrl+w') self.assert_number_webviews_eventually(3) - tabs.close_tab(2) + self.main_window.press_key('Ctrl+w') self.assert_number_webviews_eventually(2) - tabs.close_tab(1) + self.main_window.press_key('Ctrl+w') self.assert_number_webviews_eventually(1) self.check_current_tab(url0) @@ -325,7 +323,7 @@ @testtools.skipIf(model() != "Desktop", "on desktop only") def test_undo_close_tab_incognito(self): start_url = self.main_window.get_current_webview().url - self.open_new_tab() + self.open_new_tab(open_tabs_view=not self.main_window.wide) url = self.base_url + "/tab/1" self.main_window.go_to_url(url) self.main_window.wait_until_page_loaded(url) @@ -341,7 +339,7 @@ self.main_window.go_to_url(incognito_url) self.main_window.wait_until_page_loaded(incognito_url) - self.open_new_tab() + self.open_new_tab(open_tabs_view=not self.main_window.wide) self.main_window.go_to_url(incognito_url) self.main_window.wait_until_page_loaded(incognito_url) self.main_window.press_key('Ctrl+w') diff -Nru webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_touchselection.py webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_touchselection.py --- webbrowser-app-0.23+16.04.20151124/tests/autopilot/webbrowser_app/tests/test_touchselection.py 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/autopilot/webbrowser_app/tests/test_touchselection.py 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,103 @@ +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- +# +# Copyright 2016 Canonical +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from autopilot.platform import model +import testtools +from testtools.matchers import Equals, MatchesAny +import time + +from webbrowser_app.tests import StartOpenRemotePageTestCaseBase + + +class TestTouchSelectionBase(StartOpenRemotePageTestCaseBase): + + def get_actions(self): + webview = self.main_window.get_current_webview() + return webview.wait_select_single(objectName="touchSelectionActions", + visible=True) + + def long_press_webview(self): + webview = self.main_window.get_current_webview() + chrome = self.main_window.chrome + x = webview.globalRect.x + webview.globalRect.width // 2 + y = webview.globalRect.y + \ + (webview.globalRect.height + chrome.height) // 2 + self.pointing_device.move(x, y) + self.pointing_device.press() + time.sleep(1.5) + self.pointing_device.release() + return self.get_actions() + + def get_visible_actions(self, actions): + return actions.select_many(styleName="ToolbarButtonStyle", + visible=True) + + def get_handles(self): + webview = self.main_window.get_current_webview() + handles = webview.select_many(objectName="touchSelectionHandle", + visible=True) + handles.sort(key=lambda handle: handle.globalRect.x) + return handles + + +@testtools.skipIf(model() == "Desktop", "on devices only") +class TestTouchSelection(TestTouchSelectionBase): + + def setUp(self): + super(TestTouchSelection, self).setUp(path="/super") + + def test_touch_selection(self): + actions = self.long_press_webview() + self.assertThat(len(self.get_visible_actions(actions)), Equals(2)) + actions.select_single(objectName="touchSelectionAction_selectall", + visible=True) + actions.select_single(objectName="touchSelectionAction_copy", + visible=True) + + handles = self.get_handles() + self.assertThat(len(handles), Equals(2)) + left = 0 # Oxide.TouchSelectionController.HandleOrientationLeft + self.assertThat(handles[0].handleOrientation, Equals(left)) + right = 2 # Oxide.TouchSelectionController.HandleOrientationRight + self.assertThat(handles[1].handleOrientation, Equals(right)) + + +@testtools.skipIf(model() == "Desktop", "on devices only") +class TestTouchInsertion(TestTouchSelectionBase): + + def setUp(self): + super(TestTouchInsertion, self).setUp(path="/textarea") + + def test_touch_insertion(self): + webview = self.main_window.get_current_webview() + self.pointing_device.click_object(webview) + actions = self.get_actions() + self.assertThat(len(self.get_visible_actions(actions)), + MatchesAny(Equals(1), Equals(2))) + actions.select_single(objectName="touchSelectionAction_selectall", + visible=True) + if len(self.get_visible_actions(actions)) == 2: + actions.select_single(objectName="touchSelectionAction_paste", + visible=True) + + handles = self.get_handles() + self.assertThat(len(handles), Equals(1)) + center = 1 # Oxide.TouchSelectionController.HandleOrientationCenter + self.assertThat(handles[0].handleOrientation, Equals(center)) + + +# TODO: add tests for selection resizing, and activation of the contextual +# actions (verifying the contents of the clipboard is a complex task). diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -2,13 +2,9 @@ add_subdirectory(qml) add_subdirectory(domain-utils) add_subdirectory(history-model) -add_subdirectory(history-timeframe-model) add_subdirectory(history-domain-model) add_subdirectory(history-domainlist-model) -add_subdirectory(history-domainlist-chronological-model) -add_subdirectory(history-lastvisitdate-model) add_subdirectory(history-lastvisitdatelist-model) -add_subdirectory(top-sites-model) add_subdirectory(session-utils) add_subdirectory(tabs-model) add_subdirectory(bookmarks-model) @@ -24,3 +20,8 @@ add_subdirectory(intent-filter) add_subdirectory(search-engine) add_subdirectory(text-search-filter-model) +add_subdirectory(downloads-model) +add_subdirectory(single-instance-manager) +add_subdirectory(meminfo) +add_subdirectory(webapp-container-color-helper) + diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -83,6 +83,14 @@ << "https?://mail.google.*/*" << "https?://mail.google.[^\\./]*/[^\\s]*" << true; + QTest::newRow("Valid Google com SLD pattern") + << "https?://mail.google.com.*/*" + << "https?://mail.google.com.[^\\./]*/[^\\s]*" << true; + + QTest::newRow("Valid Google co SLD pattern") + << "https?://mail.google.co.*/*" + << "https?://mail.google.co.[^\\./]*/[^\\s]*" << true; + QTest::newRow("Valid non Google pattern") << "https://*.google.com/*" << "https://[^\\./]*.google.com/[^\\s]*" << true; @@ -100,6 +108,7 @@ WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(6, "https://se*rv?ice.goo*gle.com/*"); WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(7, "https://se*rvice.goo*gle.com/*"); WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(8, "https://se*rvice.goo*gle.*/*"); + WEBAPP_INVALID_GOOGLE_URL_PATTERN_TEST(8, "https://service.google.kom.*/*"); } void transformedUrlPatterns() diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/downloads-model/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/downloads-model/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/downloads-model/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/downloads-model/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,13 @@ +find_package(Qt5Core REQUIRED) +find_package(Qt5Sql REQUIRED) +find_package(Qt5Test REQUIRED) +set(TEST tst_DownloadsModelTests) +add_executable(${TEST} tst_DownloadsModelTests.cpp) +include_directories(${webbrowser-app_SOURCE_DIR}) +target_link_libraries(${TEST} + Qt5::Core + Qt5::Sql + Qt5::Test + webbrowser-app-models +) +add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/downloads-model/tst_DownloadsModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/downloads-model/tst_DownloadsModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/downloads-model/tst_DownloadsModelTests.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/downloads-model/tst_DownloadsModelTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,197 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "downloads-model.h" + +class DownloadsModelTests : public QObject +{ + Q_OBJECT + +private: + DownloadsModel* model; + +private Q_SLOTS: + void init() + { + model = new DownloadsModel; + model->setDatabasePath(":memory:"); + } + + void cleanup() + { + delete model; + } + + void shouldBeInitiallyEmpty() + { + QCOMPARE(model->rowCount(), 0); + } + + void shouldExposeRoleNames() + { + QList roleNames = model->roleNames().values(); + QVERIFY(roleNames.contains("downloadId")); + QVERIFY(roleNames.contains("url")); + QVERIFY(roleNames.contains("path")); + QVERIFY(roleNames.contains("filename")); + QVERIFY(roleNames.contains("mimetype")); + QVERIFY(roleNames.contains("complete")); + QVERIFY(roleNames.contains("paused")); + QVERIFY(roleNames.contains("error")); + QVERIFY(roleNames.contains("created")); + } + + void shouldContainAddedEntries() + { + QVERIFY(!model->contains(QStringLiteral("testid"))); + model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/html")); + QVERIFY(model->contains(QStringLiteral("testid"))); + } + + void shouldAddNewEntries() + { + QSignalSpy spy(model, SIGNAL(added(QString, QUrl, QString))); + + model->add("testid", QUrl("http://example.org/"), "text/plain"); + QCOMPARE(model->rowCount(), 1); + QCOMPARE(spy.count(), 1); + QVariantList args = spy.takeFirst(); + QCOMPARE(args.at(0).toString(), QString("testid")); + QCOMPARE(args.at(1).toUrl(), QUrl("http://example.org/")); + QCOMPARE(args.at(2).toString(), QString("text/plain")); + + model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf"); + QCOMPARE(model->rowCount(), 2); + QCOMPARE(spy.count(), 1); + args = spy.takeFirst(); + QCOMPARE(args.at(0).toString(), QString("testid2")); + QCOMPARE(args.at(1).toUrl(), QUrl("http://example.org/pdf")); + QCOMPARE(args.at(2).toString(), QString("application/pdf")); + } + + void shouldRemoveCancelled() + { + model->add("testid", QUrl("http://example.org/"), "text/plain"); + model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf"); + model->add("testid3", QUrl("https://example.org/secure.png"), "image/png"); + QCOMPARE(model->rowCount(), 3); + + model->cancelDownload("testid2"); + QCOMPARE(model->rowCount(), 2); + + model->cancelDownload("invalid"); + QCOMPARE(model->rowCount(), 2); + } + + void shouldCompleteDownloads() + { + QSignalSpy spy(model, SIGNAL(completeChanged(QString, bool))); + + model->add("testid", QUrl("http://example.org/"), "text/plain"); + QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Complete).toBool()); + model->setComplete("testid", true); + QCOMPARE(spy.count(), 1); + QVariantList args = spy.takeFirst(); + QCOMPARE(args.at(0).toString(), QString("testid")); + QCOMPARE(args.at(1).toBool(), true); + } + + void shouldKeepEntriesSortedChronologically() + { + model->add("testid", QUrl("http://example.org/"), "text/plain"); + model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf"); + model->add("testid3", QUrl("https://example.org/secure.png"), "image/png"); + + QCOMPARE(model->data(model->index(0, 0), DownloadsModel::DownloadId).toString(), QString("testid3")); + QCOMPARE(model->data(model->index(1, 0), DownloadsModel::DownloadId).toString(), QString("testid2")); + QCOMPARE(model->data(model->index(2, 0), DownloadsModel::DownloadId).toString(), QString("testid")); + } + + void shouldReturnData() + { + model->add("testid", QUrl("http://example.org/"), "text/plain"); + QVERIFY(!model->data(QModelIndex(), DownloadsModel::DownloadId).isValid()); + QVERIFY(!model->data(model->index(-1, 0), DownloadsModel::DownloadId).isValid()); + QVERIFY(!model->data(model->index(3, 0), DownloadsModel::DownloadId).isValid()); + QCOMPARE(model->data(model->index(0, 0), DownloadsModel::DownloadId).toString(), QString("testid")); + QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Url).toUrl(), QUrl("http://example.org/")); + QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Mimetype).toString(), QString("text/plain")); + QVERIFY(model->data(model->index(0, 0), DownloadsModel::Created).toDateTime() <= QDateTime::currentDateTime()); + QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Complete).toBool()); + } + + void shouldReturnDatabasePath() + { + QCOMPARE(model->databasePath(), QString(":memory:")); + } + + void shouldNotifyWhenSettingDatabasePath() + { + QSignalSpy spyPath(model, SIGNAL(databasePathChanged())); + QSignalSpy spyReset(model, SIGNAL(modelReset())); + + model->setDatabasePath(":memory:"); + QVERIFY(spyPath.isEmpty()); + QVERIFY(spyReset.isEmpty()); + + model->setDatabasePath(""); + QCOMPARE(spyPath.count(), 1); + QCOMPARE(spyReset.count(), 1); + QCOMPARE(model->databasePath(), QString(":memory:")); + } + + void shouldSerializeOnDisk() + { + QTemporaryFile tempFile; + tempFile.open(); + QString fileName = tempFile.fileName(); + delete model; + model = new DownloadsModel; + model->setDatabasePath(fileName); + model->add("testid", QUrl("http://example.org/"), "text/plain"); + model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf"); + delete model; + model = new DownloadsModel; + model->setDatabasePath(fileName); + model->fetchMore(); + QCOMPARE(model->rowCount(), 2); + } + + void shouldCountNumberOfEntries() + { + QCOMPARE(model->property("count").toInt(), 0); + QCOMPARE(model->rowCount(), 0); + model->add("testid", QUrl("http://example.org/"), "text/plain"); + QCOMPARE(model->property("count").toInt(), 1); + QCOMPARE(model->rowCount(), 1); + model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf"); + QCOMPARE(model->property("count").toInt(), 2); + QCOMPARE(model->rowCount(), 2); + model->add("testid3", QUrl("https://example.org/secure.png"), "image/png"); + QCOMPARE(model->property("count").toInt(), 3); + QCOMPARE(model->rowCount(), 3); + } + +}; + +QTEST_MAIN(DownloadsModelTests) +#include "tst_DownloadsModelTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domainlist-chronological-model/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domainlist-chronological-model/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domainlist-chronological-model/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domainlist-chronological-model/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -find_package(Qt5Core REQUIRED) -find_package(Qt5Sql REQUIRED) -find_package(Qt5Test REQUIRED) -set(TEST tst_HistoryDomainListChronologicalModelTests) -add_executable(${TEST} tst_HistoryDomainListChronologicalModelTests.cpp) -include_directories(${webbrowser-app_SOURCE_DIR}) -target_link_libraries(${TEST} - Qt5::Core - Qt5::Sql - Qt5::Test - webbrowser-app-models -) -add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -/* - * Copyright 2013 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Qt -#include -#include - -// local -#include "domain-utils.h" -#include "history-model.h" -#include "history-domain-model.h" -#include "history-domainlist-model.h" -#include "history-domainlist-chronological-model.h" -#include "history-timeframe-model.h" - -class HistoryDomainListChronologicalModelTests : public QObject -{ - Q_OBJECT - -private: - HistoryModel* history; - HistoryTimeframeModel* timeframe; - HistoryDomainListModel* domainlist; - HistoryDomainListChronologicalModel* model; - -private Q_SLOTS: - void init() - { - history = new HistoryModel; - history->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(history); - domainlist = new HistoryDomainListModel; - domainlist->setSourceModel(timeframe); - model = new HistoryDomainListChronologicalModel; - model->setSourceModel(domainlist); - } - - void cleanup() - { - delete model; - delete domainlist; - delete timeframe; - delete history; - } - - void shouldBeInitiallyEmpty() - { - QCOMPARE(model->rowCount(), 0); - } - - void shouldNotifyWhenChangingSourceModel() - { - QSignalSpy spy(model, SIGNAL(sourceModelChanged())); - model->setSourceModel(domainlist); - QVERIFY(spy.isEmpty()); - HistoryDomainListModel* domainlist2 = new HistoryDomainListModel; - model->setSourceModel(domainlist2); - QCOMPARE(spy.count(), 1); - QCOMPARE(model->sourceModel(), domainlist2); - model->setSourceModel(0); - QCOMPARE(spy.count(), 2); - QCOMPARE(model->sourceModel(), (HistoryDomainListModel*) 0); - delete domainlist2; - } - - void shouldRemainSorted() - { - history->add(QUrl("http://example.org/"), "Example Domain", QUrl()); - QTest::qWait(1001); - history->add(QUrl("http://ubuntu.com/"), "Ubuntu", QUrl()); - QCOMPARE(model->data(model->index(0, 0), HistoryDomainListModel::Domain).toString(), QString("ubuntu.com")); - QCOMPARE(model->data(model->index(1, 0), HistoryDomainListModel::Domain).toString(), QString("example.org")); - } - - void shouldRemoveDomain() { - history->add(QUrl("http://example.org/"), "Example Domain", QUrl()); - QTest::qWait(1001); - history->add(QUrl("http://ubuntu.com/"), "Ubuntu", QUrl()); - QSignalSpy spy(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int))); - history->removeEntriesByDomain("ubuntu.com"); - QCOMPARE(spy.count(), 1); - QList args = spy.takeFirst(); - QCOMPARE(args.at(1).toInt(), 0); - QCOMPARE(args.at(2).toInt(), 0); - } - - void shouldReturnDomain() { - history->add(QUrl("http://example.org/"), "Example Domain", QUrl()); - QCOMPARE(model->get(0), QString("example.org")); - } -}; - -QTEST_MAIN(HistoryDomainListChronologicalModelTests) -#include "tst_HistoryDomainListChronologicalModelTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -25,7 +25,6 @@ #include "history-model.h" #include "history-domain-model.h" #include "history-domainlist-model.h" -#include "history-timeframe-model.h" class HistoryDomainListModelTests : public QObject { @@ -33,7 +32,6 @@ private: HistoryModel* history; - HistoryTimeframeModel* timeframe; HistoryDomainListModel* model; void verifyDataChanged(QSignalSpy& spy, int row) @@ -54,16 +52,13 @@ { history = new HistoryModel; history->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(history); model = new HistoryDomainListModel; - model->setSourceModel(timeframe); + model->setSourceModel(history); } void cleanup() { delete model; - delete timeframe; delete history; } @@ -108,20 +103,12 @@ void shouldUpdateDomainListWhenRemovingEntries() { history->add(QUrl("http://example.org/"), "Example Domain", QUrl()); - QTest::qWait(100); - QDateTime t0 = QDateTime::currentDateTimeUtc(); - QTest::qWait(100); history->add(QUrl("http://example.com/"), "Example Domain", QUrl()); - QTest::qWait(100); - QDateTime t1 = QDateTime::currentDateTimeUtc(); - QTest::qWait(100); history->add(QUrl("http://example.org/test"), "Example Domain", QUrl()); QCOMPARE(model->rowCount(), 2); - - timeframe->setEnd(t1); + history->removeEntryByUrl(QUrl("http://example.org/test")); QCOMPARE(model->rowCount(), 2); - - timeframe->setStart(t0); + history->removeEntryByUrl(QUrl("http://example.org/")); QCOMPARE(model->rowCount(), 1); } @@ -168,21 +155,20 @@ history->add(QUrl("http://ubuntu.com/"), "Ubuntu", QUrl()); QCOMPARE(model->rowCount(), 3); - model->setSourceModel(timeframe); + model->setSourceModel(history); QVERIFY(spy.isEmpty()); QCOMPARE(model->rowCount(), 3); - model->setSourceModel(0); + model->setSourceModel(nullptr); QCOMPARE(spy.count(), 1); - QCOMPARE(model->sourceModel(), (HistoryTimeframeModel*) 0); + QCOMPARE(model->sourceModel(), (HistoryModel*) nullptr); QCOMPARE(model->rowCount(), 0); - HistoryTimeframeModel* timeframe2 = new HistoryTimeframeModel(history); - timeframe2->setSourceModel(history); - model->setSourceModel(timeframe2); + HistoryModel history2; + model->setSourceModel(&history2); QCOMPARE(spy.count(), 2); - QCOMPARE(model->sourceModel(), timeframe2); - QCOMPARE(model->rowCount(), 3); + QCOMPARE(model->sourceModel(), &history2); + QCOMPARE(model->rowCount(), 0); } void shouldKeepDomainsSorted() diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2015 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -23,8 +23,6 @@ // local #include "history-model.h" #include "history-domain-model.h" -#include "history-timeframe-model.h" - class HistoryDomainModelTests : public QObject { @@ -32,7 +30,6 @@ private: HistoryModel* history; - HistoryTimeframeModel* timeframe; HistoryDomainModel* model; private Q_SLOTS: @@ -40,16 +37,13 @@ { history = new HistoryModel; history->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(history); model = new HistoryDomainModel; - model->setSourceModel(timeframe); + model->setSourceModel(history); } void cleanup() { delete model; - delete timeframe; delete history; } @@ -61,15 +55,15 @@ void shouldNotifyWhenChangingSourceModel() { QSignalSpy spy(model, SIGNAL(sourceModelChanged())); - model->setSourceModel(timeframe); + model->setSourceModel(history); QVERIFY(spy.isEmpty()); - HistoryTimeframeModel* timeframe2 = new HistoryTimeframeModel(model); - model->setSourceModel(timeframe2); + HistoryModel history2; + model->setSourceModel(&history2); QCOMPARE(spy.count(), 1); - QCOMPARE(model->sourceModel(), timeframe2); - model->setSourceModel(0); + QCOMPARE(model->sourceModel(), &history2); + model->setSourceModel(nullptr); QCOMPARE(spy.count(), 2); - QCOMPARE(model->sourceModel(), (HistoryTimeframeModel*) 0); + QCOMPARE(model->sourceModel(), (HistoryModel*) nullptr); } void shouldNotifyWhenChangingDomain() diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -25,7 +25,6 @@ #include "domain-utils.h" #include "history-lastvisitdatelist-model.h" #include "history-model.h" -#include "history-timeframe-model.h" class MockHistoryModel : public HistoryModel { @@ -145,7 +144,6 @@ private: MockHistoryModel* mockHistory; - HistoryTimeframeModel* timeframe; HistoryLastVisitDateListModel* model; BookmarksModel* bookmarks; @@ -154,10 +152,8 @@ { mockHistory = new MockHistoryModel; mockHistory->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(mockHistory); model = new HistoryLastVisitDateListModel; - model->setSourceModel(QVariant::fromValue(timeframe)); + model->setSourceModel(QVariant::fromValue(mockHistory)); bookmarks = new BookmarksModel; bookmarks->setDatabasePath(":memory:"); } @@ -165,7 +161,6 @@ void cleanup() { delete model; - delete timeframe; delete mockHistory; delete bookmarks; } @@ -175,7 +170,7 @@ QCOMPARE(model->rowCount(), 0); } - void shouldUpdateLastVsitDateListWhenInsertingEntries() + void shouldUpdateLastVisitDateListWhenInsertingEntries() { QSignalSpy spyRowsInserted(model, SIGNAL(rowsInserted(const QModelIndex&, int, int))); qRegisterMetaType >(); @@ -224,26 +219,6 @@ QCOMPARE(model->rowCount(), 0); } - void shouldUpdateLastVisitDateListWhenChangingTimeFrame() - { - QDateTime dt1 = QDateTime(QDate(1970, 1, 1), QTime(6, 0, 0)); - QDateTime dt2 = QDateTime(QDate(1970, 1, 2), QTime(6, 0, 0)); - QDateTime dt3 = QDateTime(QDate(1970, 1, 3), QTime(6, 0, 0)); - - mockHistory->add(QUrl("http://example.com/"), "Example Domain", "example.com", QUrl(), dt1); - mockHistory->add(QUrl("http://example.org/"), "Example Domain", "example.org", QUrl(), dt2); - mockHistory->add(QUrl("http://example.net/"), "Example Domain", "example.net", QUrl(), dt3); - QDateTime t0 = QDateTime(QDate(1970, 1, 1), QTime(7, 0, 0)); - QDateTime t1 = QDateTime(QDate(1970, 1, 2), QTime(7, 0, 0)); - QCOMPARE(model->rowCount(), 4); - - timeframe->setEnd(t1); - QCOMPARE(model->rowCount(), 3); - - timeframe->setStart(t0); - QCOMPARE(model->rowCount(), 2); - } - void shouldUpdateLastVisitDateListWhenRemovingEntries() { QSignalSpy spyRowsRemoved(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int))); @@ -313,24 +288,23 @@ mockHistory->add(QUrl("http://example.net/"), "Example Domain", "example.net", QUrl(), dt3); QCOMPARE(model->rowCount(), 4); - model->setSourceModel(QVariant::fromValue(timeframe)); + model->setSourceModel(QVariant::fromValue(mockHistory)); QVERIFY(spy.isEmpty()); QCOMPARE(model->rowCount(), 4); - QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances are allowed as source models"); + QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances and null are allowed as source models"); model->setSourceModel(0); QCOMPARE(spy.count(), 1); QVERIFY(!model->sourceModel().isValid()); QCOMPARE(model->rowCount(), 0); - HistoryTimeframeModel timeframe2(mockHistory); - timeframe2.setSourceModel(mockHistory); - model->setSourceModel(QVariant::fromValue(&timeframe2)); + MockHistoryModel mockHistory2; + model->setSourceModel(QVariant::fromValue(&mockHistory2)); QCOMPARE(spy.count(), 2); - QCOMPARE(model->sourceModel(), QVariant::fromValue(&timeframe2)); - QCOMPARE(model->rowCount(), 4); + QCOMPARE(model->sourceModel().value(), &mockHistory2); + QCOMPARE(model->rowCount(), 0); - QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances are allowed as source models"); + QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances and null are allowed as source models"); model->setSourceModel(QVariant::fromValue(QString("not a model"))); QCOMPARE(spy.count(), 3); QVERIFY(!model->sourceModel().isValid()); @@ -340,6 +314,11 @@ bookmarks->add(QUrl("http://example.org/"), "Example Domain", QUrl(), ""); model->setSourceModel(QVariant::fromValue(bookmarks)); QCOMPARE(model->rowCount(), 0); + + spy.clear(); + model->setSourceModel(QVariant()); + QCOMPARE(spy.count(), 1); + QVERIFY(model->sourceModel().isNull()); } void shouldKeepLastVisitDatesSorted() diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-lastvisitdate-model/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/history-lastvisitdate-model/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-lastvisitdate-model/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-lastvisitdate-model/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -find_package(Qt5Sql REQUIRED) -find_package(Qt5Test REQUIRED) -set(TEST tst_HistoryLastVisitDateModelTests) -add_executable(${TEST} tst_HistoryLastVisitDateModelTests.cpp) -include_directories(${webbrowser-app_SOURCE_DIR}) -target_link_libraries(${TEST} - webbrowser-app-models - Qt5::Sql - Qt5::Test -) -add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Qt -#include -#include - -// local -#include "bookmarks-model.h" -#include "history-lastvisitdate-model.h" -#include "history-model.h" -#include "history-timeframe-model.h" - - -class HistoryLastVisitDateModelTests : public QObject -{ - Q_OBJECT - -private: - HistoryModel* history; - HistoryTimeframeModel* timeframe; - HistoryLastVisitDateModel* model; - -private Q_SLOTS: - void init() - { - history = new HistoryModel; - history->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(history); - model = new HistoryLastVisitDateModel; - model->setSourceModel(QVariant::fromValue(timeframe)); - } - - void cleanup() - { - delete model; - delete timeframe; - delete history; - } - - void shouldBeInitiallyEmpty() - { - QCOMPARE(model->rowCount(), 0); - } - - void shouldNotifyWhenChangingSourceModel() - { - QSignalSpy spy(model, SIGNAL(sourceModelChanged())); - model->setSourceModel(QVariant::fromValue(timeframe)); - QVERIFY(spy.isEmpty()); - - HistoryTimeframeModel* timeframe2 = new HistoryTimeframeModel(model); - model->setSourceModel(QVariant::fromValue(timeframe2)); - QCOMPARE(spy.count(), 1); - QCOMPARE(model->sourceModel(), QVariant::fromValue(timeframe2)); - - model->setSourceModel(QVariant()); - QCOMPARE(spy.count(), 2); - QVERIFY(!model->sourceModel().isValid()); - - QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances are allowed as source models"); - model->setSourceModel(QVariant::fromValue(QString("not a model"))); - QVERIFY(!model->sourceModel().isValid()); - QCOMPARE(model->rowCount(), 0); - QCOMPARE(spy.count(), 2); // model is still invalid internally so no signal emitted - - QTest::ignoreMessage(QtWarningMsg, "No results will be returned because the sourceModel does not have a role named \"lastVisitDate\""); - BookmarksModel bookmarks; - bookmarks.setDatabasePath(":memory:"); - bookmarks.add(QUrl("http://example.org/"), "Example Domain", QUrl(), ""); - model->setSourceModel(QVariant::fromValue(&bookmarks)); - QCOMPARE(spy.count(), 3); - // with no filter, all entries match even if the model doesn't have the lastVisitDate role - QCOMPARE(model->rowCount(), 1); - model->setLastVisitDate(QDate::currentDate()); - QCOMPARE(model->rowCount(), 0); - - delete timeframe2; - } - - void shouldNotifyWhenChangingLastVisitDate() - { - QSignalSpy spy(model, SIGNAL(lastVisitDateChanged())); - model->setLastVisitDate(QDate()); - QVERIFY(spy.isEmpty()); - model->setLastVisitDate(QDate::currentDate()); - QCOMPARE(spy.count(), 1); - } - - void shouldMatchAllWhenNoLastVisitDateSet() - { - history->add(QUrl("http://example.org"), "Example Domain", QUrl()); - history->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(model->rowCount(), 2); - } - - void shouldFilterOutNonMatchingLastVisitDate() - { - history->add(QUrl("http://example.org/"), "Example Domain", QUrl()); - QTest::qWait(1001); - history->add(QUrl("http://example.com/"), "Example Domain", QUrl()); - model->setLastVisitDate(QDate::currentDate()); - QCOMPARE(model->rowCount(), 2); - model->setLastVisitDate(QDate(1970, 1, 1)); - QCOMPARE(model->rowCount(), 0); - } - - void shouldReturnDataByIndex() - { - history->add(QUrl("http://example.org"), "Example Domain", QUrl()); - QTest::qWait(1001); - history->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(model->rowCount(), 2); - QVariantMap entry = model->get(2); - QVERIFY(entry.isEmpty()); - entry = model->get(1); - QCOMPARE(entry.value("url").toUrl(), QUrl("http://example.org")); - } -}; - -QTEST_MAIN(HistoryLastVisitDateModelTests) -#include "tst_HistoryLastVisitDateModelTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-model/tst_HistoryModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/history-model/tst_HistoryModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-model/tst_HistoryModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-model/tst_HistoryModelTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -136,6 +136,54 @@ QVERIFY(roles.contains(HistoryModel::Visits)); } + void shouldUpdateAttributes() + { + qRegisterMetaType >(); + QSignalSpy spyChanged(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector&))); + QUrl url(QStringLiteral("http://example.org/")); + QCOMPARE(model->add(url, QStringLiteral(""), QUrl()), 1); + + QVERIFY(!model->update(QUrl(), QStringLiteral(""), QUrl())); + QVERIFY(spyChanged.isEmpty()); + + QVERIFY(!model->update(QUrl(QStringLiteral("http://example.com/")), QStringLiteral(""), QUrl())); + QVERIFY(spyChanged.isEmpty()); + + QVERIFY(!model->update(url, QStringLiteral(""), QUrl())); + QVERIFY(spyChanged.isEmpty()); + + QVERIFY(model->update(url, QStringLiteral("title update"), QUrl())); + QCOMPARE(spyChanged.count(), 1); + QList args = spyChanged.takeFirst(); + QCOMPARE(args.at(0).toModelIndex().row(), 0); + QCOMPARE(args.at(1).toModelIndex().row(), 0); + QVector roles = args.at(2).value >(); + QCOMPARE(roles.size(), 1); + QVERIFY(roles.contains(HistoryModel::Title)); + QCOMPARE(model->get(0)[QStringLiteral("visits")].toInt(), 1); + + QVERIFY(model->update(url, QStringLiteral("title update"), QUrl(QStringLiteral("image://webicon/123")))); + QCOMPARE(spyChanged.count(), 1); + args = spyChanged.takeFirst(); + QCOMPARE(args.at(0).toModelIndex().row(), 0); + QCOMPARE(args.at(1).toModelIndex().row(), 0); + roles = args.at(2).value >(); + QCOMPARE(roles.size(), 1); + QVERIFY(roles.contains(HistoryModel::Icon)); + QCOMPARE(model->get(0)[QStringLiteral("visits")].toInt(), 1); + + QVERIFY(model->update(url, QStringLiteral("title update 2"), QUrl(QStringLiteral("image://webicon/1234")))); + QCOMPARE(spyChanged.count(), 1); + args = spyChanged.takeFirst(); + QCOMPARE(args.at(0).toModelIndex().row(), 0); + QCOMPARE(args.at(1).toModelIndex().row(), 0); + roles = args.at(2).value >(); + QCOMPARE(roles.size(), 2); + QVERIFY(roles.contains(HistoryModel::Title)); + QVERIFY(roles.contains(HistoryModel::Icon)); + QCOMPARE(model->get(0)[QStringLiteral("visits")].toInt(), 1); + } + void shouldNotifyWhenHidingOrUnHidingExistingEntry() { qRegisterMetaType >(); @@ -184,7 +232,7 @@ QCOMPARE(model->data(model->index(0, 0), HistoryModel::Icon).toUrl(), QUrl("image://webicon/123")); QCOMPARE(model->data(model->index(0, 0), HistoryModel::Visits).toInt(), 1); QVERIFY(model->data(model->index(0, 0), HistoryModel::LastVisit).toDateTime() >= now); - QVERIFY(!model->data(model->index(0, 0), HistoryModel::LastVisit + 3).isValid()); + QVERIFY(!model->data(model->index(0, 0), HistoryModel::LastVisit + 4).isValid()); } void shouldReturnDatabasePath() diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-timeframe-model/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/history-timeframe-model/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-timeframe-model/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-timeframe-model/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -find_package(Qt5Core REQUIRED) -find_package(Qt5Sql REQUIRED) -find_package(Qt5Test REQUIRED) -set(TEST tst_HistoryTimeframeModelTests) -add_executable(${TEST} tst_HistoryTimeframeModelTests.cpp) -include_directories(${webbrowser-app_SOURCE_DIR}) -target_link_libraries(${TEST} - Qt5::Core - Qt5::Sql - Qt5::Test - webbrowser-app-models -) -add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/history-timeframe-model/tst_HistoryTimeframeModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/history-timeframe-model/tst_HistoryTimeframeModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/history-timeframe-model/tst_HistoryTimeframeModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/history-timeframe-model/tst_HistoryTimeframeModelTests.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ -/* - * Copyright 2013 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Qt -#include -#include - -// local -#include "history-model.h" -#include "history-timeframe-model.h" - - -class HistoryTimeframeModelTests : public QObject -{ - Q_OBJECT - -private: - HistoryModel* model; - HistoryTimeframeModel* timeframe; - -private Q_SLOTS: - void init() - { - model = new HistoryModel; - model->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(model); - } - - void cleanup() - { - delete timeframe; - delete model; - } - - void shouldBeInitiallyEmpty() - { - QCOMPARE(timeframe->rowCount(), 0); - } - - void shouldNotifyWhenChangingSourceModel() - { - QSignalSpy spy(timeframe, SIGNAL(sourceModelChanged())); - timeframe->setSourceModel(model); - QVERIFY(spy.isEmpty()); - HistoryModel* model2 = new HistoryModel; - timeframe->setSourceModel(model2); - QCOMPARE(spy.count(), 1); - QCOMPARE(timeframe->sourceModel(), model2); - timeframe->setSourceModel(0); - QCOMPARE(spy.count(), 2); - QCOMPARE(timeframe->sourceModel(), (HistoryModel*) 0); - delete model2; - } - - void shouldNotifyWhenChangingStart() - { - QSignalSpy spy(timeframe, SIGNAL(startChanged())); - QDateTime start = QDateTime::currentDateTimeUtc(); - timeframe->setStart(start); - QCOMPARE(timeframe->start(), start); - QCOMPARE(spy.count(), 1); - timeframe->setStart(start); - QCOMPARE(spy.count(), 1); - QTest::qWait(100); - timeframe->setStart(QDateTime::currentDateTimeUtc()); - QCOMPARE(spy.count(), 2); - timeframe->setStart(QDateTime()); - QCOMPARE(spy.count(), 3); - } - - void shouldNotifyWhenChangingEnd() - { - QSignalSpy spy(timeframe, SIGNAL(endChanged())); - QDateTime end = QDateTime::currentDateTimeUtc(); - timeframe->setEnd(end); - QCOMPARE(timeframe->end(), end); - QCOMPARE(spy.count(), 1); - timeframe->setEnd(end); - QCOMPARE(spy.count(), 1); - QTest::qWait(100); - timeframe->setEnd(QDateTime::currentDateTimeUtc()); - QCOMPARE(spy.count(), 2); - timeframe->setEnd(QDateTime()); - QCOMPARE(spy.count(), 3); - } - - void shouldMatchAllWhenNoBoundsSet() - { - model->add(QUrl("http://example.org"), "Example Domain", QUrl()); - QTest::qWait(100); - model->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(timeframe->rowCount(), 2); - } - - void shouldFilterOutOlderEntries() - { - model->add(QUrl("http://example.org"), "Example Domain", QUrl()); - QTest::qWait(100); - QDateTime start = QDateTime::currentDateTimeUtc(); - QTest::qWait(100); - model->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(timeframe->rowCount(), 2); - timeframe->setStart(start); - QCOMPARE(timeframe->rowCount(), 1); - QCOMPARE(timeframe->data(timeframe->index(0, 0), HistoryModel::Url).toUrl(), - QUrl("http://example.com")); - } - - void shouldFilterOutMoreRecentEntries() - { - model->add(QUrl("http://example.org"), "Example Domain", QUrl()); - QTest::qWait(100); - QDateTime end = QDateTime::currentDateTimeUtc(); - QTest::qWait(100); - model->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(timeframe->rowCount(), 2); - timeframe->setEnd(end); - QCOMPARE(timeframe->rowCount(), 1); - QCOMPARE(timeframe->data(timeframe->index(0, 0), HistoryModel::Url).toUrl(), - QUrl("http://example.org")); - } - - void shouldFilterOutOlderAndMoreRecentEntries() - { - model->add(QUrl("http://example.org"), "Example Domain", QUrl()); - QTest::qWait(100); - QDateTime start = QDateTime::currentDateTimeUtc(); - QTest::qWait(100); - model->add(QUrl("http://ubuntu.com"), "Ubuntu", QUrl()); - QTest::qWait(100); - QDateTime end = QDateTime::currentDateTimeUtc(); - QTest::qWait(100); - model->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(timeframe->rowCount(), 3); - timeframe->setStart(start); - timeframe->setEnd(end); - QCOMPARE(timeframe->rowCount(), 1); - QCOMPARE(timeframe->data(timeframe->index(0, 0), HistoryModel::Url).toUrl(), - QUrl("http://ubuntu.com")); - } -}; - -QTEST_MAIN(HistoryTimeframeModelTests) -#include "tst_HistoryTimeframeModelTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/limit-proxy-model/tst_LimitProxyModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/limit-proxy-model/tst_LimitProxyModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/limit-proxy-model/tst_LimitProxyModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/limit-proxy-model/tst_LimitProxyModelTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -17,45 +17,92 @@ */ // Qt +#include +#include #include #include // local -#include "domain-utils.h" -#include "history-model.h" -#include "history-timeframe-model.h" #include "limit-proxy-model.h" -#include "top-sites-model.h" + +class SimpleListModel : public QAbstractListModel { + Q_OBJECT + +public: + enum Roles { + Index = Qt::UserRole + 1, + String + }; + + QHash roleNames() const + { + static QHash roles; + if (roles.isEmpty()) { + roles[Index] = "index"; + roles[String] = "string"; + } + return roles; + } + + int rowCount(const QModelIndex& parent=QModelIndex()) const + { + return m_strings.count(); + } + + QVariant data(const QModelIndex& index, int role) const + { + if (!index.isValid()) { + return QVariant(); + } + switch (role) { + case Index: + return index.row(); + case String: + return m_strings.at(index.row()); + default: + return QVariant(); + } + } + + void append(const QStringList& strings) + { + int index = m_strings.count(); + beginInsertRows(QModelIndex(), index, index + strings.count() - 1); + m_strings << strings; + endInsertRows(); + } + + void remove(int index) + { + beginRemoveRows(QModelIndex(), index, index); + m_strings.removeAt(index); + endRemoveRows(); + } + +private: + QStringList m_strings; +}; class LimitProxyModelTests : public QObject { Q_OBJECT private: - HistoryModel* history; - HistoryTimeframeModel* timeframe; - TopSitesModel* topsites; + SimpleListModel* strings; LimitProxyModel* model; private Q_SLOTS: void init() { - history = new HistoryModel; - history->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(history); - topsites = new TopSitesModel; - topsites->setSourceModel(timeframe); + strings = new SimpleListModel; model = new LimitProxyModel; - model->setSourceModel(topsites); + model->setSourceModel(strings); } void cleanup() { delete model; - delete topsites; - delete timeframe; - delete history; + delete strings; } void shouldBeInitiallyEmpty() @@ -71,38 +118,29 @@ void shouldNotifyWhenChangingSourceModel() { QSignalSpy spy(model, SIGNAL(sourceModelChanged())); - model->setSourceModel(topsites); + model->setSourceModel(strings); QVERIFY(spy.isEmpty()); - TopSitesModel* topsites2 = new TopSitesModel; - model->setSourceModel(topsites2); + QStringListModel strings2; + model->setSourceModel(&strings2); QCOMPARE(spy.count(), 1); - QCOMPARE(model->sourceModel(), topsites2); + QCOMPARE(model->sourceModel(), &strings2); model->setSourceModel(0); QCOMPARE(spy.count(), 2); - QCOMPARE(model->sourceModel(), (TopSitesModel*) 0); - delete topsites2; + QCOMPARE(model->sourceModel(), (QAbstractItemModel*) 0); } void shouldLimitEntriesWithLimitSetBeforePopulating() { model->setLimit(2); - - history->add(QUrl("http://example1.org/"), "Example 1 Domain", QUrl()); - history->add(QUrl("http://example2.org/"), "Example 2 Domain", QUrl()); - history->add(QUrl("http://example3.org/"), "Example 3 Domain", QUrl()); - + strings->append({"a", "b", "c"}); QCOMPARE(model->rowCount(), 2); QCOMPARE(model->unlimitedRowCount(), 3); } void shouldLimitEntriesWithLimitSetAfterPopulating() { - history->add(QUrl("http://example1.org/"), "Example 1 Domain", QUrl()); - history->add(QUrl("http://example2.org/"), "Example 2 Domain", QUrl()); - history->add(QUrl("http://example3.org/"), "Example 3 Domain", QUrl()); - + strings->append({"a", "b", "c"}); model->setLimit(2); - QCOMPARE(model->rowCount(), 2); QCOMPARE(model->unlimitedRowCount(), 3); } @@ -110,11 +148,7 @@ void shouldNotLimitEntriesIfLimitIsMinusOne() { model->setLimit(-1); - - history->add(QUrl("http://example1.org/"), "Example 1 Domain", QUrl()); - history->add(QUrl("http://example2.org/"), "Example 2 Domain", QUrl()); - history->add(QUrl("http://example3.org/"), "Example 3 Domain", QUrl()); - + strings->append({"a", "b", "c"}); QCOMPARE(model->unlimitedRowCount(), 3); QCOMPARE(model->rowCount(), model->unlimitedRowCount()); } @@ -122,11 +156,7 @@ void shouldNotLimitEntriesIfLimitIsGreaterThanRowCount() { model->setLimit(4); - - history->add(QUrl("http://example1.org/"), "Example 1 Domain", QUrl()); - history->add(QUrl("http://example2.org/"), "Example 2 Domain", QUrl()); - history->add(QUrl("http://example3.org/"), "Example 3 Domain", QUrl()); - + strings->append({"a", "b", "c"}); QCOMPARE(model->unlimitedRowCount(), 3); QCOMPARE(model->rowCount(), model->unlimitedRowCount()); } @@ -134,25 +164,17 @@ void shouldUpdateRowCountAndNotifyAfterAnEntryIsRemoved() { model->setLimit(2); + strings->append({"a", "b", "c", "d"}); - qRegisterMetaType >(); QSignalSpy spyChanged(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector&))); QSignalSpy spyRemoved(model, SIGNAL(rowsRemoved(QModelIndex, int, int))); - history->add(QUrl("http://example1.org/"), "Example 1 Domain", QUrl()); - history->add(QUrl("http://example2.org/"), "Example 2 Domain", QUrl()); - QTest::qWait(1001); - history->add(QUrl("http://example3.org/"), "Example 3 Domain", QUrl()); - QTest::qWait(1001); - history->add(QUrl("http://example4.org/"), "Example 4 Domain", QUrl()); - - history->removeEntryByUrl(QUrl("http://example1.org/")); - + strings->remove(0); QCOMPARE(spyChanged.count(), 1); - QCOMPARE(spyRemoved.count(), 0); + QVERIFY(spyRemoved.isEmpty()); - QCOMPARE(model->data(model->index(0, 0), HistoryModel::Url).toUrl(), QUrl("http://example2.org/")); - QCOMPARE(model->data(model->index(1, 0), HistoryModel::Url).toUrl(), QUrl("http://example3.org/")); + QCOMPARE(model->data(model->index(0, 0), SimpleListModel::String).toString(), QString("b")); + QCOMPARE(model->data(model->index(1, 0), SimpleListModel::String).toString(), QString("c")); QCOMPARE(model->unlimitedRowCount(), 3); QCOMPARE(model->rowCount(), 2); @@ -160,13 +182,10 @@ void shouldGetItemWithCorrectValues() { - history->add(QUrl("http://example1.org/"), "Example 1 Domain", QUrl()); - + strings->append({"a"}); QVariantMap item = model->get(0); QHash roles = model->roleNames(); - QCOMPARE(roles.count(), item.count()); - Q_FOREACH(int role, roles.keys()) { QString roleName = QString::fromUtf8(roles.value(role)); QCOMPARE(model->data(model->index(0, 0), role), item.value(roleName)); diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/meminfo/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/meminfo/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/meminfo/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/meminfo/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,15 @@ +find_package(Qt5Core REQUIRED) +find_package(Qt5Test REQUIRED) +set(TEST tst_MemInfoTests) +set(SOURCES + ${webbrowser-common_SOURCE_DIR}/meminfo.cpp + tst_MemInfoTests.cpp +) +add_executable(${TEST} ${SOURCES}) +include_directories(${webbrowser-common_SOURCE_DIR}) +target_link_libraries(${TEST} + Qt5::Core + Qt5::Test +) +add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) +set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal") diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/meminfo/tst_MemInfoTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/meminfo/tst_MemInfoTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/meminfo/tst_MemInfoTests.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/meminfo/tst_MemInfoTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,100 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Qt +#include +#include +#include + +// local +#include "meminfo.h" + +class MemInfoTests : public QObject +{ + Q_OBJECT + +private: + MemInfo* meminfo; + +private Q_SLOTS: + void init() + { + meminfo = new MemInfo(this); + } + + void cleanup() + { + delete meminfo; + } + + void test_active_property() + { + QVERIFY(meminfo->active()); + QSignalSpy spy(meminfo, SIGNAL(activeChanged())); + + meminfo->setActive(true); + QVERIFY(spy.isEmpty()); + + meminfo->setActive(false); + QCOMPARE(spy.count(), 1); + QVERIFY(!meminfo->active()); + spy.clear(); + + meminfo->setActive(false); + QVERIFY(spy.isEmpty()); + + meminfo->setActive(true); + QCOMPARE(spy.count(), 1); + QVERIFY(meminfo->active()); + } + + void test_interval_property() + { + QCOMPARE(meminfo->interval(), 5000); + QSignalSpy spy(meminfo, SIGNAL(intervalChanged())); + + meminfo->setInterval(5000); + QVERIFY(spy.isEmpty()); + + meminfo->setInterval(1500); + QCOMPARE(spy.count(), 1); + QCOMPARE(meminfo->interval(), 1500); + } + + void test_initial_values() + { + QCOMPARE(meminfo->total(), 0); + QCOMPARE(meminfo->free(), 0); + } + + void test_update() + { + QSignalSpy totalSpy(meminfo, SIGNAL(totalChanged())); + QSignalSpy freeSpy(meminfo, SIGNAL(freeChanged())); + meminfo->setInterval(100); + totalSpy.wait(); + freeSpy.wait(); + QVERIFY(meminfo->total() > 0); + QVERIFY(meminfo->free() > 0); + QVERIFY(meminfo->total() > meminfo->free()); + } +}; + +QTEST_MAIN(MemInfoTests) + +#include "tst_MemInfoTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -21,21 +21,21 @@ ${webbrowser-app_SOURCE_DIR}/bookmarks-folder-model.cpp ${webbrowser-app_SOURCE_DIR}/bookmarks-folderlist-model.cpp ${webbrowser-app_SOURCE_DIR}/file-operations.cpp + ${webbrowser-app_SOURCE_DIR}/history-domain-model.cpp + ${webbrowser-app_SOURCE_DIR}/history-domainlist-model.cpp ${webbrowser-app_SOURCE_DIR}/history-model.cpp - ${webbrowser-app_SOURCE_DIR}/history-lastvisitdate-model.cpp ${webbrowser-app_SOURCE_DIR}/history-lastvisitdatelist-model.cpp - ${webbrowser-app_SOURCE_DIR}/history-timeframe-model.cpp ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp ${webbrowser-app_SOURCE_DIR}/searchengine.cpp ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp ${webbrowser-app_SOURCE_DIR}/text-search-filter-model.cpp - ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp tst_QmlTests.cpp ) add_executable(${TEST} ${SOURCES}) include_directories( ${webbrowser-common_SOURCE_DIR} ${webbrowser-app_SOURCE_DIR} + ${unity8_SOURCE_DIR}/plugins ) target_link_libraries(${TEST} Qt5::Core @@ -45,6 +45,7 @@ Qt5::Quick Qt5::QuickTest Qt5::Sql + InputInfo ) add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -input ${CMAKE_CURRENT_SOURCE_DIR} diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_AddressBar.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_AddressBar.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_AddressBar.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_AddressBar.qml 2016-04-13 15:22:01.000000000 +0000 @@ -18,7 +18,6 @@ import QtQuick 2.4 import QtTest 1.0 -import Ubuntu.Test 1.0 import "../../../src/app/webbrowser" Item { @@ -68,15 +67,10 @@ signalName: "validated" } - UbuntuTestCase { + WebbrowserTestCase { name: "AddressBar" when: windowShown - function clickItem(item) { - var center = centerOf(item) - mouseClick(item, center.x, center.y) - } - function init() { addressBar.actualUrl = "" validatedSpy.clear() diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_BookmarksFoldersViewWide.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_BookmarksFoldersViewWide.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_BookmarksFoldersViewWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_BookmarksFoldersViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -18,7 +18,6 @@ import QtQuick 2.4 import QtTest 1.0 -import Ubuntu.Test 1.0 import "../../../src/app/webbrowser" import webbrowserapp.private 0.1 @@ -49,7 +48,7 @@ signalName: "bookmarkRemoved" } - UbuntuTestCase { + WebbrowserTestCase { name: "BookmarksFoldersViewWide" when: windowShown @@ -81,33 +80,8 @@ view = null } - function clickItem(item) { - var center = centerOf(item) - mouseClick(item, center.x, center.y) - } - - function getListItems(name, itemName) { - var list = findChild(view, name) - var items = [] - if (list) { - // ensure all the delegates are created - list.cacheBuffer = list.count * 1000 - - // In some cases the ListView might add other children to the - // contentItem, so we filter the list of children to include - // only actual delegates - var children = list.contentItem.children - for (var i = 0; i < children.length; i++) { - if (children[i].objectName === itemName) { - items.push(children[i]) - } - } - } - return items - } - function test_folder_list() { - var items = getListItems("foldersList", "folderItem") + var items = getListItems(findChild(view, "foldersList"), "folderItem") compare(items.length, 3) verify(items[0].isAllBookmarksFolder) compare(items[0].model.folder, "") @@ -117,15 +91,14 @@ } function test_all_bookmarks_list() { - var items = getListItems("bookmarksList", "bookmarkItem") + var items = getListItems(findChild(view, "bookmarksList"), "bookmarkItem") compare(items.length, 2) compare(items[0].url, homepage) compare(items[1].title, "Example Com") } function test_navigate_folders_by_keyboard() { - var foldersList = getListItems(view, "foldersList") - var folders = getListItems("foldersList", "folderItem") + var folders = getListItems(findChild(view, "foldersList"), "folderItem") verify(folders[0].isActiveFolder) keyClick(Qt.Key_Down) @@ -133,14 +106,15 @@ verify(folders[1].isActiveFolder) // bookmarks within a folder are sorted with the first bookmarked appearing last - var items = getListItems("bookmarksList", "bookmarkItem") + var bookmarksListView = findChild(view, "bookmarksList") + var items = getListItems(bookmarksListView, "bookmarkItem") compare(items[0].title, "Example Net B") compare(items[1].title, "Example Net A") compare(items.length, 2) keyClick(Qt.Key_Down) verify(folders[2].isActiveFolder) - items = getListItems("bookmarksList", "bookmarkItem") + items = getListItems(bookmarksListView, "bookmarkItem") compare(items[0].title, "Example Org Foo") compare(items[1].title, "Example Org Bar") compare(items.length, 2) @@ -160,7 +134,7 @@ function test_switch_between_folder_and_bookmarks_by_keyboard() { var foldersList = findChild(view, "foldersList") var bookmarks = findChild(view, "bookmarksList") - var folders = getListItems("foldersList", "folderItem") + var folders = getListItems(foldersList, "folderItem") verify(folders[0].isActiveFolder) @@ -192,7 +166,7 @@ function test_activate_bookmarks_by_keyboard() { keyClick(Qt.Key_Right) - var items = getListItems("bookmarksList", "bookmarkItem") + var items = getListItems(findChild(view, "bookmarksList"), "bookmarkItem") keyClick(Qt.Key_Return) compare(bookmarkClickedSpy.count, 1) compare(bookmarkClickedSpy.signalArguments[0][0], homepage) @@ -204,7 +178,7 @@ } function test_activate_bookmarks_by_mouse() { - var items = getListItems("bookmarksList", "bookmarkItem") + var items = getListItems(findChild(view, "bookmarksList"), "bookmarkItem") clickItem(items[0]) compare(bookmarkClickedSpy.count, 1) compare(bookmarkClickedSpy.signalArguments[0][0], homepage) @@ -215,16 +189,17 @@ } function test_switch_folders_by_mouse() { - var folders = getListItems("foldersList", "folderItem") + var folders = getListItems(findChild(view, "foldersList"), "folderItem") clickItem(folders[1]) - var items = getListItems("bookmarksList", "bookmarkItem") + var bookmarksListView = findChild(view, "bookmarksList") + var items = getListItems(bookmarksListView, "bookmarkItem") compare(items[0].title, "Example Net B") compare(items[1].title, "Example Net A") compare(items.length, 2) clickItem(folders[0]) - items = getListItems("bookmarksList", "bookmarkItem") + items = getListItems(bookmarksListView, "bookmarkItem") compare(items[0].url, homepage) compare(items[1].title, "Example Com") compare(items.length, 2) @@ -232,7 +207,7 @@ function test_remove_bookmarks_by_keyboard() { keyClick(Qt.Key_Right) - var items = getListItems("bookmarksList", "bookmarkItem") + var items = getListItems(findChild(view, "bookmarksList"), "bookmarkItem") // verify that trying to delete the homepage bookmark does not work keyClick(Qt.Key_Delete) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_BookmarksView.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_BookmarksView.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_BookmarksView.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_BookmarksView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,193 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import QtQuick.Window 2.2 +import QtTest 1.0 +import "../../../src/app/webbrowser" +import webbrowserapp.private 0.1 + +FocusScope { + id: root + + focus: true + width: 300 + height: 500 + + BookmarksView { + id: view + anchors.fill: parent + focus: true + homepageUrl: "http://example.com/homepage" + } + + SignalSpy { + id: bookmarkEntryClickedSpy + target: view + signalName: "bookmarkEntryClicked" + } + + SignalSpy { + id: doneSpy + target: view + signalName: "done" + } + + SignalSpy { + id: newTabClickedSpy + target: view + signalName: "newTabClicked" + } + + WebbrowserTestCase { + name: "BookmarksView" + when: windowShown + + function init() { + BookmarksModel.databasePath = ":memory:" + populate() + verify(view.activeFocus) + compare(bookmarkEntryClickedSpy.count, 0) + compare(doneSpy.count, 0) + compare(newTabClickedSpy.count, 0) + } + + function populate() { + BookmarksModel.add("http://example.com", "Example", "", "") + BookmarksModel.add("http://example.org/a", "Example a", "", "FolderA") + BookmarksModel.add("http://example.org/b", "Example b", "", "FolderB") + compare(BookmarksModel.count, 3) + } + + function cleanup() { + BookmarksModel.databasePath = "" + bookmarkEntryClickedSpy.clear() + doneSpy.clear() + newTabClickedSpy.clear() + } + + function test_done() { + var button = findChild(view, "doneButton") + clickItem(button) + compare(doneSpy.count, 1) + } + + function test_new_tab() { + var action = findChild(view, "newTabAction") + clickItem(action) + compare(newTabClickedSpy.count, 1) + } + + function test_click_bookmark() { + var items = getListItems(findChild(view, "bookmarksFolderListView"), + "bookmarkFolderDelegateLoader") + + clickItem(findChild(items[0], "urlDelegate_0")) + compare(bookmarkEntryClickedSpy.count, 1) + compare(bookmarkEntryClickedSpy.signalArguments[0][0], view.homepageUrl) + + clickItem(findChild(items[0], "urlDelegate_1")) + compare(bookmarkEntryClickedSpy.count, 2) + compare(bookmarkEntryClickedSpy.signalArguments[1][0], "http://example.com") + } + + function test_delete_bookmark() { + var items = getListItems(findChild(view, "bookmarksFolderListView"), + "bookmarkFolderDelegateLoader") + var bookmark = findChild(items[0], "urlDelegate_1") + swipeToDeleteAndConfirm(bookmark) + tryCompare(BookmarksModel, "count", 2) + } + + function test_keyboard_navigation() { + var listview = findChild(view, "bookmarksFolderListView") + waitForRendering(listview) + verify(listview.activeFocus) + + var firstHeader = findChild(listview, "bookmarkFolderHeader") + verify(firstHeader.activeFocus) + var firstFolder = firstHeader.parent + compare(firstFolder.folderName, "") + verify(firstFolder.expanded) + + keyClick(Qt.Key_Up) + verify(firstHeader.activeFocus) + + keyClick(Qt.Key_Space) + verify(!firstFolder.expanded) + + keyClick(Qt.Key_Space) + verify(firstFolder.expanded) + + keyClick(Qt.Key_Up) + verify(firstHeader.activeFocus) + + keyClick(Qt.Key_Down) + verify(findChild(firstFolder, "urlDelegate_0").activeFocus) + + keyClick(Qt.Key_Enter) + compare(bookmarkEntryClickedSpy.count, 1) + compare(bookmarkEntryClickedSpy.signalArguments[0][0], "http://example.com/homepage") + + keyClick(Qt.Key_Down) + verify(findChild(firstFolder, "urlDelegate_1").activeFocus) + + keyClick(Qt.Key_Return) + compare(bookmarkEntryClickedSpy.count, 2) + compare(bookmarkEntryClickedSpy.signalArguments[1][0], "http://example.com") + + keyClick(Qt.Key_Delete) + compare(BookmarksModel.count, 2) + verify(findChild(firstFolder, "urlDelegate_0").activeFocus) + + keyClick(Qt.Key_Down) + var secondHeader = root.Window.activeFocusItem + compare(secondHeader.objectName, "bookmarkFolderHeader") + var secondFolder = secondHeader.parent + compare(secondFolder.folderName, "FolderA") + verify(!secondFolder.expanded) + + keyClick(Qt.Key_Down) + var thirdHeader = root.Window.activeFocusItem + compare(thirdHeader.objectName, "bookmarkFolderHeader") + var thirdFolder = thirdHeader.parent + compare(thirdFolder.folderName, "FolderB") + verify(!thirdFolder.expanded) + + keyClick(Qt.Key_Down) + verify(thirdHeader.activeFocus) + + keyClick(Qt.Key_Delete) + verify(thirdHeader.activeFocus) + + keyClick(Qt.Key_Space) + verify(thirdFolder.expanded) + + keyClick(Qt.Key_Down) + verify(findChild(thirdFolder, "urlDelegate_0").activeFocus) + + keyClick(Qt.Key_Delete) + compare(BookmarksModel.count, 1) + verify(!thirdFolder.active) + verify(secondFolder.activeFocus) + + keyClick(Qt.Key_Space) + verify(secondFolder.expanded) + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_BookmarksViewWide.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_BookmarksViewWide.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_BookmarksViewWide.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_BookmarksViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,111 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import QtTest 1.0 +import "../../../src/app/webbrowser" +import webbrowserapp.private 0.1 + +Item { + id: root + + width: 800 + height: 600 + + BookmarksViewWide { + id: view + anchors.fill: parent + homepageUrl: "http://example.com/homepage" + } + + SignalSpy { + id: bookmarkEntryClickedSpy + target: view + signalName: "bookmarkEntryClicked" + } + + SignalSpy { + id: doneSpy + target: view + signalName: "done" + } + + SignalSpy { + id: newTabClickedSpy + target: view + signalName: "newTabClicked" + } + + WebbrowserTestCase { + name: "BookmarksViewWide" + when: windowShown + + function init() { + BookmarksModel.databasePath = ":memory:" + populate() + view.forceActiveFocus() + compare(bookmarkEntryClickedSpy.count, 0) + compare(doneSpy.count, 0) + compare(newTabClickedSpy.count, 0) + } + + function populate() { + BookmarksModel.add("http://example.com", "Example", "", "") + BookmarksModel.add("http://example.org/a", "Example a", "", "FolderA") + BookmarksModel.add("http://example.org/b", "Example b", "", "FolderB") + compare(BookmarksModel.count, 3) + } + + function cleanup() { + BookmarksModel.databasePath = "" + bookmarkEntryClickedSpy.clear() + doneSpy.clear() + newTabClickedSpy.clear() + } + + function test_done() { + var button = findChild(view, "doneButton") + clickItem(button) + compare(doneSpy.count, 1) + } + + function test_new_tab() { + var action = findChild(view, "newTabAction") + clickItem(action) + compare(newTabClickedSpy.count, 1) + } + + function test_click_bookmark() { + var items = getListItems(findChild(view, "bookmarksList"), "bookmarkItem") + + clickItem(items[0]) + compare(bookmarkEntryClickedSpy.count, 1) + compare(bookmarkEntryClickedSpy.signalArguments[0][0], view.homepageUrl) + + clickItem(items[1]) + compare(bookmarkEntryClickedSpy.count, 2) + compare(bookmarkEntryClickedSpy.signalArguments[1][0], "http://example.com") + } + + function test_delete_bookmark() { + var bookmark = getListItems(findChild(view, "bookmarksList"), "bookmarkItem")[1] + swipeToDeleteAndConfirm(bookmark) + tryCompare(BookmarksModel, "count", 2) + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_ChromeController.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_ChromeController.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_ChromeController.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_ChromeController.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,292 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import QtTest 1.0 +import com.canonical.Oxide 1.7 as Oxide +import "../../../src/app" + +ChromeController { + id: controller + + Item { + id: webviewMock + property bool loading: false + readonly property bool loadingState: loading + property bool fullscreen: false + property var locationBarController: QtObject { + property bool animated: false + property int mode: controller.defaultMode + signal show(bool animate) + } + signal loadEvent(var event) + } + + SignalSpy { + id: showSpy + target: webviewMock.locationBarController + signalName: "show" + } + + webview: webviewMock + + TestCase { + name: "ChromeController" + + readonly property int modeAuto: Oxide.LocationBarController.ModeAuto + readonly property int modeShown: Oxide.LocationBarController.ModeShown + readonly property int modeHidden: Oxide.LocationBarController.ModeHidden + + function init() { + controller.forceHide = false + controller.forceShow = false + controller.defaultMode = modeAuto + webviewMock.loading = false + webviewMock.fullscreen = false + webviewMock.locationBarController.animated = false + webviewMock.locationBarController.mode = controller.defaultMode + showSpy.clear() + } + + function test_change_webview_data() { + return [ + {forceHide: false, forceShow: false, fullscreen: false, + mode: modeAuto, shown: true}, + {forceHide: false, forceShow: true, fullscreen: false, + mode: modeShown, shown: false}, + {forceHide: false, forceShow: false, fullscreen: true, + mode: modeAuto, shown: false}, + {forceHide: false, forceShow: true, fullscreen: true, + mode: modeShown, shown: false}, + {forceHide: true, forceShow: false, fullscreen: true, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: true, fullscreen: false, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: true, fullscreen: true, + mode: modeHidden, shown: false}, + ] + } + + function test_change_webview(data) { + controller.webview = null + controller.forceHide = data.forceHide + controller.forceShow = data.forceShow + webviewMock.fullscreen = data.fullscreen + showSpy.clear() + controller.webview = webviewMock + compare(webviewMock.locationBarController.mode, data.mode) + compare(showSpy.count, data.shown ? 1 : 0) + } + + function test_change_forceHide_data() { + return [ + {forceShow: false, fullscreen: false, + modes: [modeAuto, modeHidden, modeAuto], shown: 1}, + {forceShow: true, fullscreen: false, + modes: [modeShown, modeHidden, modeShown], shown: 0}, + {forceShow: false, fullscreen: true, + modes: [modeHidden, modeHidden, modeHidden], shown: 0}, + {forceShow: true, fullscreen: true, + modes: [modeHidden, modeHidden, modeShown], shown: 0}, + ] + } + + function test_change_forceHide(data) { + controller.forceShow = data.forceShow + webviewMock.fullscreen = data.fullscreen + showSpy.clear() + controller.forceHide = false + compare(webviewMock.locationBarController.mode, data.modes[0]) + controller.forceHide = true + compare(webviewMock.locationBarController.mode, data.modes[1]) + controller.forceHide = false + compare(webviewMock.locationBarController.mode, data.modes[2]) + compare(showSpy.count, data.shown) + } + + function test_change_forceShow_data() { + return [ + {forceHide: false, fullscreen: false, + modes: [modeAuto, modeShown, modeAuto], shown: 1}, + {forceHide: true, fullscreen: false, + modes: [modeHidden, modeHidden, modeHidden], shown: 0}, + {forceHide: false, fullscreen: true, + modes: [modeHidden, modeShown, modeShown], shown: 0}, + {forceHide: true, fullscreen: true, + modes: [modeHidden, modeHidden, modeHidden], shown: 0}, + ] + } + + function test_change_forceShow(data) { + controller.forceHide = data.forceHide + webviewMock.fullscreen = data.fullscreen + showSpy.clear() + controller.forceShow = false + compare(webviewMock.locationBarController.mode, data.modes[0]) + controller.forceShow = true + compare(webviewMock.locationBarController.mode, data.modes[1]) + controller.forceShow = false + compare(webviewMock.locationBarController.mode, data.modes[2]) + compare(showSpy.count, data.shown) + } + + function test_change_fullscreen_data() { + return [ + {forceHide: false, forceShow: false, defaultMode: modeAuto, + mode: modeAuto, shown: true}, + {forceHide: false, forceShow: false, defaultMode: modeShown, + mode: modeShown, shown: false}, + {forceHide: false, forceShow: false, defaultMode: modeHidden, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: false, defaultMode: modeAuto, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: false, defaultMode: modeShown, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: false, defaultMode: modeHidden, + mode: modeHidden, shown: false}, + {forceHide: false, forceShow: true, defaultMode: modeAuto, + mode: modeShown, shown: false}, + {forceHide: false, forceShow: true, defaultMode: modeShown, + mode: modeShown, shown: false}, + {forceHide: false, forceShow: true, defaultMode: modeHidden, + mode: modeShown, shown: false}, + {forceHide: true, forceShow: true, defaultMode: modeAuto, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: true, defaultMode: modeShown, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: true, defaultMode: modeHidden, + mode: modeHidden, shown: false}, + ] + } + + function test_change_fullscreen(data) { + webviewMock.fullscreen = false + controller.forceHide = data.forceHide + controller.forceShow = data.forceShow + controller.defaultMode = data.defaultMode + showSpy.clear() + webviewMock.fullscreen = true + compare(webviewMock.locationBarController.mode, modeHidden) + compare(showSpy.count, 0) + webviewMock.fullscreen = false + compare(webviewMock.locationBarController.mode, data.mode) + compare(showSpy.count, data.shown ? 1 : 0) + } + + function test_loading_state_changed_data() { + return [ + {forceHide: false, forceShow: false, fullscreen: false, + mode: modeAuto, shown: true}, + {forceHide: false, forceShow: false, fullscreen: false, + mode: modeShown, shown: false}, + {forceHide: false, forceShow: false, fullscreen: false, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: false, fullscreen: false, + mode: modeHidden, shown: false}, + {forceHide: false, forceShow: true, fullscreen: false, + mode: modeShown, shown: false}, + {forceHide: false, forceShow: false, fullscreen: true, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: true, fullscreen: false, + mode: modeHidden, shown: false}, + {forceHide: true, forceShow: false, fullscreen: true, + mode: modeHidden, shown: false}, + {forceHide: false, forceShow: true, fullscreen: true, + mode: modeShown, shown: false}, + {forceHide: true, forceShow: true, fullscreen: true, + mode: modeHidden, shown: false}, + ] + } + + function test_loading_state_changed(data) { + controller.forceHide = data.forceHide + controller.forceShow = data.forceShow + webviewMock.fullscreen = data.fullscreen + webviewMock.locationBarController.mode = data.mode + showSpy.clear() + webviewMock.loading = true + compare(showSpy.count, data.shown ? 1 : 0) + compare(webviewMock.locationBarController.mode, data.mode) + showSpy.clear() + webviewMock.loading = false + compare(showSpy.count, 0) + compare(webviewMock.locationBarController.mode, data.mode) + } + + function test_load_event_data() { + var data = [] + var booleanValues = [false, true] + var modeValues = [modeAuto, modeHidden, modeShown] + for (var i in booleanValues) { + for (var j in booleanValues) { + for (var k in modeValues) { + for (var l in modeValues) { + data.push({forceHide: booleanValues[i], forceShow: booleanValues[j], + initialMode: modeValues[k], defaultMode: modeValues[l]}) + } + } + } + } + return data + } + + function test_load_event(data) { + // event types + var started = Oxide.LoadEvent.TypeStarted + var committed = Oxide.LoadEvent.TypeCommitted + var succeeded = Oxide.LoadEvent.TypeSucceeded + var stopped = Oxide.LoadEvent.TypeStopped + var failed = Oxide.LoadEvent.TypeFailed + var redirected = Oxide.LoadEvent.TypeRedirected + + controller.forceHide = data.forceHide + controller.forceShow = data.forceShow + controller.defaultMode = data.defaultMode + webviewMock.locationBarController.mode = data.initialMode + showSpy.clear() + + function test_sequence(sequence, modes) { + for (var i in sequence) { + webviewMock.loadEvent({type: sequence[i]}) + if (data.forceHide || data.forceShow) { + compare(webviewMock.locationBarController.mode, data.initialMode) + } else { + compare(webviewMock.locationBarController.mode, modes[i]) + } + compare(showSpy.count, 0) + } + } + + var sequence = [started, committed, succeeded] + var modes = [modeShown, data.defaultMode, data.defaultMode] + test_sequence(sequence, modes) + + sequence = [started, stopped] + modes = [modeShown, data.defaultMode] + test_sequence(sequence, modes) + + sequence = [started, failed, committed] + modes = [modeShown, modeShown, data.defaultMode] + test_sequence(sequence, modes) + + sequence = [started, redirected, committed, succeeded] + modes = [modeShown, modeShown, data.defaultMode, data.defaultMode] + test_sequence(sequence, modes) + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_HistoryView.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_HistoryView.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_HistoryView.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_HistoryView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,235 @@ +/* + * Copyright 2015-2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import QtQuick.Window 2.2 +import QtTest 1.0 +import "../../../src/app/webbrowser" +import webbrowserapp.private 0.1 + +FocusScope { + id: root + + focus: true + width: 300 + height: 500 + + readonly property Item historyView: historyViewLoader.item + + Loader { + id: historyViewLoader + anchors.fill: parent + active: false + focus: true + sourceComponent: HistoryView { + focus: true + } + } + + SignalSpy { + id: seeMoreEntriesClickedSpy + target: historyView + signalName: "seeMoreEntriesClicked" + } + + SignalSpy { + id: newTabRequestedSpy + target: historyView + signalName: "newTabRequested" + } + + SignalSpy { + id: doneSpy + target: historyView + signalName: "done" + } + + WebbrowserTestCase { + name: "HistoryView" + when: windowShown + + function init() { + HistoryModel.databasePath = ":memory:" + populate() + historyViewLoader.active = true + historyView.loadModel() + waitForRendering(historyView) + verify(historyView.activeFocus) + var domainsList = findChild(historyView, "domainsListView") + waitForRendering(domainsList) + tryCompare(domainsList, "count", 3) + compare(seeMoreEntriesClickedSpy.count, 0) + compare(doneSpy.count, 0) + } + + function populate() { + HistoryModel.add("http://example.com/foo", "foo", "") + HistoryModel.add("http://example.org/bar", "bar", "") + HistoryModel.add("http://example.net/baz", "baz", "") + compare(HistoryModel.count, 3) + } + + function cleanup() { + historyViewLoader.active = false + HistoryModel.databasePath = "" + seeMoreEntriesClickedSpy.clear() + doneSpy.clear() + } + + function test_done() { + var button = findChild(historyView, "doneButton") + clickItem(button) + compare(doneSpy.count, 1) + } + + function test_new_tab() { + var action = findChild(historyView, "newTabAction") + clickItem(action) + compare(newTabRequestedSpy.count, 1) + compare(doneSpy.count, 1) + } + + function test_see_more_entries() { + var listview = findChild(historyView, "domainsListView") + var domain = getListItems(listview, "historyViewDomainDelegate")[0] + clickItem(domain) + compare(seeMoreEntriesClickedSpy.count, 1) + compare(seeMoreEntriesClickedSpy.signalArguments[0][0].domain, domain.title) + } + + function test_delete_domain() { + var listview = findChild(historyView, "domainsListView") + var domain = getListItems(listview, "historyViewDomainDelegate")[1] + swipeToDeleteAndConfirm(domain) + tryCompare(HistoryModel, "count", 2) + } + + function test_exit_select_mode() { + var listview = findChild(historyView, "domainsListView") + var domains = getListItems(listview, "historyViewDomainDelegate") + var first = domains[0] + verify(!first.selectMode) + + longPressItem(first) + tryCompare(first, "selectMode", true) + + var closeButton = findChild(historyView, "closeButton") + clickItem(closeButton) + tryCompare(first, "selectMode", false) + } + + function test_delete_multiple_domains() { + var listview = findChild(historyView, "domainsListView") + var domains = getListItems(listview, "historyViewDomainDelegate") + var first = domains[0] + verify(!first.selectMode) + + longPressItem(first) + tryCompare(first, "selectMode", true) + tryCompare(first, "selected", true) + var third = domains[2] + verify(!third.selected) + + clickItem(third) + tryCompare(third, "selected", true) + + var deleteButton = findChild(historyView, "deleteButton") + clickItem(deleteButton) + tryCompare(first, "selectMode", false) + tryCompare(HistoryModel, "count", 1) + } + + function test_select_all() { + var listview = findChild(historyView, "domainsListView") + var domains = getListItems(listview, "historyViewDomainDelegate") + var first = domains[0], second = domains[1], third = domains[2] + verify(!first.selectMode) + + longPressItem(first) + tryCompare(first, "selectMode", true) + tryCompare(first, "selected", true) + verify(!second.selected) + verify(!third.selected) + var deleteButton = findChild(historyView, "deleteButton") + verify(deleteButton.enabled) + + var selectAllButton = findChild(historyView, "selectAllButton") + clickItem(selectAllButton) + verify(first.selected) + tryCompare(second, "selected", true) + tryCompare(third, "selected", true) + + clickItem(selectAllButton) + tryCompare(first, "selected", false) + tryCompare(second, "selected", false) + tryCompare(third, "selected", false) + verify(!deleteButton.enabled) + + clickItem(selectAllButton) + tryCompare(first, "selected", true) + tryCompare(second, "selected", true) + tryCompare(third, "selected", true) + verify(deleteButton.enabled) + + clickItem(deleteButton) + tryCompare(HistoryModel, "count", 0) + } + + function test_keyboard_navigation() { + var listview = findChild(historyView, "domainsListView") + verify(listview.activeFocus) + var domains = getListItems(listview, "historyViewDomainDelegate") + + function check_current(index) { + compare(listview.currentIndex, index) + var current = root.Window.activeFocusItem + compare(current.objectName, "historyViewDomainDelegate") + compare(current.modelIndex, index) + compare(current.title, domains[index].title) + verify(current.activeFocus) + return current + } + + var current = check_current(0) + + keyClick(Qt.Key_Up) + verify(current.activeFocus) + + keyClick(Qt.Key_Enter) + compare(seeMoreEntriesClickedSpy.count, 1) + compare(seeMoreEntriesClickedSpy.signalArguments[0][0].domain, domains[0].title) + + keyClick(Qt.Key_Down) + current = check_current(1) + + keyClick(Qt.Key_Return) + compare(seeMoreEntriesClickedSpy.count, 2) + compare(seeMoreEntriesClickedSpy.signalArguments[1][0].domain, domains[1].title) + + keyClick(Qt.Key_Down) + current = check_current(2) + + keyClick(Qt.Key_Down) + verify(current.activeFocus) + + keyClick(Qt.Key_Delete) + tryCompare(listview, 'currentIndex', 1) + current = check_current(1) + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_HistoryViewWide.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_HistoryViewWide.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_HistoryViewWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_HistoryViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -19,8 +19,6 @@ import QtQuick 2.4 import QtTest 1.0 import Ubuntu.Components 1.3 -import Ubuntu.Components.ListItems 1.3 as ListItems -import Ubuntu.Test 1.0 import webbrowserapp.private 0.1 import webbrowsertest.private 0.1 import "../../../src/app/webbrowser" @@ -67,27 +65,16 @@ signalName: "historyEntryClicked" } - UbuntuTestCase { + WebbrowserTestCase { name: "HistoryViewWide" when: windowShown - function clickItem(item) { - var center = centerOf(item) - mouseClick(item, center.x, center.y) - } - function longPressItem(item) { var center = centerOf(item) mousePress(item, center.x, center.y) mouseRelease(item, center.x, center.y, Qt.LeftButton, Qt.NoModifier, 2000) } - function swipeItemRight(item) { - var center = centerOf(item) - mousePress(item, center.x, center.y) - mouseRelease(item, center.x + 100, center.y, Qt.LeftButton, Qt.NoModifier, 2000) - } - function initTestCase() { HistoryModel.databasePath = ":memory:" } @@ -111,26 +98,6 @@ ctrlFCaptured = 0 } - function getListItems(name, itemName) { - var list = findChild(historyViewWide, name) - var items = [] - if (list) { - // ensure all the delegates are created - list.cacheBuffer = list.count * 1000 - - // In some cases the ListView might add other children to the - // contentItem, so we filter the list of children to include - // only actual delegates - var children = list.contentItem.children - for (var i = 0; i < children.length; i++) { - if (children[i].objectName === itemName) { - items.push(children[i]) - } - } - } - return items - } - function test_done_button() { var doneButton = findChild(historyViewWide, "doneButton") verify(doneButton != null) @@ -343,7 +310,7 @@ var term = "2" typeString(term) - var items = getListItems("urlsListView", "historyDelegate") + var items = getListItems(urlsList, "historyDelegate") compare(items.length, 1) compare(items[0].title, wraphtml("Example Domain " + highlight(term))) @@ -353,7 +320,7 @@ var terms = ["1", "Example"] typeString(terms.join(" ")) - items = getListItems("urlsListView", "historyDelegate") + items = getListItems(urlsList, "historyDelegate") compare(items.length, 1) compare(items[0].title, wraphtml("%1 Domain %0" .arg(highlight(terms[0])) @@ -362,7 +329,8 @@ function test_search_updates_dates_list() { function getDateItem(date) { - var dates = getListItems("lastVisitDateListView", "lastVisitDateDelegate") + var lastVisitDateList = findChild(historyViewWide, "lastVisitDateListView") + var dates = getListItems(lastVisitDateList, "lastVisitDateDelegate") var items = dates.filter(function(item) { return item.lastVisitDate.valueOf() === date.valueOf() }) @@ -383,8 +351,9 @@ model.addByDate("https://en.wikipedia.org/wiki/Alonzo_Church", "Alonzo Church", new Date(1903, 6, 14)) var lastVisitDateList = findChild(historyViewWide, "lastVisitDateListView") - var dates = getListItems("lastVisitDateListView", "lastVisitDateDelegate") - var urls = getListItems("urlsListView", "historyDelegate") + var dates = getListItems(lastVisitDateList, "lastVisitDateDelegate") + var urlsListView = findChild(historyViewWide, "urlsListView") + var urls = getListItems(urlsListView, "historyDelegate") compare(dates.length, 4) compare(urls.length, 5) @@ -395,7 +364,7 @@ verify(testItem.activeFocus) keyClick(Qt.Key_F, Qt.ControlModifier) typeString("Alan") - urls = getListItems("urlsListView", "historyDelegate") + urls = getListItems(urlsListView, "historyDelegate") compare(urls.length, 1) returnToDatesList() verify(testItem.activeFocus) @@ -408,7 +377,7 @@ compare(searchQuery.text, "Al") returnToDatesList() verify(testItem.activeFocus) - urls = getListItems("urlsListView", "historyDelegate") + urls = getListItems(urlsListView, "historyDelegate") compare(urls.length, 1) // change the search terms so that the current date will not be @@ -419,7 +388,7 @@ returnToDatesList() testItem = getDateItem(youngest) compare(testItem, null) - urls = getListItems("urlsListView", "historyDelegate") + urls = getListItems(urlsListView, "historyDelegate") compare(urls.length, 1) // verify that the current item has reverted to the first in the @@ -433,7 +402,7 @@ keyClick(Qt.Key_Backspace) keyClick(Qt.Key_Backspace) compare(searchQuery.text, "Al") - urls = getListItems("urlsListView", "historyDelegate") + urls = getListItems(urlsListView, "historyDelegate") compare(urls.length, 2) } diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_NewTabView.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_NewTabView.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_NewTabView.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_NewTabView.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,292 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import QtQuick.Window 2.2 +import QtTest 1.0 +import Qt.labs.settings 1.0 +import "../../../src/app/webbrowser" +import webbrowserapp.private 0.1 + +FocusScope { + id: root + + focus: true + width: 350 + height: 500 + + Loader { + id: newTabViewLoader + anchors.fill: parent + focus: true + active: false + sourceComponent: NewTabView { + focus: true + anchors.fill: parent + settingsObject: Settings { + property url homepage: "http://example.com/homepage" + } + } + } + + readonly property Item view: newTabViewLoader.item + + SignalSpy { + id: bookmarkClickedSpy + target: view + signalName: "bookmarkClicked" + } + + SignalSpy { + id: bookmarkRemovedSpy + target: view + signalName: "bookmarkRemoved" + } + + SignalSpy { + id: historyEntryClickedSpy + target: view + signalName: "historyEntryClicked" + } + + SignalSpy { + id: countChangedSpy + signalName: "countChanged" + } + + WebbrowserTestCase { + name: "NewTabView" + when: windowShown + + function init() { + HistoryModel.databasePath = ":memory:" + BookmarksModel.databasePath = ":memory:" + populate() + newTabViewLoader.active = true + waitForRendering(view) + verify(view.activeFocus) + compare(bookmarkClickedSpy.count, 0) + compare(bookmarkRemovedSpy.count, 0) + compare(historyEntryClickedSpy.count, 0) + } + + function populate() { + HistoryModel.add("http://example.com/foo", "foo", "") + HistoryModel.add("http://example.org/bar", "bar", "") + HistoryModel.add("http://example.net/baz", "baz", "") + HistoryModel.add("http://example.net/qux", "qux", "") + HistoryModel.add("http://example.net/norf", "norf", "") + compare(HistoryModel.count, 5) + + BookmarksModel.add("http://example.com", "Example", "", "") + BookmarksModel.add("http://example.org/a", "Example a", "", "FolderA") + BookmarksModel.add("http://example.org/b", "Example b", "", "FolderB") + BookmarksModel.add("http://example.org/c", "Example c", "", "FolderC") + BookmarksModel.add("http://example.org/d", "Example d", "", "FolderD") + compare(BookmarksModel.count, 5) + } + + function cleanup() { + newTabViewLoader.active = false + BookmarksModel.databasePath = "" + HistoryModel.databasePath = "" + bookmarkClickedSpy.clear() + bookmarkRemovedSpy.clear() + historyEntryClickedSpy.clear() + } + + function verify_bookmarks_expanded(expected) { + if (expected) { + compare(findChild(view, "bookmarksList"), null) + compare(findChild(view, "bookmarksFolderListView").objectName, + "bookmarksFolderListView") + } else { + compare(findChild(view, "bookmarksList").objectName, + "bookmarksList") + compare(findChild(view, "bookmarksFolderListView"), null) + } + } + + function check_focused_item(objectName) { + var focused = root.Window.activeFocusItem + verify(focused !== null) + compare(focused.objectName, objectName) + return focused + } + + function test_click_bookmark() { + var listview = findChild(view, "bookmarksList") + + var homepage = findChild(listview, "homepageBookmark") + clickItem(homepage) + compare(bookmarkClickedSpy.count, 1) + compare(bookmarkClickedSpy.signalArguments[0][0], + view.settingsObject.homepage) + + var bookmark = findChild(listview, "bookmark_1") + clickItem(bookmark) + compare(bookmarkClickedSpy.count, 2) + compare(bookmarkClickedSpy.signalArguments[1][0], bookmark.url) + } + + function test_delete_bookmark() { + var listview = findChild(view, "bookmarksList") + var bookmark = findChild(listview, "bookmark_2") + swipeToDeleteAndConfirm(bookmark) + bookmarkRemovedSpy.wait() + compare(bookmarkRemovedSpy.count, 1) + compare(bookmarkRemovedSpy.signalArguments[0][0], bookmark.url) + } + + function test_expand_bookmarks() { + verify_bookmarks_expanded(false) + var button = findChild(view, "bookmarks.moreButton") + clickItem(button) + verify_bookmarks_expanded(true) + clickItem(button) + verify_bookmarks_expanded(false) + } + + function test_click_top_site() { + var grid = findChild(view, "topSitesList") + compare(grid.count, 5) + var topsites = getListItems(grid, "topSiteItem") + compare(topsites.length, 5) + var topsite = topsites[3] + clickItem(topsite) + compare(historyEntryClickedSpy.count, 1) + compare(historyEntryClickedSpy.signalArguments[0][0], topsite.url) + } + + function test_delete_top_site() { + var grid = findChild(view, "topSitesList") + compare(grid.count, 5) + var topsite = getListItems(grid, "topSiteItem")[1] + clickItem(topsite, Qt.RightButton) + var contextMenu = findChild(root, "urlPreviewDelegate.contextMenu") + var action = findChild(contextMenu, "delete_button") + clickItem(action) + compare(grid.count, 4) + } + + function test_keyboard_navigation() { + var bookmarksList = findChild(view, "bookmarksList") + verify(bookmarksList.activeFocus) + check_focused_item("homepageBookmark") + + keyClick(Qt.Key_Up) + check_focused_item("bookmarkListHeader") + + verify_bookmarks_expanded(false) + keyClick(Qt.Key_Enter) + verify_bookmarks_expanded(true) + keyClick(Qt.Key_Return) + verify_bookmarks_expanded(false) + keyClick(Qt.Key_Space) + verify_bookmarks_expanded(true) + keyClick(Qt.Key_Enter) + verify_bookmarks_expanded(false) + + keyClick(Qt.Key_Up) + check_focused_item("bookmarkListHeader") + + keyClick(Qt.Key_Down) + check_focused_item("homepageBookmark") + + keyClick(Qt.Key_Delete) + compare(bookmarkRemovedSpy.count, 0) + + keyClick(Qt.Key_Enter) + compare(bookmarkClickedSpy.count, 1) + compare(bookmarkClickedSpy.signalArguments[0][0], + view.settingsObject.homepage) + + keyClick(Qt.Key_Down) + var bookmark = check_focused_item("bookmark_1") + + keyClick(Qt.Key_Delete) + compare(bookmarkRemovedSpy.count, 1) + compare(bookmarkRemovedSpy.signalArguments[0][0], bookmark.url) + + keyClick(Qt.Key_Down) + keyClick(Qt.Key_Down) + keyClick(Qt.Key_Down) + check_focused_item("bookmark_4") + + keyClick(Qt.Key_Down) + var grid = findChild(view, "topSitesList") + verify(grid.activeFocus) + compare(grid.currentIndex, 0) + var topsite = check_focused_item("topSiteItem") + + keyClick(Qt.Key_Enter) + compare(historyEntryClickedSpy.count, 1) + compare(historyEntryClickedSpy.signalArguments[0][0], topsite.url) + + keyClick(Qt.Key_Return) + compare(historyEntryClickedSpy.count, 2) + compare(historyEntryClickedSpy.signalArguments[1][0], topsite.url) + + keyClick(Qt.Key_Right) + compare(grid.currentIndex, 1) + check_focused_item("topSiteItem") + + keyClick(Qt.Key_Down) + compare(grid.currentIndex, 3) + check_focused_item("topSiteItem") + + keyClick(Qt.Key_Down) + compare(grid.currentIndex, 3) + check_focused_item("topSiteItem") + + keyClick(Qt.Key_Left) + compare(grid.currentIndex, 2) + check_focused_item("topSiteItem") + + keyClick(Qt.Key_Down) + compare(grid.currentIndex, 4) + check_focused_item("topSiteItem") + + keyClick(Qt.Key_Down) + compare(grid.currentIndex, 4) + check_focused_item("topSiteItem") + + keyClick(Qt.Key_Left) + compare(grid.currentIndex, 3) + check_focused_item("topSiteItem") + + var notopsiteslabel = findChild(view, "notopsites") + verify(!notopsiteslabel.visible) + compare(grid.count, 5) + countChangedSpy.target = grid + for (var i = 4; i >= 0; --i) { + keyClick(Qt.Key_Delete) + countChangedSpy.wait() + compare(grid.count, i) + compare(grid.currentIndex, i - 1) + } + compare(grid.count, 0) + verify(notopsiteslabel.visible) + bookmarksList = findChild(view, "bookmarksList") + verify(bookmarksList.activeFocus) + + keyClick(Qt.Key_Down) + verify(bookmarksList.activeFocus) + } + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_NewTabViewWide.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_NewTabViewWide.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_NewTabViewWide.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_NewTabViewWide.qml 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2015 Canonical Ltd. + * Copyright 2015-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -18,7 +18,6 @@ import QtQuick 2.4 import QtTest 1.0 -import Ubuntu.Test 1.0 import "../../../src/app/webbrowser" import webbrowserapp.private 0.1 @@ -44,11 +43,6 @@ } SignalSpy { - id: releasingKeyboardFocusSpy - signalName: "releasingKeyboardFocus" - } - - SignalSpy { id: historyEntryClickedSpy signalName: "historyEntryClicked" } @@ -63,7 +57,7 @@ signalName: "bookmarkRemoved" } - UbuntuTestCase { + WebbrowserTestCase { name: "NewTabViewWide" when: windowShown @@ -77,8 +71,6 @@ view.focus = true - releasingKeyboardFocusSpy.target = view - releasingKeyboardFocusSpy.clear() historyEntryClickedSpy.target = view historyEntryClickedSpy.clear() bookmarkClickedSpy.target = view @@ -107,31 +99,6 @@ view = null } - function clickItem(item) { - var center = centerOf(item) - mouseClick(item, center.x, center.y) - } - - function getListItems(name, itemName) { - var list = findChild(view, name) - var items = [] - if (list) { - // ensure all the delegates are created - list.cacheBuffer = list.count * 1000 - - // In some cases the ListView might add other children to the - // contentItem, so we filter the list of children to include - // only actual delegates - var children = list.contentItem.children - for (var i = 0; i < children.length; i++) { - if (children[i].objectName === itemName) { - items.push(children[i]) - } - } - } - return items - } - function goToBookmarks() { findChild(view, "sections").selectedIndex = 1 } @@ -142,7 +109,7 @@ HistoryModel.add("http://example.com/" + i, "Example Com " + i, "") } - var items = getListItems("topSitesList", "topSiteItem") + var items = getListItems(findChild(view, "topSitesList"), "topSiteItem") compare(items.length, 10) compare(items[0].title, "Example Com") compare(items[1].title, "Example Org") @@ -174,7 +141,7 @@ } function test_navigate_topsites_by_keyboard() { - var items = getListItems("topSitesList", "topSiteItem") + var items = getListItems(findChild(view, "topSitesList"), "topSiteItem") var list = findChild(view, "topSitesList") list.currentIndex = 0 keyClick(Qt.Key_Right) @@ -189,14 +156,12 @@ compare(list.currentIndex, 0) keyClick(Qt.Key_Up) compare(list.currentIndex, 0) - compare(releasingKeyboardFocusSpy.count, 1) keyClick(Qt.Key_Left) compare(list.currentIndex, 0) - compare(releasingKeyboardFocusSpy.count, 2) } function test_activate_topsites_by_keyboard() { - var items = getListItems("topSitesList", "topSiteItem") + var items = getListItems(findChild(view, "topSitesList"), "topSiteItem") keyClick(Qt.Key_Return) compare(historyEntryClickedSpy.count, 1) compare(historyEntryClickedSpy.signalArguments[0][0], "http://example.com") @@ -207,7 +172,7 @@ } function test_activate_topsites_by_mouse() { - var items = getListItems("topSitesList", "topSiteItem") + var items = getListItems(findChild(view, "topSitesList"), "topSiteItem") clickItem(items[0]) compare(historyEntryClickedSpy.count, 1) compare(historyEntryClickedSpy.signalArguments[0][0], "http://example.com") @@ -219,9 +184,10 @@ } function test_remove_top_sites_by_keyboard() { - var previous = getListItems("topSitesList", "topSiteItem") + var topSitesListView = findChild(view, "topSitesList") + var previous = getListItems(topSitesListView, "topSiteItem") keyClick(Qt.Key_Delete) - var items = getListItems("topSitesList", "topSiteItem") + var items = getListItems(topSitesListView, "topSiteItem") compare(previous.length - 1, items.length) } } diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_QmlTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_QmlTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_QmlTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_QmlTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -29,22 +29,15 @@ #include "bookmarks-folderlist-model.h" #include "favicon-fetcher.h" #include "file-operations.h" +#include "history-domain-model.h" +#include "history-domainlist-model.h" #include "history-model.h" -#include "history-timeframe-model.h" -#include "history-lastvisitdate-model.h" #include "history-lastvisitdatelist-model.h" #include "limit-proxy-model.h" #include "searchengine.h" #include "tabs-model.h" #include "text-search-filter-model.h" -#include "top-sites-model.h" - -static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new FileOperations(); -} +#include "Unity/InputInfo/qdeclarativeinputdevicemodel_p.h" class TestContext : public QObject { @@ -127,60 +120,51 @@ }; class HistoryModelMock : public HistoryModel { - Q_OBJECT + Q_OBJECT public: - static bool compareHistoryEntries(const HistoryEntry& a, const HistoryEntry& b) { - return a.lastVisit < b.lastVisit; - } - - Q_INVOKABLE int addByDate(const QUrl& url, const QString& title, const QDateTime& date) - { - int index = getEntryIndex(url); - int visitsToAdd = 1; - if (index == -1) { - add(url, title, QString()); - index = getEntryIndex(url); - visitsToAdd = 0; - } - - // Since this is useful only for testing and efficiency is not critical - // we reorder the model and reset it every time we add a new item by date - // to keep things simple. - beginResetModel(); - HistoryEntry entry = m_entries.takeAt(index); - entry.lastVisit = date; - entry.visits = entry.visits + visitsToAdd; - m_entries.append(entry); - std::sort(m_entries.begin(), m_entries.end(), compareHistoryEntries); - endResetModel(); + static bool compareHistoryEntries(const HistoryEntry& a, const HistoryEntry& b) { + return a.lastVisit < b.lastVisit; + } - updateExistingEntryInDatabase(entry); + Q_INVOKABLE int addByDate(const QUrl& url, const QString& title, const QDateTime& date) + { + int index = getEntryIndex(url); + int visitsToAdd = 1; + if (index == -1) { + add(url, title, QString()); + index = getEntryIndex(url); + visitsToAdd = 0; + } - return entry.visits; - } -}; + // Since this is useful only for testing and efficiency is not critical + // we reorder the model and reset it every time we add a new item by date + // to keep things simple. + beginResetModel(); + HistoryEntry entry = m_entries.takeAt(index); + entry.lastVisit = date; + entry.visits = entry.visits + visitsToAdd; + m_entries.append(entry); + std::sort(m_entries.begin(), m_entries.end(), compareHistoryEntries); + endResetModel(); -static QObject* TestContext_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new TestContext(); -} + updateExistingEntryInDatabase(entry); -static QObject* BookmarksModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new BookmarksModel(); -} + return entry.visits; + } +}; -static QObject* HistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(scriptEngine); - return new HistoryModelMock(); -} +#define MAKE_SINGLETON_FACTORY(type) \ + static QObject* type##_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) { \ + Q_UNUSED(engine); \ + Q_UNUSED(scriptEngine); \ + return new type(); \ + } + +MAKE_SINGLETON_FACTORY(FileOperations) +MAKE_SINGLETON_FACTORY(BookmarksModel) +MAKE_SINGLETON_FACTORY(HistoryModelMock) +MAKE_SINGLETON_FACTORY(TestContext) int main(int argc, char** argv) { @@ -192,18 +176,21 @@ qmlRegisterType(browserUri, 0, 1, "TabsModel"); qmlRegisterSingletonType(browserUri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory); qmlRegisterType(browserUri, 0, 1, "BookmarksFolderListModel"); - qmlRegisterSingletonType(browserUri, 0, 1, "HistoryModel", HistoryModel_singleton_factory); - qmlRegisterType(browserUri, 0, 1, "HistoryTimeframeModel"); + qmlRegisterSingletonType(browserUri, 0, 1, "HistoryModel", HistoryModelMock_singleton_factory); + qmlRegisterType(browserUri, 0, 1, "HistoryDomainModel"); + qmlRegisterType(browserUri, 0, 1, "HistoryDomainListModel"); qmlRegisterType(browserUri, 0, 1, "HistoryLastVisitDateListModel"); - qmlRegisterType(browserUri, 0, 1, "HistoryLastVisitDateModel"); qmlRegisterType(browserUri, 0, 1, "LimitProxyModel"); qmlRegisterType(browserUri, 0, 1, "TextSearchFilterModel"); - qmlRegisterType(browserUri, 0, 1, "TopSitesModel"); qmlRegisterSingletonType(browserUri, 0, 1, "FileOperations", FileOperations_singleton_factory); const char* testUri = "webbrowsertest.private"; qmlRegisterSingletonType(testUri, 0, 1, "TestContext", TestContext_singleton_factory); + const char* inputInfoUri = "Unity.InputInfo"; + qmlRegisterType(inputInfoUri, 0, 1, "InputDeviceModel"); + qmlRegisterType(inputInfoUri, 0, 1, "InputInfo"); + return quick_test_main(argc, argv, "QmlTests", nullptr); } diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_SettingsPage.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_SettingsPage.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_SettingsPage.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_SettingsPage.qml 2016-04-13 15:22:01.000000000 +0000 @@ -17,8 +17,6 @@ */ import QtQuick 2.4 -import QtTest 1.0 -import Ubuntu.Test 1.0 import webbrowserapp.private 0.1 import webbrowsertest.private 0.1 import "../../../src/app/webbrowser" @@ -50,23 +48,10 @@ } } - UbuntuTestCase { + WebbrowserTestCase { name: "TestSettingsPage" when: windowShown - function clickItem(item) { - var center = centerOf(item) - mouseClick(item, center.x, center.y) - } - - function swipeItemRight(item) { - var center = centerOf(item) - var dx = item.width * 0.5 - mousePress(item, center.x, center.y) - mouseMoveSlowly(item, center.x, center.y, dx, 0, 10, 0.01) - mouseRelease(item, center.x + dx, center.y) - } - function init() { settingsPageLoader.active = true waitForRendering(settingsPageLoader.item) @@ -76,27 +61,6 @@ settingsPageLoader.active = false } - function getListItems(name, itemName) { - var list = findChild(settingsPage, name) - var items = [] - if (list) { - // ensure all the delegates are created - list.cacheBuffer = list.count * 1000 - - // In some cases the ListView might add other children to the - // contentItem, so we filter the list of children to include - // only actual delegates (names for delegates in this case - // follow the pattern "name_index") - var children = list.contentItem.children - for (var i = 0; i < children.length; i++) { - if (children[i].objectName.indexOf(itemName) == 0) { - items.push(children[i]) - } - } - } - return items - } - function activateSettingsItem(itemName, pageName) { var item = findChild(settingsPage, itemName) clickItem(item) @@ -105,7 +69,7 @@ return page } - function goToMediaAccessPage() { + function test_goToMediaAccessPage() { activateSettingsItem("privacy", "privacySettings") return activateSettingsItem("privacy.mediaAccess", "mediaAccessSettings") } diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_Suggestions.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_Suggestions.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_Suggestions.qml 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_Suggestions.qml 2016-04-13 15:22:01.000000000 +0000 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 import QtTest 1.0 import Ubuntu.Test 1.0 import "../../../src/app/webbrowser" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_TabsBar.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_TabsBar.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/tst_TabsBar.qml 2015-11-24 12:03:47.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/tst_TabsBar.qml 2016-04-13 15:22:01.000000000 +0000 @@ -18,7 +18,6 @@ import QtQuick 2.4 import QtTest 1.0 -import Ubuntu.Test 1.0 import "../../../src/app/webbrowser" import webbrowserapp.private 0.1 @@ -87,7 +86,7 @@ signalName: "reload" } - UbuntuTestCase { + WebbrowserTestCase { name: "TabsBar" when: windowShown @@ -95,12 +94,6 @@ return findChild(menu, "tab_action_" + actionName + "_button") } - function clickItem(item, button) { - if (button === undefined) button = Qt.LeftButton - var center = centerOf(item) - mouseClick(item, center.x, center.y, button) - } - function getTabDelegate(index) { var container = findChild(tabs, "tabsContainer") for (var i = 0; i < container.children.length; ++i) { diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/WebbrowserTestCase.qml webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/WebbrowserTestCase.qml --- webbrowser-app-0.23+16.04.20151124/tests/unittests/qml/WebbrowserTestCase.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/qml/WebbrowserTestCase.qml 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,62 @@ +/* + * Copyright 2015 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import QtQuick 2.4 +import Ubuntu.Test 1.0 + +UbuntuTestCase { + function clickItem(item, button) { + if (button === undefined) button = Qt.LeftButton + var center = centerOf(item) + mouseClick(item, center.x, center.y, button) + } + + function longPressItem(item, button) { + if (button === undefined) button = Qt.LeftButton + var center = centerOf(item) + mouseLongPress(item, center.x, center.y, button) + mouseRelease(item, center.x, center.y, button) + } + + function getListItems(listview, itemName) { + waitForRendering(listview) + var items = [] + if (listview) { + // ensure all the delegates are created + listview.cacheBuffer = listview.count * 1000 + + // In some cases the ListView might add other children to the + // contentItem, so we filter the list of children to include + // only actual delegates (names for delegates in this case + // follow the pattern "name_index") + var children = listview.contentItem.children + for (var i = 0; i < children.length; i++) { + if (children[i].objectName.indexOf(itemName) == 0) { + items.push(children[i]) + } + } + } + return items + } + + function swipeToDeleteAndConfirm(listitem) { + flick(listitem, listitem.width / 10, listitem.height / 2, listitem.width / 2, 0) + var confirm = findChild(listitem, "actionbutton_leadingAction.delete") + clickItem(confirm) + } +} diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/single-instance-manager/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/single-instance-manager/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/single-instance-manager/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/single-instance-manager/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,17 @@ +find_package(Qt5Core REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5Test REQUIRED) +set(TEST tst_SingleInstanceManagerTests) +set(SOURCES + ${webbrowser-common_SOURCE_DIR}/single-instance-manager.cpp + tst_SingleInstanceManagerTests.cpp +) +add_executable(${TEST} ${SOURCES}) +include_directories(${webbrowser-common_SOURCE_DIR}) +target_link_libraries(${TEST} + Qt5::Core + Qt5::Network + Qt5::Test +) +add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) +set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal") diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,72 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Qt +#include +#include +#include +#include + +// local +#include "single-instance-manager.h" + +class SingleInstanceManagerTests : public QObject +{ + Q_OBJECT + +private: + SingleInstanceManager* singleton; + QSignalSpy* newInstanceSpy; + +private Q_SLOTS: + void init() + { + QStandardPaths::setTestModeEnabled(true); + singleton = new SingleInstanceManager(this); + newInstanceSpy = new QSignalSpy(singleton, SIGNAL(newInstanceLaunched(const QStringList&))); + } + + void cleanup() + { + delete newInstanceSpy; + delete singleton; + QStandardPaths::setTestModeEnabled(false); + } + + void test_cannot_run_twice_same_instance() + { + QVERIFY(singleton->run(QStringList())); + QVERIFY(!singleton->run(QStringList())); + QVERIFY(newInstanceSpy->isEmpty()); + } + + void test_arguments_passed_to_already_running_instance() + { + QVERIFY(singleton->run(QStringList())); + SingleInstanceManager other; + QStringList args; + args << QStringLiteral("foo") << QStringLiteral("bar") << QStringLiteral("baz"); + QVERIFY(!other.run(args)); + newInstanceSpy->wait(); + QCOMPARE(newInstanceSpy->first().at(0).toStringList(), args); + } +}; + +QTEST_MAIN(SingleInstanceManagerTests) + +#include "tst_SingleInstanceManagerTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/tabs-model/tst_TabsModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/tabs-model/tst_TabsModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/tabs-model/tst_TabsModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/tabs-model/tst_TabsModelTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * This file is part of webbrowser-app. * @@ -33,11 +33,11 @@ Q_OBJECT private: + QQmlEngine engine; TabsModel* model; QQuickItem* createTab() { - QQmlEngine engine; QQmlComponent component(&engine); QByteArray data("import QtQuick 2.4\nItem {\nproperty url url\n" "property string title\nproperty url icon\n}"); @@ -336,6 +336,42 @@ QCOMPARE(model->currentTab(), tab1); } + void shouldUpdateCurrentTabWhenInsertingAtCurrentIndex() + { + QQuickItem* tab1 = createTab(); + model->insert(tab1, 0); + QCOMPARE(model->currentIndex(), 0); + QCOMPARE(model->currentTab(), tab1); + + QSignalSpy spytab(model, SIGNAL(currentTabChanged())); + QSignalSpy spyindex(model, SIGNAL(currentIndexChanged())); + + QQuickItem* tab2 = createTab(); + model->insert(tab2, 0); + + QVERIFY(spyindex.isEmpty()); + QCOMPARE(spytab.count(), 1); + QCOMPARE(model->currentTab(), tab2); + } + + void shouldUpdateCurrentIndexWhenInsertingBeforeCurrentIndex() + { + model->insert(createTab(), 0); + model->insert(createTab(), 0); + model->setCurrentIndex(1); + QObject* current = model->currentTab(); + + QSignalSpy spytab(model, SIGNAL(currentTabChanged())); + QSignalSpy spyindex(model, SIGNAL(currentIndexChanged())); + + model->insert(createTab(), 0); + + QVERIFY(spytab.isEmpty()); + QCOMPARE(spyindex.count(), 1); + QCOMPARE(model->currentTab(), current); + QCOMPARE(model->currentIndex(), 2); + } + void shouldSetInvalidIndexWhenRemovingLastTab() { // Removing the last item should also set the current index to -1 diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/top-sites-model/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/top-sites-model/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/top-sites-model/CMakeLists.txt 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/top-sites-model/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -find_package(Qt5Core REQUIRED) -find_package(Qt5Sql REQUIRED) -find_package(Qt5Test REQUIRED) -set(TEST tst_TopSitesModelTests) -add_executable(${TEST} tst_TopSitesModelTests.cpp) -include_directories(${webbrowser-app_SOURCE_DIR}) -target_link_libraries(${TEST} - Qt5::Core - Qt5::Sql - Qt5::Test - webbrowser-app-models -) -add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -/* - * Copyright 2015 Canonical Ltd. - * - * This file is part of webbrowser-app. - * - * webbrowser-app is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3. - * - * webbrowser-app is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Qt -#include -#include - -// local -#include "history-model.h" -#include "history-timeframe-model.h" -#include "top-sites-model.h" - -class TopSitesModelTests : public QObject -{ - Q_OBJECT - -private: - HistoryModel* model; - HistoryTimeframeModel* timeframe; - TopSitesModel* topsites; - -private Q_SLOTS: - void init() - { - model = new HistoryModel; - model->setDatabasePath(":memory:"); - timeframe = new HistoryTimeframeModel; - timeframe->setSourceModel(model); - topsites = new TopSitesModel; - topsites->setSourceModel(timeframe); - } - - void cleanup() - { - delete topsites; - delete timeframe; - delete model; - } - - void shouldBeInitiallyEmpty() - { - QCOMPARE(topsites->rowCount(), 0); - } - - void shouldNotifyWhenChangingSourceModel() - { - QSignalSpy spy(topsites, SIGNAL(sourceModelChanged())); - topsites->setSourceModel(timeframe); - QVERIFY(spy.isEmpty()); - HistoryTimeframeModel* timeframe2 = new HistoryTimeframeModel; - topsites->setSourceModel(timeframe2); - QCOMPARE(spy.count(), 1); - QCOMPARE(topsites->sourceModel(), timeframe2); - topsites->setSourceModel(0); - QCOMPARE(spy.count(), 2); - QCOMPARE(topsites->sourceModel(), (HistoryTimeframeModel*) 0); - delete timeframe2; - } - - void shouldMatchAllWhenNothingIsHidden() - { - QSignalSpy spy(topsites, SIGNAL(countChanged())); - model->add(QUrl("http://example.org"), "Example Domain", QUrl()); - model->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(spy.count(), 2); - QCOMPARE(topsites->rowCount(), 2); - } - - void shouldFilterOutHiddenUrls() - { - QSignalSpy spy(topsites, SIGNAL(countChanged())); - model->add(QUrl("http://example.org"), "Example Domain", QUrl()); - model->add(QUrl("http://example.com"), "Example Domain", QUrl()); - QCOMPARE(spy.count(), 2); - QCOMPARE(topsites->rowCount(), 2); - model->hide(QUrl("http://example.org")); - QCOMPARE(spy.count(), 3); - QCOMPARE(topsites->rowCount(), 1); - QCOMPARE(topsites->data(topsites->index(0, 0), HistoryModel::Url).toUrl(), QUrl("http://example.com")); - } - - void shouldBeSortedByVisits() - { - model->add(QUrl("http://example.org/"), "Example Domain", QUrl()); - model->add(QUrl("http://ubuntu.com/"), "Ubuntu", QUrl()); - model->add(QUrl("http://ubuntu.com/"), "Ubuntu", QUrl()); - QCOMPARE(model->data(model->index(0, 0), HistoryModel::Domain).toString(), QString("ubuntu.com")); - QCOMPARE(model->data(model->index(1, 0), HistoryModel::Domain).toString(), QString("example.org")); - } -}; - -QTEST_MAIN(TopSitesModelTests) -#include "tst_TopSitesModelTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/webapp-container-color-helper/CMakeLists.txt webbrowser-app-0.23+16.04.20160413/tests/unittests/webapp-container-color-helper/CMakeLists.txt --- webbrowser-app-0.23+16.04.20151124/tests/unittests/webapp-container-color-helper/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/webapp-container-color-helper/CMakeLists.txt 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,17 @@ +find_package(Qt5Core REQUIRED) +find_package(Qt5Gui REQUIRED) +find_package(Qt5Test REQUIRED) +set(TEST tst_WebappContainerColorTests) +set(SOURCES + ${webapp-container_SOURCE_DIR}/webapp-container-helper.cpp + tst_WebappContainerColorTests.cpp +) +add_executable(${TEST} ${SOURCES}) +include_directories(${webapp-container_SOURCE_DIR}) +target_link_libraries(${TEST} + Qt5::Core + Qt5::Gui + Qt5::Test +) +add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml) +set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal") diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/webapp-container-color-helper/tst_WebappContainerColorTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/webapp-container-color-helper/tst_WebappContainerColorTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/webapp-container-color-helper/tst_WebappContainerColorTests.cpp 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/webapp-container-color-helper/tst_WebappContainerColorTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -0,0 +1,62 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This file is part of webbrowser-app. + * + * webbrowser-app is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * webbrowser-app is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Qt +#include +#include + +// local +#include "webapp-container-helper.h" + +class ContainerColorTests : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + + void cssColorToRgbTest_data() + { + QTest::addColumn("csscolor"); + QTest::addColumn("rgb"); + + QTest::newRow("Empty CSS color") << " " << ""; + QTest::newRow("Invalid CSS color") << " invalid " << ""; + QTest::newRow("Invalid RGB CSS color") << " rgb (1,1," << ""; + QTest::newRow("Invalid RGB CSS color 2") << " rgb (1,1 0)" << ""; + QTest::newRow("Invalid RGB CSS color 3") << " rgb (1, e, 0)" << ""; + QTest::newRow("Valid SVG name CSS color") << " red " << "255,0,0"; + QTest::newRow("Valid RGB CSS color") << " rgb (255, 0, 0) " << "255,0,0"; + QTest::newRow("Valid plain RGB CSS color") << " #FF0000 " << "255,0,0"; + QTest::newRow("Valid short plain RGB CSS color") << " #36699 " << "3,102,153"; + QTest::newRow("Valid shortest plain RGB CSS color") << " #366 " << "51,102,102"; + QTest::newRow("Valid very short plain RGB CSS color") << " #000 " << "0,0,0"; + QTest::newRow("Valid SVG name CSS color") << " #FF000044 " << "0,0,68"; + } + + void cssColorToRgbTest() + { + QFETCH(QString, csscolor); + QFETCH(QString, rgb); + + WebappContainerHelper helper; + QCOMPARE(helper.rgbColorFromCSSColor(csscolor), rgb); + } +}; + +QTEST_MAIN(ContainerColorTests) +#include "tst_WebappContainerColorTests.moc" diff -Nru webbrowser-app-0.23+16.04.20151124/tests/unittests/webapp-container-hook/tst_WebappContainerHookTests.cpp webbrowser-app-0.23+16.04.20160413/tests/unittests/webapp-container-hook/tst_WebappContainerHookTests.cpp --- webbrowser-app-0.23+16.04.20151124/tests/unittests/webapp-container-hook/tst_WebappContainerHookTests.cpp 2015-11-24 12:03:41.000000000 +0000 +++ webbrowser-app-0.23+16.04.20160413/tests/unittests/webapp-container-hook/tst_WebappContainerHookTests.cpp 2016-04-13 15:22:01.000000000 +0000 @@ -148,7 +148,7 @@ } } - void testClickHookInstall() + void testClickHookInstallProcessing() { QString processedHookFilename = "com.ubuntu.blabla_blabla";