diff -Nru webbrowser-app-0.22+13.10.20131007.2/CMakeLists.txt webbrowser-app-0.22+13.10.20131011.1/CMakeLists.txt --- webbrowser-app-0.22+13.10.20131007.2/CMakeLists.txt 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/CMakeLists.txt 2013-10-11 11:17:31.000000000 +0000 @@ -62,4 +62,5 @@ install(FILES webbrowser-app.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps) - +install(FILES screenshot.png + DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app) diff -Nru webbrowser-app-0.22+13.10.20131007.2/debian/changelog webbrowser-app-0.22+13.10.20131011.1/debian/changelog --- webbrowser-app-0.22+13.10.20131007.2/debian/changelog 2013-10-11 12:01:15.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/debian/changelog 2013-10-11 12:01:15.000000000 +0000 @@ -1,3 +1,26 @@ +webbrowser-app (0.22+13.10.20131011.1-0ubuntu1) saucy; urgency=low + + [ Bill Filler ] + * fixes a regression with the G+ homepage not scrolling properly + without a proper user-agent string + * Ship a screenshot of the app for the apps lens. + * Use consistently select_single(…) and select_many(…) in the + emulator. + * Allow client applications that embed an UbuntuWebView to define + their own override mechanism that will take precedence over the + default one. + * Fix 1237548: webapps shouldn't expose a org.freedesktop.Application + interface on DBUS (LP: #1237548) + * Expose the correct DPR on the UbuntuWebView component. + + [ David Barth ] + * Fix a problem with Facebook images being served at low-resolution. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 386 + + -- Ubuntu daily release Fri, 11 Oct 2013 11:17:44 +0000 + webbrowser-app (0.22+13.10.20131007.2-0ubuntu1) saucy; urgency=low [ Alexandre Abreu ] diff -Nru webbrowser-app-0.22+13.10.20131007.2/debian/control webbrowser-app-0.22+13.10.20131011.1/debian/control --- webbrowser-app-0.22+13.10.20131007.2/debian/control 2013-10-11 12:01:15.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/debian/control 2013-10-11 12:01:15.000000000 +0000 @@ -10,6 +10,7 @@ libqt5sql5-sqlite, libqt5v8-5-private-dev, libqt5webkit5-dev, + libqt5webkit5-qmlwebkitplugin, qt5-default, qt5-qmake, qtbase5-dev, diff -Nru webbrowser-app-0.22+13.10.20131007.2/debian/copyright webbrowser-app-0.22+13.10.20131011.1/debian/copyright --- webbrowser-app-0.22+13.10.20131007.2/debian/copyright 2013-10-11 12:01:15.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/debian/copyright 2013-10-11 12:01:15.000000000 +0000 @@ -18,7 +18,7 @@ On Debian systems, the full text of the GNU General Public License version 3 can be found in the file /usr/share/common-licenses/GPL-3. -Files: */assets/* *.svg +Files: */assets/* *.png *.svg Copyright: 2013 Canonical Ltd. License: CC-BY-SA-3.0 This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 diff -Nru webbrowser-app-0.22+13.10.20131007.2/po/de.po webbrowser-app-0.22+13.10.20131011.1/po/de.po --- webbrowser-app-0.22+13.10.20131007.2/po/de.po 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/po/de.po 2013-10-11 11:17:31.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-10-03 10:18+0200\n" -"PO-Revision-Date: 2013-09-29 17:49+0000\n" +"PO-Revision-Date: 2013-10-09 18:42+0000\n" "Last-Translator: Phillip Sz \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-05 06:16+0000\n" -"X-Generator: Launchpad (build 16791)\n" +"X-Launchpad-Export-Date: 2013-10-10 05:26+0000\n" +"X-Generator: Launchpad (build 16799)\n" #: src/app/ActivityView.qml:36 src/app/Chrome.qml:127 msgid "Activity" @@ -42,7 +42,7 @@ #: src/app/AuthenticationDialog.qml:26 #, qt-format msgid "The website %1 requires authentication." -msgstr "" +msgstr "Die Website %1 erfordert eine Authentifizierung." #: src/app/AuthenticationDialog.qml:34 msgid "Username" @@ -157,7 +157,7 @@ #: src/app/CertificateVerificationDialog.qml:24 msgid "This connection is untrusted" -msgstr "" +msgstr "Diese Verbindung ist nicht vertrauenswürdig." #. TRANSLATORS: %1 refers to the hostname #: src/app/CertificateVerificationDialog.qml:26 @@ -166,6 +166,8 @@ "You are trying to securely reach %1, but the security certificate of this " "website is not trusted." msgstr "" +"Sie versuchen eine sichere Verbindung zu %1 aufzubauen, aber das " +"Sicherheitszertifikat dieser Website ist nicht vertrauenswürdig." #: src/app/CertificateVerificationDialog.qml:29 msgid "Proceed anyway" @@ -224,7 +226,7 @@ #: src/app/ProxyAuthenticationDialog.qml:24 #, qt-format msgid "The website %1:%2 requires authentication." -msgstr "" +msgstr "Der Website %1:%2 erfordert eine Authentifizierung." #. TRANSLATORS: %1 refers to the number of open tabs #: src/app/TabsList.qml:34 diff -Nru webbrowser-app-0.22+13.10.20131007.2/po/km.po webbrowser-app-0.22+13.10.20131011.1/po/km.po --- webbrowser-app-0.22+13.10.20131007.2/po/km.po 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/po/km.po 2013-10-11 11:17:31.000000000 +0000 @@ -0,0 +1,293 @@ +# Khmer translation for webbrowser-app +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: webbrowser-app\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-10-03 10:18+0200\n" +"PO-Revision-Date: 2013-10-11 03:05+0000\n" +"Last-Translator: Khoem Sokhem \n" +"Language-Team: Khmer \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-10-11 05:30+0000\n" +"X-Generator: Launchpad (build 16799)\n" + +#: src/app/ActivityView.qml:36 src/app/Chrome.qml:127 +msgid "Activity" +msgstr "សកម្មភាព" + +#: src/app/ActivityView.qml:52 +msgid "Bookmarks" +msgstr "ចំណាំ" + +#: src/app/AlertDialog.qml:24 +msgid "JavaScript Alert" +msgstr "ការជូនដំណឹង JavaScript" + +#: src/app/AlertDialog.qml:28 src/app/AuthenticationDialog.qml:47 +#: src/app/ConfirmDialog.qml:28 src/app/PromptDialog.qml:34 +msgid "OK" +msgstr "យល់ព្រម" + +#: src/app/AuthenticationDialog.qml:24 +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 +msgid "Username" +msgstr "អ្នកប្រើ" + +#: src/app/AuthenticationDialog.qml:41 +msgid "Password" +msgstr "ពាក្យសម្ងាត់" + +#: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:33 +#: src/app/PromptDialog.qml:40 +msgid "Cancel" +msgstr "បោះបង់" + +#: src/app/Browser.qml:62 +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/Browser.qml:65 +msgid "Address;URL;www" +msgstr "អាសយដ្ឋាន;URL;www" + +#: src/app/Browser.qml:71 src/app/Chrome.qml:72 +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/Browser.qml:74 +msgid "Older Page" +msgstr "ទំព័រចាស់ជាង" + +#: src/app/Browser.qml:79 src/app/Chrome.qml:91 +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/Browser.qml:82 +msgid "Newer Page" +msgstr "ទំព័រថ្មីជាង" + +#: src/app/Browser.qml:87 +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/Browser.qml:90 +msgid "Leave Page" +msgstr "ចេញពីទំព័រ" + +#: src/app/Browser.qml:95 +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/Browser.qml:98 +msgid "Add This Page to Bookmarks" +msgstr "បន្ថែមទំព័រនេះទៅចំណាំ" + +#: src/app/Browser.qml:103 +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/Browser.qml:106 +msgid "Open a New Tab" +msgstr "បើកផ្ទាំងថ្មី" + +#: src/app/Browser.qml:111 +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/Browser.qml:114 +msgid "Clear Navigation History" +msgstr "សម្អាតប្រវត្តិរុករក" + +#: src/app/Browser.qml:359 +msgid "Copy" +msgstr "ចម្លង" + +#: src/app/Browser.qml:366 +msgid "Open link in new tab" +msgstr "បើកតំណក្នុងផ្ទាំងថ្មី" + +#: src/app/Browser.qml:371 +msgid "Bookmark link" +msgstr "តំណចំណាំ" + +#: src/app/Browser.qml:376 +msgid "Copy link" +msgstr "ចម្លងតំណ" + +#: src/app/Browser.qml:381 +msgid "Open image in new tab" +msgstr "បើករូបភាពក្នុងផ្ទាំងថ្មី" + +#: src/app/Browser.qml:386 +msgid "Copy image" +msgstr "ចម្លងរូបភាព" + +#: src/app/Browser.qml:397 +msgid "This page wants to know your device’s location." +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 "" +"អ្នកកំពុងព្យាយាមចូល %1 ដោយសុវត្ថិភាព, " +"ប៉ុន្តែវិញ្ញាបនបត្រសុវត្ថិភាពរបស់តំបន់បណ្ដាញមិនទុកចិត្ត។" + +#: src/app/CertificateVerificationDialog.qml:29 +msgid "Proceed anyway" +msgstr "អញ្ចឹង បន្ត" + +#: src/app/CertificateVerificationDialog.qml:35 +msgid "Back to safety" +msgstr "ត្រឡប់ទៅសុវត្ថិភាព" + +#: src/app/ConfirmDialog.qml:24 +msgid "JavaScript Confirmation" +msgstr "ការបញ្ជាក់ JavaScript" + +#: src/app/ErrorSheet.qml:38 +msgid "Network Error" +msgstr "កំហុសបណ្ដាញ" + +#. TRANSLATORS: %1 refers to the URL of the current page +#: src/app/ErrorSheet.qml:44 +#, qt-format +msgid "It appears you are having trouble viewing: %1." +msgstr "វាបង្ហាញថា អ្នកកំពុងមានបញ្ហាក្នុងការមើល៖ %1 ។" + +#: src/app/ErrorSheet.qml:50 +msgid "" +"Ubuntu suggests you check your network settings and try refreshing the page." +msgstr "" +"Ubuntu ស្នើឲ្យអ្នកពិនិត្យការកំណត់បណ្ដាញរបស់អ្នក " +"និងព្យាយាមផ្ទុកទំព័រឡើងវិញ។" + +#: src/app/ErrorSheet.qml:55 +msgid "Refresh page" +msgstr "ផ្ទុកទំព័រឡើងវិញ" + +#: src/app/PermissionRequest.qml:28 +msgid "Permission Request" +msgstr "ស្នើសិទ្ធិ" + +#: src/app/PermissionRequest.qml:31 +msgid "Deny" +msgstr "បដិសេធ" + +#: src/app/PermissionRequest.qml:40 +msgid "Allow" +msgstr "អនុញ្ញាត" + +#: src/app/PromptDialog.qml:24 +msgid "JavaScript Prompt" +msgstr "ប្រាប់ JavaScript" + +#: 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 "តំបន់បណ្ដាញ %1:%2 ទាមទារការផ្ទៀងផ្ទាត់។" + +#. TRANSLATORS: %1 refers to the number of open tabs +#: src/app/TabsList.qml:34 +#, qt-format +msgid "Currently viewing (%1)" +msgstr "បច្ចុប្បន្នមើល (%1)" + +#: src/app/TabsList.qml:65 +msgid "+" +msgstr "+" + +#: src/app/TimelineView.qml:87 +msgid "Today" +msgstr "ថ្ងៃនេះ" + +#: src/app/TimelineView.qml:89 +msgid "Yesterday" +msgstr "ម្សិលមិញ" + +#: src/app/TimelineView.qml:91 +msgid "Last 7 Days" +msgstr "៧ ថ្ងៃចុងក្រោយ" + +#: src/app/TimelineView.qml:93 +msgid "This Month" +msgstr "ខែនេះ" + +#: src/app/TimelineView.qml:95 +msgid "This Year" +msgstr "ឆ្នាំនេះ" + +#: src/app/TimelineView.qml:97 +msgid "Older" +msgstr "ចាស់ជាង" + +#: src/app/TimelineView.qml:271 +msgid "(local files)" +msgstr "(ឯកសារមូលដ្ឋាន)" + +#: src/app/TimelineView.qml:273 +msgid "(other)" +msgstr "(ផ្សេងៗ)" + +#: src/app/webbrowser-app.desktop.in:3 +msgid "Browser" +msgstr "កម្មវិធីរុករក" + +#: src/app/webbrowser-app.desktop.in:4 +msgid "Web Browser" +msgstr "កម្មវិធីរុករកបណ្ដាញ" + +#: src/app/webbrowser-app.desktop.in:5 +msgid "Browse the World Wide Web" +msgstr "រកមើលវើលវ៉ាយវិប" + +#. TRANSLATORS: %1 refers to the current page’s title +#: src/app/webbrowser-app.qml:49 +#, qt-format +msgid "%1 - Ubuntu Web Browser" +msgstr "%1 - កម្មវិធីរុករកបណ្ដាញរបស់ Ubuntu" + +#: src/app/webbrowser-app.qml:51 +msgid "Ubuntu Web Browser" +msgstr "កម្មវិធីរុករកបណ្ដាញរបស់ Ubuntu" diff -Nru webbrowser-app-0.22+13.10.20131007.2/po/my.po webbrowser-app-0.22+13.10.20131011.1/po/my.po --- webbrowser-app-0.22+13.10.20131007.2/po/my.po 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/po/my.po 2013-10-11 11:17:31.000000000 +0000 @@ -8,54 +8,54 @@ "Project-Id-Version: webbrowser-app\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-10-03 10:18+0200\n" -"PO-Revision-Date: 2013-05-18 10:50+0000\n" +"PO-Revision-Date: 2013-10-09 11:30+0000\n" "Last-Translator: Pyae Sone \n" "Language-Team: Burmese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-05 06:16+0000\n" -"X-Generator: Launchpad (build 16791)\n" +"X-Launchpad-Export-Date: 2013-10-10 05:26+0000\n" +"X-Generator: Launchpad (build 16799)\n" #: src/app/ActivityView.qml:36 src/app/Chrome.qml:127 msgid "Activity" -msgstr "" +msgstr "လုပ်ဆောင်ချက်များ" #: src/app/ActivityView.qml:52 msgid "Bookmarks" -msgstr "" +msgstr "မှတ်သားချက်များ" #: src/app/AlertDialog.qml:24 msgid "JavaScript Alert" -msgstr "" +msgstr "JavaScript သတိပေးချက်" #: src/app/AlertDialog.qml:28 src/app/AuthenticationDialog.qml:47 #: src/app/ConfirmDialog.qml:28 src/app/PromptDialog.qml:34 msgid "OK" -msgstr "" +msgstr "အိုကေ" #: src/app/AuthenticationDialog.qml:24 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 "" +msgstr "Website %1 သည်ခွင့်ပြုချက်လိုအပ်သည်။" #: src/app/AuthenticationDialog.qml:34 msgid "Username" -msgstr "" +msgstr "အသုံးပြုသူအမည်" #: src/app/AuthenticationDialog.qml:41 msgid "Password" -msgstr "" +msgstr "စကားဝှက်" #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:33 #: src/app/PromptDialog.qml:40 msgid "Cancel" -msgstr "" +msgstr "ပယ်ဖျက်မည်" #: src/app/Browser.qml:62 msgid "Goto" @@ -119,7 +119,7 @@ #: src/app/Browser.qml:111 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. @@ -133,31 +133,31 @@ #: src/app/Browser.qml:366 msgid "Open link in new tab" -msgstr "" +msgstr "Tab အသစ်တွင် Link ကိုဖွင့်မည်" #: src/app/Browser.qml:371 msgid "Bookmark link" -msgstr "" +msgstr "link ကိုမှတ်ထားမည်" #: src/app/Browser.qml:376 msgid "Copy link" -msgstr "" +msgstr "Link ကိုကူးမည်" #: src/app/Browser.qml:381 msgid "Open image in new tab" -msgstr "" +msgstr "ပုံကို Tab အသစ်နှင့်ဖွင့်မည်" #: src/app/Browser.qml:386 msgid "Copy image" -msgstr "" +msgstr "ပုံကိုကူးမည်" #: src/app/Browser.qml:397 msgid "This page wants to know your device’s location." -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 @@ -169,15 +169,15 @@ #: src/app/CertificateVerificationDialog.qml:29 msgid "Proceed anyway" -msgstr "" +msgstr "မရမကရှေ့ဆက်လုပ်မည်" #: src/app/CertificateVerificationDialog.qml:35 msgid "Back to safety" -msgstr "" +msgstr "လုံခြုံသည့်နေရာသို့ပြန်သွားမည်" #: src/app/ConfirmDialog.qml:24 msgid "JavaScript Confirmation" -msgstr "" +msgstr "JavaScript အတည်ပြုခြင်း" #: src/app/ErrorSheet.qml:38 msgid "Network Error" @@ -200,15 +200,15 @@ #: src/app/PermissionRequest.qml:28 msgid "Permission Request" -msgstr "" +msgstr "ခွင့်ပြုချက်တောင်းခံခြင်း" #: src/app/PermissionRequest.qml:31 msgid "Deny" -msgstr "" +msgstr "ငြင်းပယ်" #: src/app/PermissionRequest.qml:40 msgid "Allow" -msgstr "" +msgstr "ခွင့်ပြု" #: src/app/PromptDialog.qml:24 msgid "JavaScript Prompt" @@ -216,13 +216,13 @@ #: src/app/ProxyAuthenticationDialog.qml:22 msgid "Proxy authentication required." -msgstr "" +msgstr "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 "Website %1:%2 သည်ခွင့်ပြုချက်ကိုလိုအပ်သည်။" #. TRANSLATORS: %1 refers to the number of open tabs #: src/app/TabsList.qml:34 @@ -232,31 +232,31 @@ #: src/app/TabsList.qml:65 msgid "+" -msgstr "" +msgstr "+" #: src/app/TimelineView.qml:87 msgid "Today" -msgstr "" +msgstr "ယနေ့" #: src/app/TimelineView.qml:89 msgid "Yesterday" -msgstr "" +msgstr "မနေ့က" #: src/app/TimelineView.qml:91 msgid "Last 7 Days" -msgstr "" +msgstr "လွန်ခဲ့သော ၇ ရက်က" #: src/app/TimelineView.qml:93 msgid "This Month" -msgstr "" +msgstr "ဒီလ" #: src/app/TimelineView.qml:95 msgid "This Year" -msgstr "" +msgstr "ဒီနှစ်" #: src/app/TimelineView.qml:97 msgid "Older" -msgstr "" +msgstr "အဟောင်း" #: src/app/TimelineView.qml:271 msgid "(local files)" @@ -264,7 +264,7 @@ #: src/app/TimelineView.qml:273 msgid "(other)" -msgstr "" +msgstr "(တခြား)" #: src/app/webbrowser-app.desktop.in:3 msgid "Browser" Binary files /tmp/Rwr0xTTtSW/webbrowser-app-0.22+13.10.20131007.2/screenshot.png and /tmp/O5xQtoG86N/webbrowser-app-0.22+13.10.20131011.1/screenshot.png differ diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml --- webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml 2013-10-11 11:17:31.000000000 +0000 @@ -28,11 +28,13 @@ signal newTabRequested(url url) - property real devicePixelRatio: 1.0 - onDevicePixelRatioChanged: { - // Do not make this patch to QtWebKit a hard requirement. - if (experimental.hasOwnProperty('devicePixelRatio')) { - experimental.devicePixelRatio = devicePixelRatio + QtObject { + property real devicePixelRatio: QtWebKitDPR + onDevicePixelRatioChanged: { + // Do not make this patch to QtWebKit a hard requirement. + if (_webview.experimental.hasOwnProperty('devicePixelRatio')) { + _webview.experimental.devicePixelRatio = devicePixelRatio + } } } @@ -50,6 +52,19 @@ UserAgent { id: userAgent } + function getSystemWideUAString(url) { + return userAgent.getUAString(url) + } + /** + * This function can be overridden by client applications that embed an + * UbuntuWebView to provide a custom UA string override mechanism. + * The default implementation calls the default override mechanism. + * To get the value that the default override mechanism would return, + * client applications can call getSystemWideUAString(url). + */ + function getUAString(url) { + return getSystemWideUAString(url) + } experimental.userAgent: userAgent.defaultUA onNavigationRequested: { request.action = WebView.AcceptRequest; @@ -58,7 +73,7 @@ if (request.action === WebView.IgnoreRequest) return; - _webview.experimental.userAgent = userAgent.getUAString(request.url) + _webview.experimental.userAgent = _webview.getUAString(request.url) } experimental.preferences.navigatorQtObjectEnabled: true diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/plugin.cpp webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/plugin.cpp --- webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/plugin.cpp 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/plugin.cpp 2013-10-11 11:17:31.000000000 +0000 @@ -35,9 +35,18 @@ #include #include +static float getQtWebkitDpr() +{ + QByteArray stringValue = qgetenv("QTWEBKIT_DPR"); + bool ok = false; + float value = stringValue.toFloat(&ok); + return ok ? value : 1.0; +} + void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri) { Q_UNUSED(uri); + QDir dataLocation(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); if (!dataLocation.exists()) { QDir::root().mkpath(dataLocation.absolutePath()); @@ -45,6 +54,10 @@ QQmlContext* context = engine->rootContext(); context->setContextProperty("dataLocation", dataLocation.absolutePath()); + // Set the desired pixel ratio (not needed once we use Qt’s way of + // calculating the proper pixel ratio by device/screen). + context->setContextProperty("QtWebKitDPR", getQtWebkitDpr()); + // This singleton lives in its own thread to ensure that // disk I/O is not performed in the UI thread. WebThumbnailUtils& utils = WebThumbnailUtils::instance(); diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/qmldir webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/qmldir --- webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/qmldir 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/qmldir 2013-10-11 11:17:31.000000000 +0000 @@ -1,3 +1,4 @@ module Ubuntu.Components.Extras.Browser plugin ubuntu-ui-extras-browser-plugin UbuntuWebView 0.1 UbuntuWebView.qml +UserAgent 0.1 UserAgent.qml diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/ua-overrides.js webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/ua-overrides.js --- webbrowser-app-0.22+13.10.20131007.2/src/Ubuntu/Components/Extras/Browser/ua-overrides.js 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/Ubuntu/Components/Extras/Browser/ua-overrides.js 2013-10-11 11:17:31.000000000 +0000 @@ -37,6 +37,9 @@ // Android as a reference. var overrides = { + // Google+ is special, scroll doesn't work with an AppleWebkit personality + "plus.google.com": ["Mobile", "Android; Mobile"], + "google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"], "google.co.in": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"], "google.de": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"], @@ -100,6 +103,10 @@ "dailymotion.com": ["Mobile", "Android; Mobile Safari"], "amazon.co.uk": ["Mobile", "Android; Mobile"], "ebay.co.uk": ["Mobile", "Android; Mobile"], - "facebook.com": [/WebKit\/[.0-9]*/, "Apple$& Firefox/18"], + + "facebook.com": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) AppleWebKit/$1 Ubuntu Mobile"], + // Akamai serves images for Facebook + "akamaihd.net": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) AppleWebKit/$1 Ubuntu Mobile"], + "nytimes.com": ["Mobile", "Android; Mobile Safari"], }; diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/app/Browser.qml webbrowser-app-0.22+13.10.20131011.1/src/app/Browser.qml --- webbrowser-app-0.22+13.10.20131007.2/src/app/Browser.qml 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/app/Browser.qml 2013-10-11 11:17:31.000000000 +0000 @@ -29,7 +29,6 @@ id: browser property bool chromeless: false - property real qtwebkitdpr property bool developerExtrasEnabled: false property var webappUrlPatterns: null @@ -358,8 +357,6 @@ enabled: stack.depth === 0 visible: tabsModel.currentWebview === webview - devicePixelRatio: browser.qtwebkitdpr - experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled experimental.certificateVerificationDialog: CertificateVerificationDialog { } @@ -495,23 +492,6 @@ } } - // 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: { - if ( ! webapp) { - for (var i = 0; i < uris.length; ++i) { - newTab(uris[i], i == uris.length - 1); - } - } - } - } - function isRunningAsANamedWebapp() { return browser.webappName && typeof(browser.webappName) === 'string' && browser.webappName.length != 0 } diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/app/CMakeLists.txt webbrowser-app-0.22+13.10.20131011.1/src/app/CMakeLists.txt --- webbrowser-app-0.22+13.10.20131007.2/src/app/CMakeLists.txt 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/app/CMakeLists.txt 2013-10-11 11:17:31.000000000 +0000 @@ -35,8 +35,9 @@ FILES_MATCHING PATTERN *.png) set(DESKTOP_FILE webbrowser-app.desktop) +configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY) file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}) -file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS) +file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS) foreach(LINE ${DESKTOP_FILE_CONTENTS}) string(REGEX REPLACE "tr\\$\"(.*)\"\\$" "\\1" LINE "${LINE}") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n") diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.cpp webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.cpp --- webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.cpp 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.cpp 2013-10-11 11:17:31.000000000 +0000 @@ -32,17 +32,6 @@ #include "webbrowser-app.h" #include "webbrowser-window.h" - -static float getQtWebkitDpr() -{ - const char* envVar = "QTWEBKIT_DPR"; - QByteArray stringValue = qgetenv(envVar); - bool ok; - float value = stringValue.toFloat(&ok); - float defaultValue = 1.0; - return ok ? value : defaultValue; -} - WebBrowserApp::WebBrowserApp(int& argc, char** argv) : QApplication(argc, argv) , m_arguments(0) @@ -136,6 +125,11 @@ browser->setProperty("webapp", m_arguments->webapp()); browser->setProperty("webappName", m_arguments->webappName()); + if ( ! m_arguments->webapp()) + { + browser->setProperty("enableUriHandling", true); + } + CommandLineParser::ChromeElementFlags chromeFlags = m_arguments->chromeFlags(); if (chromeFlags != 0) { @@ -158,11 +152,6 @@ browser->setProperty("webappUrlPatterns", urlPatterns); } - // Set the desired pixel ratio (not needed once we use Qt's way of calculating - // the proper pixel ratio by device/screen) - float webkitDpr = getQtWebkitDpr(); - browser->setProperty("qtwebkitdpr", webkitDpr); - // When a webapp is being launched (by name), the url is pulled from its 'homepage'. QUrl url; if (m_arguments->webappName().isEmpty()) { diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.desktop.in webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.desktop.in --- webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.desktop.in 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.desktop.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=tr("Browser") -GenericName=tr("Web Browser") -Comment=tr("Browse the World Wide Web") -Type=Application -Icon=webbrowser-app -Exec=webbrowser-app %u -Terminal=false -Categories=Network;WebBrowser; -Keywords=Internet;WWW;Browser;Web;Explorer -MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https; -X-Ubuntu-Touch=true -X-Ubuntu-Gettext-Domain=webbrowser-app -X-Ubuntu-Single-Instance=true diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.desktop.in.in webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.desktop.in.in --- webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.desktop.in.in 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.desktop.in.in 2013-10-11 11:17:31.000000000 +0000 @@ -0,0 +1,16 @@ +[Desktop Entry] +Version=1.0 +Name=tr("Browser") +GenericName=tr("Web Browser") +Comment=tr("Browse the World Wide Web") +Type=Application +Icon=webbrowser-app +Exec=webbrowser-app %u +Terminal=false +Categories=Network;WebBrowser; +Keywords=Internet;WWW;Browser;Web;Explorer +MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https; +X-Ubuntu-Touch=true +X-Ubuntu-Gettext-Domain=webbrowser-app +X-Ubuntu-Single-Instance=true +X-Screenshot=@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app/screenshot.png diff -Nru webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.qml webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.qml --- webbrowser-app-0.22+13.10.20131007.2/src/app/webbrowser-app.qml 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/src/app/webbrowser-app.qml 2013-10-11 11:17:31.000000000 +0000 @@ -22,7 +22,6 @@ Window { property alias chromeless: browser.chromeless - property alias qtwebkitdpr: browser.qtwebkitdpr property alias developerExtrasEnabled: browser.developerExtrasEnabled property alias webappUrlPatterns: browser.webappUrlPatterns @@ -35,6 +34,8 @@ property alias webappName: browser.webappName property alias webappModelSearchPath: browser.webappModelSearchPath + property bool enableUriHandling: false + contentOrientation: browser.screenOrientation width: 800 @@ -63,4 +64,20 @@ function newTab(url, setCurrent) { return browser.newTab(url, setCurrent) } + + // 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: enableUriHandling ? UriHandler : null + onOpened: { + for (var i = 0; i < uris.length; ++i) { + newTab(uris[i], i == uris.length - 1); + } + } + } + } diff -Nru webbrowser-app-0.22+13.10.20131007.2/tests/autopilot/webbrowser_app/emulators/browser.py webbrowser-app-0.22+13.10.20131011.1/tests/autopilot/webbrowser_app/emulators/browser.py --- webbrowser-app-0.22+13.10.20131007.2/tests/autopilot/webbrowser_app/emulators/browser.py 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/tests/autopilot/webbrowser_app/emulators/browser.py 2013-10-11 11:17:31.000000000 +0000 @@ -36,7 +36,7 @@ def get_address_bar_clear_button(self): textfield = self.get_address_bar_text_field() - return textfield.get_children_by_type("AbstractButton")[0] + return textfield.select_single("AbstractButton") def get_address_bar_action_button(self): textfield = self.get_address_bar_text_field() @@ -57,18 +57,18 @@ return self.select_single("ErrorSheet") def get_address_bar_text_field(self): - return self.get_address_bar().get_children_by_type("TextField")[0] + return self.get_address_bar().select_single("TextField") def get_address_bar_suggestions(self): return self.select_single("Suggestions") def get_address_bar_suggestions_listview(self): suggestions = self.get_address_bar_suggestions() - return suggestions.get_children_by_type("QQuickListView")[0] + return suggestions.select_single("QQuickListView") def get_address_bar_suggestions_listview_entries(self): listview = self.get_address_bar_suggestions_listview() - return listview.get_children()[0].get_children_by_type("Base") + return listview.select_many("Base") def get_activity_view(self): try: diff -Nru webbrowser-app-0.22+13.10.20131007.2/tests/unittests/qml/CMakeLists.txt webbrowser-app-0.22+13.10.20131011.1/tests/unittests/qml/CMakeLists.txt --- webbrowser-app-0.22+13.10.20131007.2/tests/unittests/qml/CMakeLists.txt 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/tests/unittests/qml/CMakeLists.txt 2013-10-11 11:17:31.000000000 +0000 @@ -1,7 +1,7 @@ set(TEST tst_QmlTests) add_executable(${TEST} tst_QmlTests.cpp) qt5_use_modules(${TEST} Core Qml Quick Test QuickTest) -add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}) +add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -import ${CMAKE_BINARY_DIR}/src) set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal") # copy qml files under test to build dir @@ -13,14 +13,6 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${webbrowser-app_SOURCE_DIR}/${qmlFile} ${CMAKE_CURRENT_BINARY_DIR}/undertest/${qmlFile}) list(APPEND out_qml_files undertest/${qmlFile}) endforeach(qmlFile) -file(GLOB qmlFiles RELATIVE ${webbrowser-plugin_SOURCE_DIR} ${webbrowser-plugin_SOURCE_DIR}/*.qml - ${webbrowser-plugin_SOURCE_DIR} ${webbrowser-plugin_SOURCE_DIR}/*.js) -foreach(qmlFile ${qmlFiles}) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/undertest/${qmlFile} - DEPENDS ${webbrowser-plugin_SOURCE_DIR}/${qmlFile} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${webbrowser-plugin_SOURCE_DIR}/${qmlFile} ${CMAKE_CURRENT_BINARY_DIR}/undertest/${qmlFile}) - list(APPEND out_qml_files undertest/${qmlFile}) -endforeach(qmlFile) add_custom_target(copy_qml_files_under_test_to_build_dir DEPENDS ${out_qml_files}) add_dependencies(${TEST} copy_qml_files_under_test_to_build_dir) diff -Nru webbrowser-app-0.22+13.10.20131007.2/tests/unittests/qml/tst_UbuntuWebView.qml webbrowser-app-0.22+13.10.20131011.1/tests/unittests/qml/tst_UbuntuWebView.qml --- webbrowser-app-0.22+13.10.20131007.2/tests/unittests/qml/tst_UbuntuWebView.qml 1970-01-01 00:00:00.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/tests/unittests/qml/tst_UbuntuWebView.qml 2013-10-11 11:17:31.000000000 +0000 @@ -0,0 +1,56 @@ +/* + * 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 . + */ + +import QtQuick 2.0 +import QtTest 1.0 +import Ubuntu.Components.Extras.Browser 0.1 + +TestCase { + name: "UbuntuWebView" + + function test_custom_UA_override() { + var url = "http://example.com" + compare(webview1.getUAString(url), benchmark.getSystemWideUAString(url)) + webview2.customUA = false + compare(webview2.getUAString(url), benchmark.getSystemWideUAString(url)) + webview2.customUA = true + compare(webview2.getUAString(url), "custom UA") + } + + UbuntuWebView { + id: benchmark + } + + UbuntuWebView { + id: webview1 + } + + UbuntuWebView { + id: webview2 + + property bool customUA + + function getUAString(url) { + if (customUA) { + return "custom UA" + } else { + return getSystemWideUAString(url) + } + } + } +} diff -Nru webbrowser-app-0.22+13.10.20131007.2/tests/unittests/qml/tst_UserAgent.qml webbrowser-app-0.22+13.10.20131011.1/tests/unittests/qml/tst_UserAgent.qml --- webbrowser-app-0.22+13.10.20131007.2/tests/unittests/qml/tst_UserAgent.qml 2013-10-07 21:30:29.000000000 +0000 +++ webbrowser-app-0.22+13.10.20131011.1/tests/unittests/qml/tst_UserAgent.qml 2013-10-11 11:17:31.000000000 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtTest 1.0 -import "undertest" +import Ubuntu.Components.Extras.Browser 0.1 TestCase { name: "UserAgent"