git.iko.soy/unity8
on xenial help sign in
Merge from trunk
commitdcfa9471ce3325489065f9317f5fca19a264fc1d authorMichael Terry <michael.terry@canonical.com> dateWed 12 Mar 2014, 10:12 (13 years ago) parent9a5fa7ba31b685
7 files changed+45−28
compare with xenial
unifiedsplit
debian/changelog+13 po/en_GB.po+11−9 po/fi.po+8−6 po/gl.po+5−5 qml/Dash/Apps/FrequentlyUsedAppsModel.qml+6−6 tests/autopilot/unity8/shell/tests/test_hud.py → tests/autopilot/unity8/shell/tests/disabled_test_hud.py+2−2 tests/mocks/data/applications/camera-app.desktop → tests/mocks/data/applications/webbrowser-app.desktop
debian/changelog+13
@@ -1,3 +1,16 @@
1+unity8 (7.84+14.04.20140306-0ubuntu1) trusty; urgency=low
2+
3+ [ Bill Filler ]
4+ * Convert gallery and camera to click
5+
6+ [ Michael Zanetti ]
7+ * Just disable HUD tests, without really disabling the HUD itself
8+
9+ [ Sergio Schvezov ]
10+ * Convert gallery and camera to click
11+
12+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 06 Mar 2014 16:45:46 +0000
13+
114unity8 (7.84+14.04.20140304-0ubuntu1) trusty; urgency=low
215
316 [ Michael Terry ]
po/en_GB.po+11−9
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-02-13 18:37+0000\n"
11−"PO-Revision-Date: 2014-01-14 20:46+0000\n"
12−"Last-Translator: Dan Bishop <dan@danbishop.org>\n"
11+"PO-Revision-Date: 2014-03-07 13:27+0000\n"
12+"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-02-19 05:44+0000\n"
19−"X-Generator: Launchpad (build 16916)\n"
18+"X-Launchpad-Export-Date: 2014-03-08 06:57+0000\n"
19+"X-Generator: Launchpad (build 16948)\n"
2020
2121#: plugins/Unity/Launcher/launcheritem.cpp:43
2222#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -72,6 +72,8 @@ msgid ""
7272"You have now mastered the edge gestures and can start using the "
7373"phone<br><br>Tap on the screen to start"
7474msgstr ""
75+"You have now mastered the edge gestures and can start using the "
76+"phone<br><br>Tap on the screen to start"
7577
7678#: qml/Components/PageHeader.qml:340
7779msgid "Recent searches"
@@ -79,11 +81,11 @@ msgstr "Recent searches"
7981
8082#: qml/Components/SeeMore.qml:35
8183msgid "See more"
82−msgstr ""
84+msgstr "See more"
8385
8486#: qml/Components/SeeMore.qml:57
8587msgid "See less"
86−msgstr ""
88+msgstr "See less"
8789
8890#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70
8991msgid "Rate this"
@@ -105,11 +107,11 @@ msgstr[1] "%1 reviews"
105107
106108#: qml/Dash/Previews/PreviewActionCombo.qml:34
107109msgid "More..."
108−msgstr ""
110+msgstr "More..."
109111
110112#: qml/Dash/Previews/PreviewActionCombo.qml:34
111113msgid "Less..."
112−msgstr ""
114+msgstr "Less..."
113115
114116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74
115117msgid "Add a review"
@@ -166,7 +168,7 @@ msgstr "Show password"
166168
167169#: qml/Notifications/NotificationMenuItemFactory.qml:103
168170msgid "Please enter SIM PIN"
169−msgstr ""
171+msgstr "Please enter SIM PIN"
170172
171173#: qml/Panel/SearchIndicator.qml:27
172174msgid "Search"
po/fi.po+8−6
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-02-13 18:37+0000\n"
11−"PO-Revision-Date: 2014-02-21 19:36+0000\n"
11+"PO-Revision-Date: 2014-03-09 19:22+0000\n"
1212"Last-Translator: Jiri Grönroos <Unknown>\n"
1313"Language-Team: Finnish <fi@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-02-22 07:40+0000\n"
19−"X-Generator: Launchpad (build 16926)\n"
18+"X-Launchpad-Export-Date: 2014-03-10 06:11+0000\n"
19+"X-Generator: Launchpad (build 16948)\n"
2020
2121#: plugins/Unity/Launcher/launcheritem.cpp:43
2222#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -72,6 +72,8 @@ msgid ""
7272"You have now mastered the edge gestures and can start using the "
7373"phone<br><br>Tap on the screen to start"
7474msgstr ""
75+"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
76+"käytön<br><br>Napauta näyttöä aloittaaksesi"
7577
7678#: qml/Components/PageHeader.qml:340
7779msgid "Recent searches"
@@ -79,11 +81,11 @@ msgstr "Viimeisimmät haut"
7981
8082#: qml/Components/SeeMore.qml:35
8183msgid "See more"
82−msgstr ""
84+msgstr "Näytä lisää"
8385
8486#: qml/Components/SeeMore.qml:57
8587msgid "See less"
86−msgstr ""
88+msgstr "Näytä vähemmän"
8789
8890#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70
8991msgid "Rate this"
@@ -109,7 +111,7 @@ msgstr "Lisää..."
109111
110112#: qml/Dash/Previews/PreviewActionCombo.qml:34
111113msgid "Less..."
112−msgstr ""
114+msgstr "Vähemmän..."
113115
114116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74
115117msgid "Add a review"
po/gl.po+5−5
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-02-13 18:37+0000\n"
11−"PO-Revision-Date: 2014-02-15 04:00+0000\n"
11+"PO-Revision-Date: 2014-03-08 06:58+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\n"
1313"Language-Team: Galician <gl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-02-19 05:44+0000\n"
19−"X-Generator: Launchpad (build 16916)\n"
18+"X-Launchpad-Export-Date: 2014-03-09 06:08+0000\n"
19+"X-Generator: Launchpad (build 16948)\n"
2020
2121#: plugins/Unity/Launcher/launcheritem.cpp:43
2222#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -107,11 +107,11 @@ msgstr[1] "%1 opinións"
107107
108108#: qml/Dash/Previews/PreviewActionCombo.qml:34
109109msgid "More..."
110−msgstr ""
110+msgstr "Máis…"
111111
112112#: qml/Dash/Previews/PreviewActionCombo.qml:34
113113msgid "Less..."
114−msgstr ""
114+msgstr "Menos..."
115115
116116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74
117117msgid "Add a review"
qml/Dash/Apps/FrequentlyUsedAppsModel.qml+6−6
@@ -48,24 +48,24 @@ ListModel {
4848 metadata: "subscope:applications.scope/applications-non-click.scope"
4949 }
5050 ListElement {
51− uri: "application://camera-app.desktop"
51+ uri: "appid://com.ubuntu.camera/camera/current-user-version"
5252 icon: "../../graphics/applicationIcons/camera.png"
5353 category: 0
5454 mimetype: "application/x-desktop"
5555 title: "Camera"
5656 comment: ""
57− dndUri: "file:///usr/share/applications/camera-app.desktop"
58− metadata: "subscope:applications.scope/applications-non-click.scope"
57+ dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
58+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
5959 }
6060 ListElement {
61− uri: "application://gallery-app.desktop"
61+ uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
6262 icon: "../../graphics/applicationIcons/gallery.png"
6363 category: 0
6464 mimetype: "application/x-desktop"
6565 title: "Gallery"
6666 comment: ""
67− dndUri: "file:///usr/share/applications/gallery.desktop"
68− metadata: "subscope:applications.scope/applications-non-click.scope"
67+ dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
68+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
6969 }
7070 ListElement {
7171 uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
tests/autopilot/unity8/shell/tests/test_hud.py → tests/autopilot/unity8/shell/tests/disabled_test_hud.pyrenamed+2−2
@@ -157,7 +157,7 @@ class TestHud(UnityTestCase, DragMixin):
157157 self.assertThat(hud.shown, Eventually(Equals(False)))
158158
159159 def _launch_test_app_from_app_screen(self):
160− """Launches the camera app using the Dash UI.
160+ """Launches the browser app using the Dash UI.
161161
162162 Because when testing on the desktop running
163163 self.launch_application() will launch the application on the desktop
@@ -165,7 +165,7 @@ class TestHud(UnityTestCase, DragMixin):
165165
166166 """
167167 dash = self.main_window.get_dash()
168− icon = dash.get_application_icon('Camera')
168+ icon = dash.get_application_icon('Browser')
169169 self.touch.tap_object(icon)
170170
171171 # Ensure application is open
tests/mocks/data/applications/camera-app.desktop → tests/mocks/data/applications/webbrowser-app.desktoprenamed

The content is the same.