Unity 8

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

  1. pot_update
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Rejected
Rejected by: Albert Astals Cid
Proposed branch: lp:~aacid/unity8/pot_update
Merge into: lp:unity8
Diff against target: 284 lines (+79/-73)
1 file modified
po/unity8.pot (+79/-73)
To merge this branch: bzr merge lp:~aacid/unity8/pot_update
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+249610@code.launchpad.net

Commit message

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?
No, it's a pot update

 * Did you make sure that your branch does not contain spurious tags?
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
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1612
http://jenkins.qa.ubuntu.com/job/unity8-ci/5318/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/483
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18045

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Let's make this part of https://code.launchpad.net/~aacid/unity8/hack_location_data_i18n/+merge/249174 as Cimi suggested so we don't get conflicts

Unmerged revisions

1612. By Albert Astals Cid

Update pot

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 2015-01-22 10:09:56 +0000
3+++ po/unity8.pot 2015-02-13 09:04:21 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: unity8\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2015-01-22 11:09+0100\n"
9+"POT-Creation-Date: 2015-02-13 09:51+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@@ -18,7 +18,7 @@
14 "Content-Transfer-Encoding: 8bit\n"
15 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
16
17-#: plugins/LightDM/Greeter.cpp:130
18+#: plugins/LightDM/Greeter.cpp:112
19 msgid "Password: "
20 msgstr ""
21
22@@ -106,52 +106,6 @@
23 msgid "Cancel"
24 msgstr ""
25
26-#: qml/Components/EdgeDemoOverlay.qml:151
27-msgid "Skip intro"
28-msgstr ""
29-
30-#: qml/Components/EdgeDemo.qml:125
31-msgid "Right edge"
32-msgstr ""
33-
34-#: qml/Components/EdgeDemo.qml:126
35-msgid "Try swiping from the right edge to unlock the phone"
36-msgstr ""
37-
38-#: qml/Components/EdgeDemo.qml:157
39-msgid "Top edge"
40-msgstr ""
41-
42-#: qml/Components/EdgeDemo.qml:158
43-msgid "Try swiping from the top edge to access the indicators"
44-msgstr ""
45-
46-#: qml/Components/EdgeDemo.qml:183
47-msgid "Close"
48-msgstr ""
49-
50-#: qml/Components/EdgeDemo.qml:184
51-msgid "Swipe up again to close the settings screen"
52-msgstr ""
53-
54-#: qml/Components/EdgeDemo.qml:214
55-msgid "Left edge"
56-msgstr ""
57-
58-#: qml/Components/EdgeDemo.qml:215
59-msgid "Swipe from the left to reveal the launcher for quick access to apps"
60-msgstr ""
61-
62-#: qml/Components/EdgeDemo.qml:242
63-msgid "Well done"
64-msgstr ""
65-
66-#: qml/Components/EdgeDemo.qml:243
67-msgid ""
68-"You have now mastered the edge gestures and can start using the "
69-"phone<br><br>Tap on the screen to start"
70-msgstr ""
71-
72 #: qml/Components/Lockscreen.qml:238
73 msgid "Return to Call"
74 msgstr ""
75@@ -164,32 +118,32 @@
76 msgid "OK"
77 msgstr ""
78
79-#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
80+#: qml/Dash/GenericScopeView.qml:528 qml/Dash/GenericScopeView.qml:686
81 msgid "See less"
82 msgstr ""
83
84-#: qml/Dash/GenericScopeView.qml:485
85+#: qml/Dash/GenericScopeView.qml:528
86 msgid "See all"
87 msgstr ""
88
89-#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
90+#: qml/Dash/GenericScopeView.qml:590 qml/Dash/PageHeader.qml:276
91 #: qml/Panel/SearchIndicator.qml:27
92 msgid "Search"
93 msgstr ""
94
95-#: qml/Dash/PageHeader.qml:267
96+#: qml/Dash/PageHeader.qml:269
97 msgid "Store"
98 msgstr ""
99
100-#: qml/Dash/PageHeader.qml:284
101+#: qml/Dash/PageHeader.qml:286
102 msgid "Settings"
103 msgstr ""
104
105-#: qml/Dash/PageHeader.qml:291
106+#: qml/Dash/PageHeader.qml:293
107 msgid "Remove from Favorites"
108 msgstr ""
109
110-#: qml/Dash/PageHeader.qml:291
111+#: qml/Dash/PageHeader.qml:293
112 msgid "Add to Favorites"
113 msgstr ""
114
115@@ -233,7 +187,7 @@
116 msgid "Also installed"
117 msgstr ""
118
119-#: qml/Greeter/Greeter.qml:133
120+#: qml/Greeter/Greeter.qml:141
121 msgid "Unlock"
122 msgstr ""
123
124@@ -289,60 +243,112 @@
125 msgid "Roaming"
126 msgstr ""
127
128-#: qml/Shell.qml:390
129+#: qml/Shell.qml:402
130 #, qt-format
131 msgid "Enter %1"
132 msgstr ""
133
134-#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
135+#: qml/Shell.qml:403 qml/Wizard/Pages/passwd-set.qml:60
136 msgid "Enter passphrase"
137 msgstr ""
138
139-#: qml/Shell.qml:392
140+#: qml/Shell.qml:404
141 msgid "Enter passcode"
142 msgstr ""
143
144-#: qml/Shell.qml:393
145+#: qml/Shell.qml:405
146 #, qt-format
147 msgid "Sorry, incorrect %1"
148 msgstr ""
149
150-#: qml/Shell.qml:394
151+#: qml/Shell.qml:406
152 msgid "Sorry, incorrect passphrase"
153 msgstr ""
154
155-#: qml/Shell.qml:395
156+#: qml/Shell.qml:407
157 msgid "Please re-enter"
158 msgstr ""
159
160-#: qml/Shell.qml:396
161+#: qml/Shell.qml:408
162 msgid "Sorry, incorrect passcode"
163 msgstr ""
164
165-#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
166+#: qml/Shell.qml:502 qml/Wizard/Pages/passwd-confirm.qml:53
167 msgid "Sorry, incorrect passphrase."
168 msgstr ""
169
170-#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
171+#: qml/Shell.qml:503 qml/Wizard/Pages/passwd-confirm.qml:54
172 msgid "Sorry, incorrect passcode."
173 msgstr ""
174
175-#: qml/Shell.qml:492
176+#: qml/Shell.qml:504
177 msgid "This will be your last attempt."
178 msgstr ""
179
180-#: qml/Shell.qml:494
181+#: qml/Shell.qml:506
182 msgid ""
183 "If passphrase is entered incorrectly, your phone will conduct a factory "
184 "reset and all personal data will be deleted."
185 msgstr ""
186
187-#: qml/Shell.qml:495
188+#: qml/Shell.qml:507
189 msgid ""
190 "If passcode is entered incorrectly, your phone will conduct a factory reset "
191 "and all personal data will be deleted."
192 msgstr ""
193
194+#: qml/Tutorial/TutorialBottomFinish.qml:24
195+msgid "This action does different things for different apps"
196+msgstr ""
197+
198+#: qml/Tutorial/TutorialBottomFinish.qml:25
199+msgid "Tap here to finish."
200+msgstr ""
201+
202+#: qml/Tutorial/TutorialBottom.qml:28
203+msgid "Open special menus"
204+msgstr ""
205+
206+#: qml/Tutorial/TutorialBottom.qml:29
207+msgid "Swipe up from the bottom edge."
208+msgstr ""
209+
210+#: qml/Tutorial/TutorialLeftFinish.qml:24
211+msgid "These are the shortcuts to favorite apps"
212+msgstr ""
213+
214+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
215+msgid "Tap here to continue."
216+msgstr ""
217+
218+#: qml/Tutorial/TutorialLeft.qml:26
219+msgid "Open the launcher"
220+msgstr ""
221+
222+#: qml/Tutorial/TutorialLeft.qml:27
223+msgid "Short swipe from the left edge."
224+msgstr ""
225+
226+#: qml/Tutorial/TutorialPage.qml:178
227+msgid "You almost got it!"
228+msgstr ""
229+
230+#: qml/Tutorial/TutorialPage.qml:195
231+msgid "Try again."
232+msgstr ""
233+
234+#: qml/Tutorial/TutorialRight.qml:31
235+msgid "To view open apps"
236+msgstr ""
237+
238+#: qml/Tutorial/TutorialRight.qml:32
239+msgid "Long swipe from the right edge."
240+msgstr ""
241+
242+#: qml/Tutorial/TutorialRight.qml:122
243+msgid "View all your running tasks."
244+msgstr ""
245+
246 #: qml/Wizard/Page.qml:89
247 msgid "Back"
248 msgstr ""
249@@ -360,7 +366,7 @@
250 msgstr ""
251
252 #: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
253-#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
254+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
255 #: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
256 #: qml/Wizard/Pages/passwd-set.qml:90
257 msgid "Continue"
258@@ -374,7 +380,7 @@
259 msgid "Without it, you won’t be able to make calls or use text messaging."
260 msgstr ""
261
262-#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
263+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:215
264 msgid "Skip"
265 msgstr ""
266
267@@ -410,15 +416,15 @@
268 msgid "Numbers and letters"
269 msgstr ""
270
271-#: qml/Wizard/Pages/40-wifi.qml:28
272+#: qml/Wizard/Pages/40-wifi.qml:29
273 msgid "Connect to Wi‑Fi"
274 msgstr ""
275
276-#: qml/Wizard/Pages/40-wifi.qml:147
277+#: qml/Wizard/Pages/40-wifi.qml:168
278 msgid "Available networks…"
279 msgstr ""
280
281-#: qml/Wizard/Pages/40-wifi.qml:148
282+#: qml/Wizard/Pages/40-wifi.qml:169
283 msgid "No available networks."
284 msgstr ""
285

Subscribers

People subscribed via source and target branches