git.iko.soy/unity8
on xenial help sign in
merge trunk
93c1215Alberto Aguirre
debian/changelog+13
compare with xenial
unifiedsplit
@@ -1,3 +1,16 @@
1+unity8 (7.89+14.10.20140616.1-0ubuntu1) utopic; urgency=low
2+
3+ [ Pawel Stolowski ]
4+ * Extend the hack for click scope categories with the upcoming 'store'
5+ category: single-tap on results from the 'store' category should
6+ activate them, instead of requesting a preview. (LP: #1326292)
7+
8+ [ Albert Astals ]
9+ * Drop the " Preview" suffix from Preview title As requested in
10+ https://bugs.launchpad.net/unity8/+bug/1316671 (LP: #1316671)
11+
12+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 16 Jun 2014 14:43:01 +0000
13+
1unity8 (7.89+14.10.20140613-0ubuntu1) utopic; urgency=medium
14unity8 (7.89+14.10.20140613-0ubuntu1) utopic; urgency=medium
2
15
3 [ Michael Terry ]
16 [ Michael Terry ]
po/unity8.pot+29−34
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11+"POT-Creation-Date: 2014-06-13 09:55+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,10 +72,35 @@ msgid ""
72"phone<br><br>Tap on the screen to start"
72"phone<br><br>Tap on the screen to start"
73msgstr ""
73msgstr ""
74
74
75+#: qml/Components/Lockscreen.qml:214
76+msgid "Emergency Call"
77+msgstr ""
78+
79+#: qml/Components/Lockscreen.qml:231
80+msgid "OK"
81+msgstr ""
82+
75#: qml/Components/PageHeader.qml:365
83#: qml/Components/PageHeader.qml:365
76msgid "Recent searches"
84msgid "Recent searches"
77msgstr ""
85msgstr ""
78
86
87+#: qml/Components/PassphraseLockscreen.qml:60
88+#, qt-format
89+msgid "Hello %1"
90+msgstr ""
91+
92+#: qml/Components/PassphraseLockscreen.qml:60
93+msgid "Hello"
94+msgstr ""
95+
96+#: qml/Components/PinLockscreen.qml:198
97+msgid "CANCEL"
98+msgstr ""
99+
100+#: qml/Components/PinLockscreen.qml:216
101+msgid "DONE"
102+msgstr ""
103+
79#: qml/Components/SeeMore.qml:35
104#: qml/Components/SeeMore.qml:35
80msgid "See more"
105msgid "See more"
81msgstr ""
106msgstr ""
@@ -88,11 +113,6 @@ msgstr ""
88msgid "Recent"
113msgid "Recent"
89msgstr ""
114msgstr ""
90
115
91−#: qml/Dash/PreviewListView.qml:52
92−#, qt-format
93−msgid "%1 Preview"
94−msgstr ""
95−
96#: qml/Dash/Previews/PreviewActionCombo.qml:34
116#: qml/Dash/Previews/PreviewActionCombo.qml:34
97msgid "More..."
117msgid "More..."
98msgstr ""
118msgstr ""
@@ -117,31 +137,6 @@ msgstr ""
117msgid "Swipe to unlock"
137msgid "Swipe to unlock"
118msgstr ""
138msgstr ""
119
139
120−#: qml/Greeter/Lockscreen.qml:215
121−msgid "Emergency Call"
122−msgstr ""
123−
124−#: qml/Greeter/Lockscreen.qml:232
125−msgid "OK"
126−msgstr ""
127−
128−#: qml/Greeter/PassphraseLockscreen.qml:60
129−#, qt-format
130−msgid "Hello %1"
131−msgstr ""
132−
133−#: qml/Greeter/PassphraseLockscreen.qml:60
134−msgid "Hello"
135−msgstr ""
136−
137−#: qml/Greeter/PinLockscreen.qml:198
138−msgid "CANCEL"
139−msgstr ""
140−
141−#: qml/Greeter/PinLockscreen.qml:216
142−msgid "DONE"
143−msgstr ""
144−
145#: qml/Hud/HudParametrizedActionsPage.qml:132
140#: qml/Hud/HudParametrizedActionsPage.qml:132
146msgid "Confirm"
141msgid "Confirm"
147msgstr ""
142msgstr ""
@@ -162,15 +157,15 @@ msgstr ""
162msgid "Speaking..."
157msgid "Speaking..."
163msgstr ""
158msgstr ""
164
159
165−#: qml/Notifications/NotificationMenuItemFactory.qml:92
160+#: qml/Notifications/NotificationMenuItemFactory.qml:91
166msgid "Show password"
161msgid "Show password"
167msgstr ""
162msgstr ""
168
163
169−#: qml/Notifications/NotificationMenuItemFactory.qml:104
164+#: qml/Notifications/NotificationMenuItemFactory.qml:103
170msgid "Please enter SIM PIN"
165msgid "Please enter SIM PIN"
171msgstr ""
166msgstr ""
172
167
173−#: qml/Panel/SearchIndicator.qml:27 test.qml:7
168+#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
169msgid "Search"
175msgstr ""
170msgstr ""
176
171
qml/Dash/GenericScopeView.qml+1−1
@@ -184,7 +184,7 @@ FocusScope {
184 Connections {
184 Connections {
185 target: rendererLoader.item
185 target: rendererLoader.item
186 onClicked: {
186 onClicked: {
187− if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && categoryId == "local")) {
187+ if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && (categoryId == "local" || categoryId == "store"))) {
188 // TODO Technically it is possible that calling activate() will make the scope emit
188 // TODO Technically it is possible that calling activate() will make the scope emit
189 // previewRequested so that we show a preview but there's no scope that does that yet
189 // previewRequested so that we show a preview but there's no scope that does that yet
190 // so it's not implemented
190 // so it's not implemented
qml/Dash/PreviewListView.qml+1−1
@@ -49,7 +49,7 @@ Item {
49 right: parent.right
49 right: parent.right
50 verticalCenter: parent.verticalCenter
50 verticalCenter: parent.verticalCenter
51 }
51 }
52− text: scope ? i18n.tr("%1 Preview").arg(scope.name) : ""
52+ text: scope ? scope.name : ""
53 // TODO Saviq: These should come from updated Ubuntu Palette.
53 // TODO Saviq: These should come from updated Ubuntu Palette.
54 color: "#888888"
54 color: "#888888"
55 font.family: "Ubuntu"
55 font.family: "Ubuntu"