Unity 8

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

  1. hack_location_data_i18n
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 1599
Merged at revision: 1616
Proposed branch: lp:~aacid/unity8/hack_location_data_i18n
Merge into: lp:unity8
Diff against target: 311 lines (+86/-74)
2 files modified
po/unity8.pot (+83/-73)
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml (+3/-1)
To merge this branch: bzr merge lp:~aacid/unity8/hack_location_data_i18n
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+249174@code.launchpad.net

Commit message

Hardcode tranlsation for internal.location field

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

 * 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 :

PASSED: Continuous integration, rev:1597
http://jenkins.qa.ubuntu.com/job/unity8-ci/5263/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1261
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1261/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17914

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

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
yes, no regressions
 * Did CI run pass? If not, please explain why.
y
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/unity8.pot'
--- po/unity8.pot 2015-01-22 10:09:56 +0000
+++ po/unity8.pot 2015-02-13 10:45:38 +0000
@@ -8,7 +8,7 @@
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 @@
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"
2020
21#: plugins/LightDM/Greeter.cpp:13021#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "22msgid "Password: "
23msgstr ""23msgstr ""
2424
@@ -106,52 +106,6 @@
106msgid "Cancel"106msgid "Cancel"
107msgstr ""107msgstr ""
108108
109#: qml/Components/EdgeDemoOverlay.qml:151
110msgid "Skip intro"
111msgstr ""
112
113#: qml/Components/EdgeDemo.qml:125
114msgid "Right edge"
115msgstr ""
116
117#: qml/Components/EdgeDemo.qml:126
118msgid "Try swiping from the right edge to unlock the phone"
119msgstr ""
120
121#: qml/Components/EdgeDemo.qml:157
122msgid "Top edge"
123msgstr ""
124
125#: qml/Components/EdgeDemo.qml:158
126msgid "Try swiping from the top edge to access the indicators"
127msgstr ""
128
129#: qml/Components/EdgeDemo.qml:183
130msgid "Close"
131msgstr ""
132
133#: qml/Components/EdgeDemo.qml:184
134msgid "Swipe up again to close the settings screen"
135msgstr ""
136
137#: qml/Components/EdgeDemo.qml:214
138msgid "Left edge"
139msgstr ""
140
141#: qml/Components/EdgeDemo.qml:215
142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143msgstr ""
144
145#: qml/Components/EdgeDemo.qml:242
146msgid "Well done"
147msgstr ""
148
149#: qml/Components/EdgeDemo.qml:243
150msgid ""
151"You have now mastered the edge gestures and can start using the "
152"phone<br><br>Tap on the screen to start"
153msgstr ""
154
155#: qml/Components/Lockscreen.qml:238109#: qml/Components/Lockscreen.qml:238
156msgid "Return to Call"110msgid "Return to Call"
157msgstr ""111msgstr ""
@@ -164,32 +118,32 @@
164msgid "OK"118msgid "OK"
165msgstr ""119msgstr ""
166120
167#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642121#: qml/Dash/GenericScopeView.qml:528 qml/Dash/GenericScopeView.qml:686
168msgid "See less"122msgid "See less"
169msgstr ""123msgstr ""
170124
171#: qml/Dash/GenericScopeView.qml:485125#: qml/Dash/GenericScopeView.qml:528
172msgid "See all"126msgid "See all"
173msgstr ""127msgstr ""
174128
175#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274129#: qml/Dash/GenericScopeView.qml:590 qml/Dash/PageHeader.qml:276
176#: qml/Panel/SearchIndicator.qml:27130#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"131msgid "Search"
178msgstr ""132msgstr ""
179133
180#: qml/Dash/PageHeader.qml:267134#: qml/Dash/PageHeader.qml:269
181msgid "Store"135msgid "Store"
182msgstr ""136msgstr ""
183137
184#: qml/Dash/PageHeader.qml:284138#: qml/Dash/PageHeader.qml:286
185msgid "Settings"139msgid "Settings"
186msgstr ""140msgstr ""
187141
188#: qml/Dash/PageHeader.qml:291142#: qml/Dash/PageHeader.qml:293
189msgid "Remove from Favorites"143msgid "Remove from Favorites"
190msgstr ""144msgstr ""
191145
192#: qml/Dash/PageHeader.qml:291146#: qml/Dash/PageHeader.qml:293
193msgid "Add to Favorites"147msgid "Add to Favorites"
194msgstr ""148msgstr ""
195149
@@ -221,6 +175,10 @@
221msgid "Release to refresh…"175msgid "Release to refresh…"
222msgstr ""176msgstr ""
223177
178#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
179msgid "Enable location data"
180msgstr ""
181
224#: qml/Dash/ScopesList.qml:66182#: qml/Dash/ScopesList.qml:66
225msgid "Manage"183msgid "Manage"
226msgstr ""184msgstr ""
@@ -233,7 +191,7 @@
233msgid "Also installed"191msgid "Also installed"
234msgstr ""192msgstr ""
235193
236#: qml/Greeter/Greeter.qml:133194#: qml/Greeter/Greeter.qml:141
237msgid "Unlock"195msgid "Unlock"
238msgstr ""196msgstr ""
239197
@@ -289,60 +247,112 @@
289msgid "Roaming"247msgid "Roaming"
290msgstr ""248msgstr ""
291249
292#: qml/Shell.qml:390250#: qml/Shell.qml:402
293#, qt-format251#, qt-format
294msgid "Enter %1"252msgid "Enter %1"
295msgstr ""253msgstr ""
296254
297#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60255#: qml/Shell.qml:403 qml/Wizard/Pages/passwd-set.qml:60
298msgid "Enter passphrase"256msgid "Enter passphrase"
299msgstr ""257msgstr ""
300258
301#: qml/Shell.qml:392259#: qml/Shell.qml:404
302msgid "Enter passcode"260msgid "Enter passcode"
303msgstr ""261msgstr ""
304262
305#: qml/Shell.qml:393263#: qml/Shell.qml:405
306#, qt-format264#, qt-format
307msgid "Sorry, incorrect %1"265msgid "Sorry, incorrect %1"
308msgstr ""266msgstr ""
309267
310#: qml/Shell.qml:394268#: qml/Shell.qml:406
311msgid "Sorry, incorrect passphrase"269msgid "Sorry, incorrect passphrase"
312msgstr ""270msgstr ""
313271
314#: qml/Shell.qml:395272#: qml/Shell.qml:407
315msgid "Please re-enter"273msgid "Please re-enter"
316msgstr ""274msgstr ""
317275
318#: qml/Shell.qml:396276#: qml/Shell.qml:408
319msgid "Sorry, incorrect passcode"277msgid "Sorry, incorrect passcode"
320msgstr ""278msgstr ""
321279
322#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53280#: qml/Shell.qml:502 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."281msgid "Sorry, incorrect passphrase."
324msgstr ""282msgstr ""
325283
326#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54284#: qml/Shell.qml:503 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."285msgid "Sorry, incorrect passcode."
328msgstr ""286msgstr ""
329287
330#: qml/Shell.qml:492288#: qml/Shell.qml:504
331msgid "This will be your last attempt."289msgid "This will be your last attempt."
332msgstr ""290msgstr ""
333291
334#: qml/Shell.qml:494292#: 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 ""
339297
340#: qml/Shell.qml:495298#: 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 ""
345303
304#: qml/Tutorial/TutorialBottomFinish.qml:24
305msgid "This action does different things for different apps"
306msgstr ""
307
308#: qml/Tutorial/TutorialBottomFinish.qml:25
309msgid "Tap here to finish."
310msgstr ""
311
312#: qml/Tutorial/TutorialBottom.qml:28
313msgid "Open special menus"
314msgstr ""
315
316#: qml/Tutorial/TutorialBottom.qml:29
317msgid "Swipe up from the bottom edge."
318msgstr ""
319
320#: qml/Tutorial/TutorialLeftFinish.qml:24
321msgid "These are the shortcuts to favorite apps"
322msgstr ""
323
324#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
325msgid "Tap here to continue."
326msgstr ""
327
328#: qml/Tutorial/TutorialLeft.qml:26
329msgid "Open the launcher"
330msgstr ""
331
332#: qml/Tutorial/TutorialLeft.qml:27
333msgid "Short swipe from the left edge."
334msgstr ""
335
336#: qml/Tutorial/TutorialPage.qml:178
337msgid "You almost got it!"
338msgstr ""
339
340#: qml/Tutorial/TutorialPage.qml:195
341msgid "Try again."
342msgstr ""
343
344#: qml/Tutorial/TutorialRight.qml:31
345msgid "To view open apps"
346msgstr ""
347
348#: qml/Tutorial/TutorialRight.qml:32
349msgid "Long swipe from the right edge."
350msgstr ""
351
352#: qml/Tutorial/TutorialRight.qml:122
353msgid "View all your running tasks."
354msgstr ""
355
346#: qml/Wizard/Page.qml:89356#: qml/Wizard/Page.qml:89
347msgid "Back"357msgid "Back"
348msgstr ""358msgstr ""
@@ -360,7 +370,7 @@
360msgstr ""370msgstr ""
361371
362#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128372#: 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:131373#: 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:82374#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365#: qml/Wizard/Pages/passwd-set.qml:90375#: qml/Wizard/Pages/passwd-set.qml:90
366msgid "Continue"376msgid "Continue"
@@ -374,7 +384,7 @@
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 ""
376386
377#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197387#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:215
378msgid "Skip"388msgid "Skip"
379msgstr ""389msgstr ""
380390
@@ -410,15 +420,15 @@
410msgid "Numbers and letters"420msgid "Numbers and letters"
411msgstr ""421msgstr ""
412422
413#: qml/Wizard/Pages/40-wifi.qml:28423#: qml/Wizard/Pages/40-wifi.qml:29
414msgid "Connect to Wi‑Fi"424msgid "Connect to Wi‑Fi"
415msgstr ""425msgstr ""
416426
417#: qml/Wizard/Pages/40-wifi.qml:147427#: qml/Wizard/Pages/40-wifi.qml:168
418msgid "Available networks…"428msgid "Available networks…"
419msgstr ""429msgstr ""
420430
421#: qml/Wizard/Pages/40-wifi.qml:148431#: qml/Wizard/Pages/40-wifi.qml:169
422msgid "No available networks."432msgid "No available networks."
423msgstr ""433msgstr ""
424434
425435
=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml 2014-08-26 12:27:36 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml 2015-02-13 10:45:38 +0000
@@ -38,7 +38,9 @@
38 rightMargin: units.gu(1)38 rightMargin: units.gu(1)
39 verticalCenter: parent.verticalCenter39 verticalCenter: parent.verticalCenter
40 }40 }
41 text: widgetData.displayName41 // 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
43 text: widgetData.settingId == "internal.location" ? i18n.tr("Enable location data") : widgetData.displayName
42 elide: Text.ElideMiddle44 elide: Text.ElideMiddle
43 maximumLineCount: 245 maximumLineCount: 2
44 wrapMode: Text.Wrap46 wrapMode: Text.Wrap

Subscribers

People subscribed via source and target branches