git.iko.soy/unity8
on xenial help sign in
Hardcode tranlsation for internal.location field Fixes: #1393438
4bf9465Albert Astals Cid
po/unity8.pot+83−73
compare with xenial
unifiedsplit
@@ -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: 2015-01-22 11:09+0100\n"
11+"POT-Creation-Date: 2015-02-13 11:45+0100\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"
@@ -18,7 +18,7 @@ msgstr ""
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
23msgstr ""
23msgstr ""
24
24
@@ -106,52 +106,6 @@ msgstr ""
106msgid "Cancel"
106msgid "Cancel"
107msgstr ""
107msgstr ""
108
108
109−#: qml/Components/EdgeDemoOverlay.qml:151
110−msgid "Skip intro"
111−msgstr ""
112−
113−#: qml/Components/EdgeDemo.qml:125
114−msgid "Right edge"
115−msgstr ""
116−
117−#: qml/Components/EdgeDemo.qml:126
118−msgid "Try swiping from the right edge to unlock the phone"
119−msgstr ""
120−
121−#: qml/Components/EdgeDemo.qml:157
122−msgid "Top edge"
123−msgstr ""
124−
125−#: qml/Components/EdgeDemo.qml:158
126−msgid "Try swiping from the top edge to access the indicators"
127−msgstr ""
128−
129−#: qml/Components/EdgeDemo.qml:183
130−msgid "Close"
131−msgstr ""
132−
133−#: qml/Components/EdgeDemo.qml:184
134−msgid "Swipe up again to close the settings screen"
135−msgstr ""
136−
137−#: qml/Components/EdgeDemo.qml:214
138−msgid "Left edge"
139−msgstr ""
140−
141−#: qml/Components/EdgeDemo.qml:215
142−msgid "Swipe from the left to reveal the launcher for quick access to apps"
143−msgstr ""
144−
145−#: qml/Components/EdgeDemo.qml:242
146−msgid "Well done"
147−msgstr ""
148−
149−#: qml/Components/EdgeDemo.qml:243
150−msgid ""
151−"You have now mastered the edge gestures and can start using the "
152−"phone<br><br>Tap on the screen to start"
153−msgstr ""
154−
155#: qml/Components/Lockscreen.qml:238
109#: qml/Components/Lockscreen.qml:238
156msgid "Return to Call"
110msgid "Return to Call"
157msgstr ""
111msgstr ""
@@ -164,32 +118,32 @@ msgstr ""
164msgid "OK"
118msgid "OK"
165msgstr ""
119msgstr ""
166
120
167−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
121+#: qml/Dash/GenericScopeView.qml:528 qml/Dash/GenericScopeView.qml:686
168msgid "See less"
122msgid "See less"
169msgstr ""
123msgstr ""
170
124
171−#: qml/Dash/GenericScopeView.qml:485
125+#: qml/Dash/GenericScopeView.qml:528
172msgid "See all"
126msgid "See all"
173msgstr ""
127msgstr ""
174
128
175−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
129+#: qml/Dash/GenericScopeView.qml:590 qml/Dash/PageHeader.qml:276
176#: qml/Panel/SearchIndicator.qml:27
130#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
131msgid "Search"
178msgstr ""
132msgstr ""
179
133
180−#: qml/Dash/PageHeader.qml:267
134+#: qml/Dash/PageHeader.qml:269
181msgid "Store"
135msgid "Store"
182msgstr ""
136msgstr ""
183
137
184−#: qml/Dash/PageHeader.qml:284
138+#: qml/Dash/PageHeader.qml:286
185msgid "Settings"
139msgid "Settings"
186msgstr ""
140msgstr ""
187
141
188−#: qml/Dash/PageHeader.qml:291
142+#: qml/Dash/PageHeader.qml:293
189msgid "Remove from Favorites"
143msgid "Remove from Favorites"
190msgstr ""
144msgstr ""
191
145
192−#: qml/Dash/PageHeader.qml:291
146+#: qml/Dash/PageHeader.qml:293
193msgid "Add to Favorites"
147msgid "Add to Favorites"
194msgstr ""
148msgstr ""
195
149
@@ -221,6 +175,10 @@ msgstr ""
221msgid "Release to refresh…"
175msgid "Release to refresh…"
222msgstr ""
176msgstr ""
223
177
178+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
179+msgid "Enable location data"
180+msgstr ""
181+
224#: qml/Dash/ScopesList.qml:66
182#: qml/Dash/ScopesList.qml:66
225msgid "Manage"
183msgid "Manage"
226msgstr ""
184msgstr ""
@@ -233,7 +191,7 @@ msgstr ""
233msgid "Also installed"
191msgid "Also installed"
234msgstr ""
192msgstr ""
235
193
236−#: qml/Greeter/Greeter.qml:133
194+#: qml/Greeter/Greeter.qml:141
237msgid "Unlock"
195msgid "Unlock"
238msgstr ""
196msgstr ""
239
197
@@ -289,60 +247,112 @@ msgstr ""
289msgid "Roaming"
247msgid "Roaming"
290msgstr ""
248msgstr ""
291
249
292−#: qml/Shell.qml:390
250+#: qml/Shell.qml:402
293#, qt-format
251#, qt-format
294msgid "Enter %1"
252msgid "Enter %1"
295msgstr ""
253msgstr ""
296
254
297−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
255+#: qml/Shell.qml:403 qml/Wizard/Pages/passwd-set.qml:60
298msgid "Enter passphrase"
256msgid "Enter passphrase"
299msgstr ""
257msgstr ""
300
258
301−#: qml/Shell.qml:392
259+#: qml/Shell.qml:404
302msgid "Enter passcode"
260msgid "Enter passcode"
303msgstr ""
261msgstr ""
304
262
305−#: qml/Shell.qml:393
263+#: qml/Shell.qml:405
306#, qt-format
264#, qt-format
307msgid "Sorry, incorrect %1"
265msgid "Sorry, incorrect %1"
308msgstr ""
266msgstr ""
309
267
310−#: qml/Shell.qml:394
268+#: qml/Shell.qml:406
311msgid "Sorry, incorrect passphrase"
269msgid "Sorry, incorrect passphrase"
312msgstr ""
270msgstr ""
313
271
314−#: qml/Shell.qml:395
272+#: qml/Shell.qml:407
315msgid "Please re-enter"
273msgid "Please re-enter"
316msgstr ""
274msgstr ""
317
275
318−#: qml/Shell.qml:396
276+#: qml/Shell.qml:408
319msgid "Sorry, incorrect passcode"
277msgid "Sorry, incorrect passcode"
320msgstr ""
278msgstr ""
321
279
322−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
280+#: qml/Shell.qml:502 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."
281msgid "Sorry, incorrect passphrase."
324msgstr ""
282msgstr ""
325
283
326−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
284+#: qml/Shell.qml:503 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
285msgid "Sorry, incorrect passcode."
328msgstr ""
286msgstr ""
329
287
330−#: qml/Shell.qml:492
288+#: qml/Shell.qml:504
331msgid "This will be your last attempt."
289msgid "This will be your last attempt."
332msgstr ""
290msgstr ""
333
291
334−#: qml/Shell.qml:494
292+#: qml/Shell.qml:506
335msgid ""
293msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
294"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
295"reset and all personal data will be deleted."
338msgstr ""
296msgstr ""
339
297
340−#: qml/Shell.qml:495
298+#: qml/Shell.qml:507
341msgid ""
299msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
300"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
301"and all personal data will be deleted."
344msgstr ""
302msgstr ""
345
303
304+#: qml/Tutorial/TutorialBottomFinish.qml:24
305+msgid "This action does different things for different apps"
306+msgstr ""
307+
308+#: qml/Tutorial/TutorialBottomFinish.qml:25
309+msgid "Tap here to finish."
310+msgstr ""
311+
312+#: qml/Tutorial/TutorialBottom.qml:28
313+msgid "Open special menus"
314+msgstr ""
315+
316+#: qml/Tutorial/TutorialBottom.qml:29
317+msgid "Swipe up from the bottom edge."
318+msgstr ""
319+
320+#: qml/Tutorial/TutorialLeftFinish.qml:24
321+msgid "These are the shortcuts to favorite apps"
322+msgstr ""
323+
324+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
325+msgid "Tap here to continue."
326+msgstr ""
327+
328+#: qml/Tutorial/TutorialLeft.qml:26
329+msgid "Open the launcher"
330+msgstr ""
331+
332+#: qml/Tutorial/TutorialLeft.qml:27
333+msgid "Short swipe from the left edge."
334+msgstr ""
335+
336+#: qml/Tutorial/TutorialPage.qml:178
337+msgid "You almost got it!"
338+msgstr ""
339+
340+#: qml/Tutorial/TutorialPage.qml:195
341+msgid "Try again."
342+msgstr ""
343+
344+#: qml/Tutorial/TutorialRight.qml:31
345+msgid "To view open apps"
346+msgstr ""
347+
348+#: qml/Tutorial/TutorialRight.qml:32
349+msgid "Long swipe from the right edge."
350+msgstr ""
351+
352+#: qml/Tutorial/TutorialRight.qml:122
353+msgid "View all your running tasks."
354+msgstr ""
355+
346#: qml/Wizard/Page.qml:89
356#: qml/Wizard/Page.qml:89
347msgid "Back"
357msgid "Back"
348msgstr ""
358msgstr ""
@@ -360,7 +370,7 @@ msgid "Let’s get started."
360msgstr ""
370msgstr ""
361
371
362#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
372#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
373+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
364#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
374#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365#: qml/Wizard/Pages/passwd-set.qml:90
375#: qml/Wizard/Pages/passwd-set.qml:90
366msgid "Continue"
376msgid "Continue"
@@ -374,7 +384,7 @@ msgstr ""
374msgid "Without it, you won’t be able to make calls or use text messaging."
384msgid "Without it, you won’t be able to make calls or use text messaging."
375msgstr ""
385msgstr ""
376
386
377−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
387+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:215
378msgid "Skip"
388msgid "Skip"
379msgstr ""
389msgstr ""
380
390
@@ -410,15 +420,15 @@ msgstr ""
410msgid "Numbers and letters"
420msgid "Numbers and letters"
411msgstr ""
421msgstr ""
412
422
413−#: qml/Wizard/Pages/40-wifi.qml:28
423+#: qml/Wizard/Pages/40-wifi.qml:29
414msgid "Connect to Wi‑Fi"
424msgid "Connect to Wi‑Fi"
415msgstr ""
425msgstr ""
416
426
417−#: qml/Wizard/Pages/40-wifi.qml:147
427+#: qml/Wizard/Pages/40-wifi.qml:168
418msgid "Available networks…"
428msgid "Available networks…"
419msgstr ""
429msgstr ""
420
430
421−#: qml/Wizard/Pages/40-wifi.qml:148
431+#: qml/Wizard/Pages/40-wifi.qml:169
422msgid "No available networks."
432msgid "No available networks."
423msgstr ""
433msgstr ""
424
434
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+3−1
@@ -38,7 +38,9 @@ ScopeSetting {
38 rightMargin: units.gu(1)
38 rightMargin: units.gu(1)
39 verticalCenter: parent.verticalCenter
39 verticalCenter: parent.verticalCenter
40 }
40 }
41+ // TODO The translation should ideally come from the bottom layers and not be hardcoded here
42+ // https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1393438
41− text: widgetData.displayName
43+ text: widgetData.settingId == "internal.location" ? i18n.tr("Enable location data") : widgetData.displayName
42 elide: Text.ElideMiddle
44 elide: Text.ElideMiddle
43 maximumLineCount: 2
45 maximumLineCount: 2
44 wrapMode: Text.Wrap
46 wrapMode: Text.Wrap