Merge lp:~aacid/unity8/make_Recent_translatable into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 785
Merged at revision: 790
Proposed branch: lp:~aacid/unity8/make_Recent_translatable
Merge into: lp:unity8
Diff against target: 117 lines (+19/-33)
2 files modified
po/unity8.pot (+18/-32)
qml/Dash/DashApps.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/make_Recent_translatable
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Review via email: mp+212651@code.launchpad.net

Commit message

Make "Recent" translatable and update pot file

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
Not yet.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:785
http://jenkins.qa.ubuntu.com/job/unity8-ci/2628/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4240
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3824/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1153
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3826
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3826/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6113/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5191

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2628/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/unity8.pot'
2--- po/unity8.pot 2014-02-18 17:23:30 +0000
3+++ po/unity8.pot 2014-03-25 15:51:03 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: unity8\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-02-13 18:37+0000\n"
9+"POT-Creation-Date: 2014-03-25 16:48+0100\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -16,7 +16,6 @@
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=CHARSET\n"
16 "Content-Transfer-Encoding: 8bit\n"
17-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
18
19 #: plugins/Unity/Launcher/launcheritem.cpp:43
20 #: plugins/Unity/Launcher/launcheritem.cpp:73
21@@ -73,7 +72,7 @@
22 "phone<br><br>Tap on the screen to start"
23 msgstr ""
24
25-#: qml/Components/PageHeader.qml:340
26+#: qml/Components/PageHeader.qml:365
27 msgid "Recent searches"
28 msgstr ""
29
30@@ -81,27 +80,18 @@
31 msgid "See more"
32 msgstr ""
33
34-#: qml/Components/SeeMore.qml:57
35+#: qml/Components/SeeMore.qml:58
36 msgid "See less"
37 msgstr ""
38
39-#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70
40-msgid "Rate this"
41-msgstr ""
42-
43-#. TRANSLATORS: Number of persons who rated this app/video/whatever
44-#: qml/Dash/Previews/Header.qml:93
45-#, qt-format
46-msgid "(%1)"
47-msgstr ""
48-
49-#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever
50-#: qml/Dash/Previews/Header.qml:105
51-#, qt-format
52-msgid "%1 review"
53-msgid_plural "%1 reviews"
54-msgstr[0] ""
55-msgstr[1] ""
56+#: qml/Dash/DashApps.qml:38
57+msgid "Recent"
58+msgstr ""
59+
60+#: qml/Dash/PreviewListView.qml:52
61+#, qt-format
62+msgid "%1 Preview"
63+msgstr ""
64
65 #: qml/Dash/Previews/PreviewActionCombo.qml:34
66 msgid "More..."
67@@ -111,22 +101,18 @@
68 msgid "Less..."
69 msgstr ""
70
71-#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74
72+#: qml/Dash/Previews/PreviewRatingInput.qml:81
73+msgid "Rate this"
74+msgstr ""
75+
76+#: qml/Dash/Previews/PreviewRatingInput.qml:126
77 msgid "Add a review"
78 msgstr ""
79
80-#: qml/Dash/Previews/PreviewRating.qml:153 qml/Dash/Previews/Reviews.qml:121
81+#: qml/Dash/Previews/PreviewRatingInput.qml:166
82 msgid "Send"
83 msgstr ""
84
85-#: qml/Dash/Previews/Reviews.qml:86
86-msgid "Review"
87-msgstr ""
88-
89-#: qml/Dash/Previews/Reviews.qml:139
90-msgid "Comments:"
91-msgstr ""
92-
93 #: qml/Greeter/Lockscreen.qml:149
94 msgid "Emergency Call"
95 msgstr ""
96@@ -172,7 +158,7 @@
97 msgid "Search"
98 msgstr ""
99
100-#: qml/Shell.qml:440
101+#: qml/Shell.qml:417
102 #, qt-format
103 msgid "Please enter %1"
104 msgstr ""
105
106=== modified file 'qml/Dash/DashApps.qml'
107--- qml/Dash/DashApps.qml 2014-02-19 11:15:01 +0000
108+++ qml/Dash/DashApps.qml 2014-03-25 15:51:03 +0000
109@@ -35,7 +35,7 @@
110 }
111
112 onScopeChanged: {
113- scopeView.scope.categories.addSpecialCategory("running.apps.category", "Recent", "", "{ \"template\": { \"category-layout\": \"running-apps\" } }", countObject);
114+ scopeView.scope.categories.addSpecialCategory("running.apps.category", i18n.tr("Recent"), "", "{ \"template\": { \"category-layout\": \"running-apps\" } }", countObject);
115 enableHeightBehaviorOnNextCreation = (mainStageApplicationsModel.count + sideStageApplicationModel.count == 0)
116 }
117 }

Subscribers

People subscribed via source and target branches