OpenStore

Merge lp:~verzegnassi-stefano/openstore/ui-adjustments into lp:openstore

  1. ui-adjustments
  2. Merge into trunk
Proposed by Stefano Verzegnassi
Status: Merged
Merged at revision: 35
Proposed branch: lp:~verzegnassi-stefano/openstore/ui-adjustments
Merge into: lp:openstore
Prerequisite: lp:~verzegnassi-stefano/openstore/add-missing-strings-to-pot
Diff against target: 808 lines (+422/-6) (has conflicts)
6 files modified
openstore/AppDetailsPage.qml (+49/-0)
openstore/CategoriesPage.qml (+4/-4)
openstore/DiscoverTab.qml (+15/-1)
openstore/FilteredAppView.qml (+5/-0)
openstore/Main.qml (+48/-0)
po/openstore.openstore-team.pot (+301/-1)
Text conflict in openstore/AppDetailsPage.qml
Text conflict in po/openstore.openstore-team.pot
To merge this branch: bzr merge lp:~verzegnassi-stefano/openstore/ui-adjustments
Reviewer Review Type Date Requested Status
Brian Douglass Approve
Review via email: mp+324502@code.launchpad.net

Commit message

UI enhancements:

* Anchors the app to the keyboard rectangle, so that content is not hidden by OSK.
* Ask for confirmation before uninstalling a package
* Fixed word wrapping in ListItemLayouts
* Make the convergence experience a bit more comfortable.
  This is not meant to be a definitive solution, but it's an acceptable workaround until we sort out a better design or a better way to deal with AdaptivePageLayout.
* Fixed scrolling performance
* Added an 'installed' badge to the main highlight entry in Discover page
* Updated style of 'installed' badge where it's used
* Use standard 'back' icon in CategoryPage, instead of 'close' icon

Description of the change

UI enhancements:

* Anchors the app to the keyboard rectangle, so that content is not hidden by OSK.
* Ask for confirmation before uninstalling a package
* Fixed word wrapping in ListItemLayouts
* Make the convergence experience a bit more comfortable.
  This is not meant to be a definitive solution, but it's an acceptable workaround until we sort out a better design or a better way to deal with AdaptivePageLayout.
* Fixed scrolling performance
* Added an 'installed' badge to the main highlight entry in Discover page
* Updated style of 'installed' badge where it's used
* Use standard 'back' icon in CategoryPage, instead of 'close' icon

NOTE: This branch depends on lp:~verzegnassi-stefano/openstore/add-missing-strings-to-pot

To post a comment you must log in.
lp:~verzegnassi-stefano/openstore/ui-adjustments updated
37. By Stefano Verzegnassi

Fixed conflicts with lp:openstore

38. By Stefano Verzegnassi

Minor fixes as Brian's suggested

Revision history for this message
Brian Douglass (bhdouglass) wrote :

Looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openstore/AppDetailsPage.qml'
2--- openstore/AppDetailsPage.qml 2017-05-23 19:48:06 +0000
3+++ openstore/AppDetailsPage.qml 2017-05-24 21:10:37 +0000
4@@ -17,6 +17,7 @@
5 import QtQuick 2.4
6 import Ubuntu.Components 1.3
7 import Ubuntu.Components.ListItems 1.3
8+import Ubuntu.Components.Popups 1.3
9 import QtQuick.Layouts 1.1
10 import OpenStore 1.0
11
12@@ -36,6 +37,9 @@
13 anchors.fill: parent
14 anchors.topMargin: parent.header.height
15
16+ // WORKAROUND: Fix for wrong grid unit size
17+ Component.onCompleted: root.flickable_responsive_scroll_fix(scrollView.flickableItem)
18+
19 Column {
20 id: mainColumn
21 width: scrollView.width
22@@ -76,6 +80,7 @@
23
24 Button {
25 Layout.fillWidth: true
26+ Layout.maximumWidth: buttonsRow.width > units.gu(60) ? units.gu(24) : buttonsRow.width
27 text: app.installed ? i18n.tr("Upgrade") : i18n.tr("Install")
28 visible: !app.installed || (app.installed && app.installedVersion < app.version)
29 color: UbuntuColors.green
30@@ -86,11 +91,19 @@
31
32 Button {
33 Layout.fillWidth: true
34+ Layout.maximumWidth: buttonsRow.width > units.gu(60) ? units.gu(24) : buttonsRow.width
35 text: i18n.tr("Remove")
36 visible: app.installed
37 color: UbuntuColors.red
38 onClicked: {
39+<<<<<<< TREE
40 appModel.installer.removePackage(app.appId, app.installedVersion)
41+=======
42+ var popup = PopupUtils.open(removeQuestion, root, {pkgName: app.name || "<i>" + i18n.tr("unknown") + "</i>" });
43+ popup.accepted.connect(function() {
44+ appModel.installer.removePackage(app.appId, app.installedVersion)
45+ })
46+>>>>>>> MERGE-SOURCE
47 }
48 }
49 }
50@@ -489,6 +502,7 @@
51
52 title.text: i18n.tr("Permissions")
53 subtitle.maximumLineCount: Number.MAX_VALUE
54+ subtitle.wrapMode: Text.WordWrap
55 subtitle.text: {
56 if (permissions) {
57 return permissions.replace("bluetooth", "<font color=\"#ED3146\">bluetooth</font>")
58@@ -524,6 +538,7 @@
59 title.text: i18n.tr("Read paths")
60 subtitle.text: readpaths || "<i>" + i18n.tr("none") + "</i>"
61 subtitle.maximumLineCount: Number.MAX_VALUE
62+ subtitle.wrapMode: Text.WrapAtWordBoundaryOrAnywhere
63 }
64
65 ListItemLayout {
66@@ -541,6 +556,7 @@
67 title.text: i18n.tr("Write paths")
68 subtitle.text: writepaths || "<i>" + i18n.tr("none") + "</i>"
69 subtitle.maximumLineCount: Number.MAX_VALUE
70+ subtitle.wrapMode: Text.WrapAtWordBoundaryOrAnywhere
71 }
72
73 Button {
74@@ -556,6 +572,39 @@
75 }
76 }
77
78+
79+ Component {
80+ id: removeQuestion
81+ Dialog {
82+ id: removeQuestionDialog
83+ title: i18n.tr("Remove package")
84+ text: i18n.tr("Do you want to remove %1?").arg(pkgName)
85+
86+ property string pkgName
87+ signal accepted();
88+ signal rejected();
89+
90+ Button {
91+ text: i18n.tr("Remove")
92+ color: UbuntuColors.red
93+ onClicked: {
94+ removeQuestionDialog.accepted();
95+ PopupUtils.close(removeQuestionDialog)
96+ }
97+ }
98+
99+ Button {
100+ text: i18n.tr("Cancel")
101+ onClicked: {
102+ removeQuestionDialog.rejected();
103+ PopupUtils.close(removeQuestionDialog)
104+ }
105+
106+ }
107+ }
108+ }
109+
110+
111 function printSize(size) {
112 var s
113
114
115=== modified file 'openstore/CategoriesPage.qml'
116--- openstore/CategoriesPage.qml 2017-05-05 22:21:39 +0000
117+++ openstore/CategoriesPage.qml 2017-05-24 21:10:37 +0000
118@@ -22,10 +22,6 @@
119
120 header: PageHeader {
121 title: i18n.tr("Categories")
122- leadingActionBar.actions: Action {
123- iconName: "close"
124- onTriggered: categoryPage.pageStack.removePages(categoryPage)
125- }
126 }
127
128 signal categoryClicked(var name, var code)
129@@ -46,6 +42,10 @@
130 ListView {
131 id: categoryView
132 anchors.fill: parent
133+
134+ // WORKAROUND: Fix for wrong grid unit size
135+ Component.onCompleted: root.flickable_responsive_scroll_fix(categoryView)
136+
137 model: categories.list
138 delegate: ListItem {
139 onClicked: categoryPage.categoryClicked(modelData, modelData)
140
141=== modified file 'openstore/DiscoverTab.qml'
142--- openstore/DiscoverTab.qml 2017-05-10 21:59:53 +0000
143+++ openstore/DiscoverTab.qml 2017-05-24 21:10:37 +0000
144@@ -52,6 +52,9 @@
145 id: view
146 anchors.fill: parent
147
148+ // WORKAROUND: Fix for wrong grid unit size
149+ Component.onCompleted: root.flickable_responsive_scroll_fix(view)
150+
151 header: AbstractButton {
152 id: highlightAppControl
153 property var appItem: storeModel.app(storeModel.findApp(discoverData.highlight.id))
154@@ -86,6 +89,16 @@
155 subtitle.text: highlightAppControl.appItem.tagline || highlightAppControl.appItem.description
156 subtitle.textSize: Label.Small
157 subtitle.color: "white"
158+
159+ summary.text: {
160+ if (highlightAppControl.appItem.installed)
161+ return highlightAppControl.appItem.updateAvailable ? i18n.tr("Update available").toUpperCase()
162+ : i18n.tr("✓ Installed").toUpperCase()
163+
164+ return ""
165+ }
166+ summary.textSize: Label.XSmall
167+ summary.color: "white"
168 }
169 }
170
171@@ -106,6 +119,7 @@
172 anchors.centerIn: parent
173 title.text: modelData.name
174 subtitle.text: modelData.tagline
175+ subtitle.wrapMode: Text.WordWrap
176
177 ProgressionSlot {
178 visible: modelData.referral != ""
179@@ -163,7 +177,7 @@
180 textSize: Label.XSmall
181 }
182
183- summary.text: appDel.appItem.installed ? appDel.appItem.updateAvailable ? i18n.tr("Update available") : i18n.tr("Installed") : ""
184+ summary.text: appDel.appItem.installed ? appDel.appItem.updateAvailable ? i18n.tr("Update available").toUpperCase() : i18n.tr("✓ Installed").toUpperCase() : ""
185 summary.textSize: Label.XSmall
186 }
187 }
188
189=== modified file 'openstore/FilteredAppView.qml'
190--- openstore/FilteredAppView.qml 2017-05-20 10:08:32 +0000
191+++ openstore/FilteredAppView.qml 2017-05-24 21:10:37 +0000
192@@ -38,6 +38,10 @@
193
194 ListView {
195 id: view
196+
197+ // WORKAROUND: Fix for wrong grid unit size
198+ Component.onCompleted: root.flickable_responsive_scroll_fix(view)
199+
200 model: SortFilterModel {
201 id: sortedFilteredAppModel
202
203@@ -66,6 +70,7 @@
204 id: layout
205 title.text: model.name
206 summary.text: model.tagline
207+ summary.wrapMode: Text.WrapAtWordBoundaryOrAnywhere
208
209 UbuntuShape {
210 SlotsLayout.position: SlotsLayout.Leading
211
212=== modified file 'openstore/Main.qml'
213--- openstore/Main.qml 2017-05-23 19:48:06 +0000
214+++ openstore/Main.qml 2017-05-24 21:10:37 +0000
215@@ -25,6 +25,7 @@
216 MainView {
217 id: root
218 applicationName: "openstore.openstore-team"
219+ anchorToKeyboard: true
220
221 width: units.gu(40)
222 height: units.gu(75)
223@@ -137,6 +138,44 @@
224 anchors.fill: parent
225 primaryPage: mainPage
226
227+ layouts: [
228+ // Span two columns only on BQ M10 - landscape mode.
229+ PageColumnsLayout {
230+ when: width > units.gu(120)
231+ PageColumn {
232+ minimumWidth: units.gu(40)
233+ maximumWidth: units.gu(120)
234+ preferredWidth: units.gu(60)
235+ }
236+ PageColumn {
237+ // FIXME: 'minimumWidth' is not useful if first column get resized by user.
238+ // This is an upstream bug in UITK.
239+ minimumWidth: units.gu(40)
240+ fillWidth: true
241+ }
242+ },
243+
244+ PageColumnsLayout {
245+ when: width > units.gu(120)
246+ PageColumn {
247+ minimumWidth: units.gu(40)
248+ maximumWidth: units.gu(80)
249+ preferredWidth: units.gu(60)
250+ }
251+ PageColumn {
252+ fillWidth: true
253+ }
254+ },
255+
256+ PageColumnsLayout {
257+ when: true
258+ PageColumn {
259+ fillWidth: true
260+ }
261+ }
262+ ]
263+
264+
265 Page {
266 id: mainPage
267 header: PageHeader {
268@@ -424,5 +463,14 @@
269 }
270 }
271 }
272+
273+ // *** WORKAROUNDS ***
274+
275+ // Placed in MainView for convenience.
276+ function flickable_responsive_scroll_fix(flickable) {
277+ // WORKAROUND: Fix for wrong grid unit size
278+ flickable.flickDeceleration = 1500 * units.gridUnit / 8
279+ flickable.maximumFlickVelocity = 2500 * units.gridUnit / 8
280+ }
281 }
282
283
284=== modified file 'po/openstore.openstore-team.pot'
285--- po/openstore.openstore-team.pot 2017-05-23 19:09:03 +0000
286+++ po/openstore.openstore-team.pot 2017-05-24 21:10:37 +0000
287@@ -8,167 +8,333 @@
288 msgstr ""
289 "Project-Id-Version: PACKAGE VERSION\n"
290 "Report-Msgid-Bugs-To: \n"
291+<<<<<<< TREE
292 "POT-Creation-Date: 2017-05-23 19:07+0000\n"
293+=======
294+"POT-Creation-Date: 2017-05-23 19:28+0000\n"
295+>>>>>>> MERGE-SOURCE
296 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
297 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
298 "Language-Team: LANGUAGE <LL@li.org>\n"
299 "Language: \n"
300 "MIME-Version: 1.0\n"
301-"Content-Type: text/plain; charset=CHARSET\n"
302+"Content-Type: text/plain; charset=UTF-8\n"
303 "Content-Transfer-Encoding: 8bit\n"
304
305+<<<<<<< TREE
306 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:27
307 msgid "App details"
308 msgstr ""
309
310 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:79
311+=======
312+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:28
313+msgid "App details"
314+msgstr ""
315+
316+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:84
317+>>>>>>> MERGE-SOURCE
318 msgid "Upgrade"
319 msgstr ""
320
321+<<<<<<< TREE
322 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:79
323+=======
324+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:84
325+>>>>>>> MERGE-SOURCE
326 msgid "Install"
327 msgstr ""
328
329+<<<<<<< TREE
330 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:89
331+=======
332+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:95
333+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:592
334+>>>>>>> MERGE-SOURCE
335 msgid "Remove"
336 msgstr ""
337
338+<<<<<<< TREE
339 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:126
340+=======
341+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:99
342+msgid "unknown"
343+msgstr ""
344+
345+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:135
346+>>>>>>> MERGE-SOURCE
347 msgid "This app has access to restricted system data, see below for details."
348 msgstr ""
349
350+<<<<<<< TREE
351 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:251
352+=======
353+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:260
354+>>>>>>> MERGE-SOURCE
355 msgid "Description"
356 msgstr ""
357
358 #. TRANSLATORS: Title of the changelog section
359+<<<<<<< TREE
360 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:273
361+=======
362+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:282
363+>>>>>>> MERGE-SOURCE
364 msgid "What's New"
365 msgstr ""
366
367+<<<<<<< TREE
368 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:291
369+=======
370+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:300
371+>>>>>>> MERGE-SOURCE
372 msgid "Packager/Publisher"
373 msgstr ""
374
375+<<<<<<< TREE
376 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:292
377+=======
378+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:301
379+>>>>>>> MERGE-SOURCE
380 msgid "OpenStore team"
381 msgstr ""
382
383+<<<<<<< TREE
384 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:300
385+=======
386+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:309
387+>>>>>>> MERGE-SOURCE
388 msgid "Installed version"
389 msgstr ""
390
391+<<<<<<< TREE
392 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:310
393+=======
394+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:319
395+>>>>>>> MERGE-SOURCE
396 msgid "Latest available version"
397 msgstr ""
398
399+<<<<<<< TREE
400 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:319
401+=======
402+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:328
403+>>>>>>> MERGE-SOURCE
404 msgid "License"
405 msgstr ""
406
407+<<<<<<< TREE
408 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:319
409 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:328
410+=======
411+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:328
412+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:337
413+>>>>>>> MERGE-SOURCE
414 msgid "N/A"
415 msgstr ""
416
417+<<<<<<< TREE
418 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:328
419+=======
420+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:337
421+>>>>>>> MERGE-SOURCE
422 msgid "Source Code"
423 msgstr ""
424
425 #. TRANSLATORS: This is the button that shows a list of all the packages from the same author. %1 is the name of the author.
426+<<<<<<< TREE
427 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:352
428+=======
429+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:361
430+>>>>>>> MERGE-SOURCE
431 #, qt-format
432 msgid "More from %1"
433 msgstr ""
434
435 #. TRANSLATORS: This is the button that shows a list of all the other packages in the same category. %1 is the name of the category.
436+<<<<<<< TREE
437 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:376
438+=======
439+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:385
440+>>>>>>> MERGE-SOURCE
441 #, qt-format
442 msgid "Other apps in %1"
443 msgstr ""
444
445+<<<<<<< TREE
446 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:382
447+=======
448+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:391
449+>>>>>>> MERGE-SOURCE
450 msgid "Package contents"
451 msgstr ""
452
453+<<<<<<< TREE
454 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:462
455+=======
456+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:471
457+>>>>>>> MERGE-SOURCE
458 msgid "AppArmor profile"
459 msgstr ""
460
461+<<<<<<< TREE
462 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:490
463+=======
464+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:499
465+>>>>>>> MERGE-SOURCE
466 msgid "Permissions"
467 msgstr ""
468
469+<<<<<<< TREE
470 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:507
471+=======
472+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:517
473+>>>>>>> MERGE-SOURCE
474 msgid "none required"
475 msgstr ""
476
477+<<<<<<< TREE
478 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:524
479+=======
480+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:534
481+>>>>>>> MERGE-SOURCE
482 msgid "Read paths"
483 msgstr ""
484
485+<<<<<<< TREE
486 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:525
487 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:542
488+=======
489+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:535
490+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:553
491+>>>>>>> MERGE-SOURCE
492 msgid "none"
493 msgstr ""
494
495+<<<<<<< TREE
496 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:541
497+=======
498+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:552
499+>>>>>>> MERGE-SOURCE
500 msgid "Write paths"
501 msgstr ""
502
503+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:576
504+msgid "Remove package"
505+msgstr ""
506+
507+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:577
508+#, qt-format
509+msgid "Do you want to remove %1?"
510+msgstr ""
511+
512+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:584
513+#: /tmp/ui-adjustments/openstore/SearchPage.qml:37
514+msgid "Cancel"
515+msgstr ""
516+
517 #. TRANSLATORS: %1 is the size of a file, expressed in GB
518+<<<<<<< TREE
519 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:565
520+=======
521+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:609
522+>>>>>>> MERGE-SOURCE
523 #, qt-format
524 msgid "%1 GB"
525 msgstr ""
526
527 #. TRANSLATORS: %1 is the size of a file, expressed in MB
528+<<<<<<< TREE
529 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:570
530+=======
531+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:614
532+>>>>>>> MERGE-SOURCE
533 #, qt-format
534 msgid "%1 MB"
535 msgstr ""
536
537 #. TRANSLATORS: %1 is the size of a file, expressed in kB
538+<<<<<<< TREE
539 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:575
540+=======
541+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:619
542+>>>>>>> MERGE-SOURCE
543 #, qt-format
544 msgid "%1 kB"
545 msgstr ""
546
547 #. TRANSLATORS: %1 is the size of a file, expressed in bytes
548+<<<<<<< TREE
549 #: /tmp/add-missing-strings-to-pot/openstore/AppDetailsPage.qml:578
550+=======
551+#: /tmp/ui-adjustments/openstore/AppDetailsPage.qml:622
552+>>>>>>> MERGE-SOURCE
553 #, qt-format
554 msgid "%1 bytes"
555 msgstr ""
556
557+<<<<<<< TREE
558 #: /tmp/add-missing-strings-to-pot/openstore/CategoriesPage.qml:24
559 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:147
560+=======
561+#: /tmp/ui-adjustments/openstore/CategoriesPage.qml:24
562+#: /tmp/ui-adjustments/openstore/Main.qml:186
563+>>>>>>> MERGE-SOURCE
564 msgid "Categories"
565 msgstr ""
566
567+<<<<<<< TREE
568 #: /tmp/add-missing-strings-to-pot/openstore/DiscoverTab.qml:166
569+=======
570+#: /tmp/ui-adjustments/openstore/DiscoverTab.qml:93
571+#: /tmp/ui-adjustments/openstore/DiscoverTab.qml:174
572+>>>>>>> MERGE-SOURCE
573 msgid "Update available"
574 msgstr ""
575
576+<<<<<<< TREE
577 #: /tmp/add-missing-strings-to-pot/openstore/DiscoverTab.qml:166
578 msgid "Installed"
579+=======
580+#: /tmp/ui-adjustments/openstore/DiscoverTab.qml:93
581+#: /tmp/ui-adjustments/openstore/DiscoverTab.qml:174
582+msgid "✓ Installed"
583+>>>>>>> MERGE-SOURCE
584 msgstr ""
585
586+<<<<<<< TREE
587 #: /tmp/add-missing-strings-to-pot/openstore/FilteredAppView.qml:101
588+=======
589+#: /tmp/ui-adjustments/openstore/FilteredAppView.qml:106
590+>>>>>>> MERGE-SOURCE
591 msgid "Nothing here yet"
592 msgstr ""
593
594+<<<<<<< TREE
595 #: /tmp/add-missing-strings-to-pot/openstore/FilteredAppView.qml:101
596+=======
597+#: /tmp/ui-adjustments/openstore/FilteredAppView.qml:106
598+>>>>>>> MERGE-SOURCE
599 msgid "No results found."
600 msgstr ""
601
602+<<<<<<< TREE
603 #: /tmp/add-missing-strings-to-pot/openstore/FilteredAppView.qml:102
604+=======
605+#: /tmp/ui-adjustments/openstore/FilteredAppView.qml:107
606+>>>>>>> MERGE-SOURCE
607 msgid "No app has been released in this department yet."
608 msgstr ""
609
610+<<<<<<< TREE
611 #: /tmp/add-missing-strings-to-pot/openstore/FilteredAppView.qml:102
612+=======
613+#: /tmp/ui-adjustments/openstore/FilteredAppView.qml:107
614+>>>>>>> MERGE-SOURCE
615 msgid "Try with a different search."
616 msgstr ""
617
618+<<<<<<< TREE
619 #: /tmp/add-missing-strings-to-pot/openstore/HookIcon.qml:37
620 msgid "Application"
621 msgstr ""
622@@ -199,29 +365,82 @@
623
624 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:153
625 #: /tmp/add-missing-strings-to-pot/openstore/SearchPage.qml:29
626+=======
627+#: /tmp/ui-adjustments/openstore/HookIcon.qml:37
628+msgid "Application"
629+msgstr ""
630+
631+#: /tmp/ui-adjustments/openstore/HookIcon.qml:50
632+msgid "Scope"
633+msgstr ""
634+
635+#. TRANSLATORS: This is an Ubuntu platform service for launching other applications (ref. https://developer.ubuntu.com/en/phone/platform/guides/url-dispatcher-guide/ )
636+#: /tmp/ui-adjustments/openstore/HookIcon.qml:64
637+msgid "URL Handler"
638+msgstr ""
639+
640+#. TRANSLATORS: This is an Ubuntu platform service for content exchange (ref. https://developer.ubuntu.com/en/phone/platform/guides/content-hub-guide/ )
641+#: /tmp/ui-adjustments/openstore/HookIcon.qml:78
642+msgid "Content Hub Handler"
643+msgstr ""
644+
645+#. TRANSLATORS: This is an Ubuntu platform service for push notifications (ref. https://developer.ubuntu.com/en/phone/platform/guides/push-notifications-client-guide/ )
646+#: /tmp/ui-adjustments/openstore/HookIcon.qml:92
647+msgid "Push Helper"
648+msgstr ""
649+
650+#. TRANSLATORS: i.e. Online Accounts (ref. https://developer.ubuntu.com/en/phone/platform/guides/online-accounts-developer-guide/ )
651+#: /tmp/ui-adjustments/openstore/HookIcon.qml:106
652+msgid "Accounts provider"
653+msgstr ""
654+
655+#: /tmp/ui-adjustments/openstore/Main.qml:192
656+#: /tmp/ui-adjustments/openstore/SearchPage.qml:29
657+>>>>>>> MERGE-SOURCE
658 msgid "Search"
659 msgstr ""
660
661+<<<<<<< TREE
662 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:160
663+=======
664+#: /tmp/ui-adjustments/openstore/Main.qml:199
665+>>>>>>> MERGE-SOURCE
666 msgid "Discover"
667 msgstr ""
668
669+<<<<<<< TREE
670 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:160
671+=======
672+#: /tmp/ui-adjustments/openstore/Main.qml:199
673+>>>>>>> MERGE-SOURCE
674 msgid "My Apps"
675 msgstr ""
676
677+<<<<<<< TREE
678 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:254
679+=======
680+#: /tmp/ui-adjustments/openstore/Main.qml:293
681+>>>>>>> MERGE-SOURCE
682 msgid "Available updates"
683 msgstr ""
684
685+<<<<<<< TREE
686 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:254
687+=======
688+#: /tmp/ui-adjustments/openstore/Main.qml:293
689+>>>>>>> MERGE-SOURCE
690 msgid "Installed apps"
691 msgstr ""
692
693+<<<<<<< TREE
694 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:272
695+=======
696+#: /tmp/ui-adjustments/openstore/Main.qml:311
697+>>>>>>> MERGE-SOURCE
698 msgid "Fetching package list..."
699 msgstr ""
700
701+<<<<<<< TREE
702 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:319
703 msgid "Warning"
704 msgstr ""
705@@ -261,10 +480,52 @@
706 msgstr ""
707
708 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:374
709+=======
710+#: /tmp/ui-adjustments/openstore/Main.qml:358
711+msgid "Warning"
712+msgstr ""
713+
714+#: /tmp/ui-adjustments/openstore/Main.qml:367
715+msgid ""
716+"Open Store allows installing unconfined applications. Please make sure that "
717+"you know about the implications of that."
718+msgstr ""
719+
720+#: /tmp/ui-adjustments/openstore/Main.qml:374
721+msgid ""
722+"An unconfined application has the ability to break the system, reduce its "
723+"performance and/or spy on you."
724+msgstr ""
725+
726+#: /tmp/ui-adjustments/openstore/Main.qml:381
727+msgid ""
728+"While we are doing our best to prevent that by reviewing applications, we "
729+"don't take any responsibility if something bad slips through."
730+msgstr ""
731+
732+#: /tmp/ui-adjustments/openstore/Main.qml:388
733+msgid "Use this at your own risk."
734+msgstr ""
735+
736+#: /tmp/ui-adjustments/openstore/Main.qml:392
737+msgid "Okay. Got it! I'll be careful."
738+msgstr ""
739+
740+#: /tmp/ui-adjustments/openstore/Main.qml:399
741+msgid "Get me out of here!"
742+msgstr ""
743+
744+#: /tmp/ui-adjustments/openstore/Main.qml:412
745+msgid "Install app?"
746+msgstr ""
747+
748+#: /tmp/ui-adjustments/openstore/Main.qml:413
749+>>>>>>> MERGE-SOURCE
750 #, qt-format
751 msgid "Do you want to install %1?"
752 msgstr ""
753
754+<<<<<<< TREE
755 #: /tmp/add-missing-strings-to-pot/openstore/Main.qml:381
756 msgid "Yes"
757 msgstr ""
758@@ -300,11 +561,50 @@
759 msgstr ""
760
761 #: /tmp/add-missing-strings-to-pot/openstore/SearchPage.qml:60
762+=======
763+#: /tmp/ui-adjustments/openstore/Main.qml:420
764+msgid "Yes"
765+msgstr ""
766+
767+#: /tmp/ui-adjustments/openstore/Main.qml:429
768+msgid "No"
769+msgstr ""
770+
771+#: /tmp/ui-adjustments/openstore/Main.qml:443
772+msgid "App installed"
773+msgstr ""
774+
775+#: /tmp/ui-adjustments/openstore/Main.qml:444
776+msgid "The app has been installed successfully."
777+msgstr ""
778+
779+#: /tmp/ui-adjustments/openstore/Main.qml:447
780+#: /tmp/ui-adjustments/openstore/Main.qml:460
781+msgid "OK"
782+msgstr ""
783+
784+#: /tmp/ui-adjustments/openstore/Main.qml:456
785+msgid "Installation failed"
786+msgstr ""
787+
788+#: /tmp/ui-adjustments/openstore/Main.qml:457
789+msgid ""
790+"The package could not be installed. Make sure it is a valid click package."
791+msgstr ""
792+
793+#: /tmp/ui-adjustments/openstore/SearchPage.qml:60
794+>>>>>>> MERGE-SOURCE
795 msgid "Search in OpenStore..."
796 msgstr ""
797
798+<<<<<<< TREE
799 #: /tmp/add-missing-strings-to-pot/openstore/TextualButtonStyle.qml:46
800 #: /tmp/add-missing-strings-to-pot/openstore/TextualButtonStyle.qml:54
801 #: /tmp/add-missing-strings-to-pot/openstore/TextualButtonStyle.qml:60
802+=======
803+#: /tmp/ui-adjustments/openstore/TextualButtonStyle.qml:46
804+#: /tmp/ui-adjustments/openstore/TextualButtonStyle.qml:54
805+#: /tmp/ui-adjustments/openstore/TextualButtonStyle.qml:60
806+>>>>>>> MERGE-SOURCE
807 msgid "Pick"
808 msgstr ""

Subscribers

People subscribed via source and target branches