ubuntu-system-settings

Merge lp:~dpm/ubuntu-system-settings/fix-1210341 into lp:ubuntu-system-settings

  1. fix-1210341
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 390
Merged at revision: 390
Proposed branch: lp:~dpm/ubuntu-system-settings/fix-1210341
Merge into: lp:ubuntu-system-settings
Diff against target: 117 lines (+19/-17)
2 files modified
plugins/battery/PageComponent.qml (+1/-0)
po/ubuntu-system-settings.pot (+18/-17)
To merge this branch: bzr merge lp:~dpm/ubuntu-system-settings/fix-1210341
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+187736@code.launchpad.net

Commit message

Add a translator comment for the battery charge level (bug 1210341)

Description of the change

Add a translator comment for the battery charge level (bug 1210341)

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Looks good, thanks!

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

PASSED: Continuous integration, rev:390
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/399/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/399

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/399/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/battery/PageComponent.qml'
2--- plugins/battery/PageComponent.qml 2013-09-25 17:17:04 +0000
3+++ plugins/battery/PageComponent.qml 2013-09-26 11:37:58 +0000
4@@ -83,6 +83,7 @@
5 }
6 onRemainingCapacityChanged: {
7 if(batteryInfo.batteryCount > 0)
8+ /* TRANSLATORS: %1 refers to a percentage that indicates the charging level of the battery */
9 chargingLevel.value = i18n.tr("%1 %").arg((batteryInfo.remainingCapacity(0)/batteryInfo.maximumCapacity(0)*100).toFixed(0))
10 }
11
12
13=== modified file 'po/ubuntu-system-settings.pot'
14--- po/ubuntu-system-settings.pot 2013-09-26 09:08:26 +0000
15+++ po/ubuntu-system-settings.pot 2013-09-26 11:37:58 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: ubuntu-system-settings\n"
19 "Report-Msgid-Bugs-To: \n"
20-"POT-Creation-Date: 2013-09-26 11:07+0200\n"
21+"POT-Creation-Date: 2013-09-26 13:30+0200\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25@@ -27,8 +27,8 @@
26 msgstr ""
27
28 #: ../plugins/about/PageComponent.qml:77 ../plugins/about/PageComponent.qml:84
29-#: ../plugins/about/Storage.qml:137 ../plugins/battery/PageComponent.qml:124
30-#: ../plugins/battery/PageComponent.qml:131
31+#: ../plugins/about/Storage.qml:137 ../plugins/battery/PageComponent.qml:125
32+#: ../plugins/battery/PageComponent.qml:132
33 #: ../plugins/cellular/PageComponent.qml:75
34 msgid "N/A"
35 msgstr ""
36@@ -46,8 +46,8 @@
37 msgstr ""
38
39 #: ../plugins/about/PageComponent.qml:98
40-#: ../plugins/battery/PageComponent.qml:244
41-#: ../plugins/battery/PageComponent.qml:252
42+#: ../plugins/battery/PageComponent.qml:245
43+#: ../plugins/battery/PageComponent.qml:253
44 #: ../plugins/battery/SleepValues.qml:91
45 #: ../plugins/system-update/Download.qml:53
46 #: ../plugins/system-update/PageComponent.qml:335
47@@ -194,35 +194,36 @@
48 msgid "Fully charged"
49 msgstr ""
50
51-#: ../plugins/battery/PageComponent.qml:86
52+#. TRANSLATORS: %1 refers to a percentage that indicates the charging level of the battery
53+#: ../plugins/battery/PageComponent.qml:87
54 #, qt-format
55 msgid "%1 %"
56 msgstr ""
57
58-#: ../plugins/battery/PageComponent.qml:123
59+#: ../plugins/battery/PageComponent.qml:124
60 msgid "Charge level"
61 msgstr ""
62
63-#: ../plugins/battery/PageComponent.qml:175
64+#: ../plugins/battery/PageComponent.qml:176
65 msgid "Ways to reduce battery use:"
66 msgstr ""
67
68-#: ../plugins/battery/PageComponent.qml:179
69+#: ../plugins/battery/PageComponent.qml:180
70 msgid "Display brightness"
71 msgstr ""
72
73-#: ../plugins/battery/PageComponent.qml:236
74+#: ../plugins/battery/PageComponent.qml:237
75 #: ../plugins/security-privacy/PhoneLocking.qml:62
76 msgid "Lock when idle"
77 msgstr ""
78
79-#: ../plugins/battery/PageComponent.qml:236
80+#: ../plugins/battery/PageComponent.qml:237
81 #: ../plugins/security-privacy/PhoneLocking.qml:63
82 msgid "Sleep when idle"
83 msgstr ""
84
85-#: ../plugins/battery/PageComponent.qml:241
86-#: ../plugins/battery/PageComponent.qml:249
87+#: ../plugins/battery/PageComponent.qml:242
88+#: ../plugins/battery/PageComponent.qml:250
89 #: ../plugins/battery/SleepValues.qml:76 ../plugins/battery/SleepValues.qml:79
90 #: ../plugins/battery/SleepValues.qml:82 ../plugins/battery/SleepValues.qml:85
91 #: ../plugins/battery/SleepValues.qml:88
92@@ -232,22 +233,22 @@
93 msgstr[0] ""
94 msgstr[1] ""
95
96-#: ../plugins/battery/PageComponent.qml:262
97+#: ../plugins/battery/PageComponent.qml:263
98 #: ../plugins/wifi/PageComponent.qml:27 ../.build/settings.js:18
99 msgid "Wi-Fi"
100 msgstr ""
101
102-#: ../plugins/battery/PageComponent.qml:286
103+#: ../plugins/battery/PageComponent.qml:287
104 #: ../plugins/bluetooth/PageComponent.qml:98
105 #: ../plugins/bluetooth/PageComponent.qml:106 ../.build/settings.js:5
106 msgid "Bluetooth"
107 msgstr ""
108
109-#: ../plugins/battery/PageComponent.qml:315
110+#: ../plugins/battery/PageComponent.qml:316
111 msgid "GPS"
112 msgstr ""
113
114-#: ../plugins/battery/PageComponent.qml:333
115+#: ../plugins/battery/PageComponent.qml:334
116 msgid "Accurate location detection requires GPS and/or Wi-Fi."
117 msgstr ""
118

Subscribers

People subscribed via source and target branches