ubuntu-system-settings

Merge lp:~jbicha/ubuntu-system-settings/rename-call-diversion-to-forwarding into lp:ubuntu-system-settings

  1. rename-call-diversion-to-forwarding
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 219
Merged at revision: 219
Proposed branch: lp:~jbicha/ubuntu-system-settings/rename-call-diversion-to-forwarding
Merge into: lp:ubuntu-system-settings
Diff against target: 362 lines (+57/-78)
7 files modified
.bzrignore (+1/-0)
plugins/phone/CallForwarding.qml (+16/-16)
plugins/phone/PageComponent.qml (+2/-2)
plugins/phone/phone.pro (+1/-1)
po/ubuntu-system-settings.pot (+36/-53)
po/update_pot.sh (+0/-5)
src/system-settings.pro (+1/-1)
To merge this branch: bzr merge lp:~jbicha/ubuntu-system-settings/rename-call-diversion-to-forwarding
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+177844@code.launchpad.net

Commit message

Rename 'Call diversion' to 'Call forwarding' (LP: #1205480)

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

thanks for the work, can you do "cd po; make pot" as well, to include the new string in the translation template?

review: Needs Fixing
lp:~jbicha/ubuntu-system-settings/rename-call-diversion-to-forwarding updated
218. By Jeremy Bícha

and update the pot

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks, that update_pot.sh change is buggy though, that file is deprecated and should probably be deleted...

review: Needs Fixing
lp:~jbicha/ubuntu-system-settings/rename-call-diversion-to-forwarding updated
219. By Jeremy Bícha

drop obsolete po/update_pot.sh

Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks! (next time try to keep build system cleanups for a different mp though, it's weird to mix different changes)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2013-07-23 12:10:54 +0000
3+++ .bzrignore 2013-08-01 15:04:53 +0000
4@@ -1,3 +1,4 @@
5+.build
6 *.debhelper
7 *.log
8 *.moc
9
10=== renamed file 'plugins/phone/CallDiversion.qml' => 'plugins/phone/CallForwarding.qml'
11--- plugins/phone/CallDiversion.qml 2013-07-23 14:53:10 +0000
12+++ plugins/phone/CallForwarding.qml 2013-08-01 15:04:53 +0000
13@@ -24,27 +24,27 @@
14 import Ubuntu.Components.ListItems 0.1 as ListItem
15
16 ItemPage {
17- title: i18n.tr("Call diversion")
18- property bool canCheckDiversion: true
19+ title: i18n.tr("Call forwarding")
20+ property bool canCheckForwarding: true
21
22 /* Simulate going off and retreiving the status, TODO: replace by real data */
23 Timer {
24- id: callDiversionTimer
25+ id: callForwardingTimer
26 interval: 3000
27 running: true
28- onTriggered: canCheckDiversion = false
29+ onTriggered: canCheckForwarding = false
30 }
31
32 Switch {
33- id: callDiversionSwitch
34+ id: callForwardingSwitch
35 checked: false
36- visible: callDiversionItem.control == callDiversionSwitch
37+ visible: callForwardingItem.control == callForwardingSwitch
38 }
39
40 ActivityIndicator {
41- id: callDiversionIndicator
42+ id: callForwardingIndicator
43 running: true
44- visible: callDiversionItem.control == callDiversionIndicator
45+ visible: callForwardingItem.control == callForwardingIndicator
46 }
47
48 Label {
49@@ -56,9 +56,9 @@
50 anchors.fill: parent
51
52 ListItem.Standard {
53- id: callDiversionItem
54- text: i18n.tr("Call diversion")
55- control: callDiversionTimer.running ? callDiversionIndicator : callDiversionSwitch
56+ id: callForwardingItem
57+ text: i18n.tr("Call forwarding")
58+ control: callForwardingTimer.running ? callForwardingIndicator : callForwardingSwitch
59 }
60
61 ListItem.Base {
62@@ -76,7 +76,7 @@
63 wrapMode: Text.WordWrap
64 }
65 showDivider: false
66- visible: !callDiversionSwitch.checked
67+ visible: !callForwardingSwitch.checked
68 }
69
70 ListItem.Base {
71@@ -88,20 +88,20 @@
72 verticalCenter: parent.verticalCenter
73 }
74
75- text: i18n.tr("Call diversion status can’t be checked right now. Try again later.")
76+ text: i18n.tr("Call forwarding status can’t be checked right now. Try again later.")
77 color: "red" // TODO: replace by the standard 'error color' if we get one in the toolkit
78 horizontalAlignment: Text.AlignHCenter
79 wrapMode: Text.WordWrap
80 }
81 showDivider: false
82- visible: !callDiversionSwitch.checked && !canCheckDiversion
83+ visible: !callForwardingSwitch.checked && !canCheckForwarding
84 }
85
86 ListItem.Standard {
87 property string contactName: ""
88 text: i18n.tr("Divert to")
89 control: contactLabel
90- visible: callDiversionSwitch.checked
91+ visible: callForwardingSwitch.checked
92 }
93
94 ListItem.Base {
95@@ -117,7 +117,7 @@
96 }
97 }
98 }
99- visible: callDiversionSwitch.checked
100+ visible: callForwardingSwitch.checked
101 }
102 }
103 }
104
105=== modified file 'plugins/phone/PageComponent.qml'
106--- plugins/phone/PageComponent.qml 2013-07-30 16:10:31 +0000
107+++ plugins/phone/PageComponent.qml 2013-08-01 15:04:53 +0000
108@@ -45,9 +45,9 @@
109 anchors.fill: parent
110
111 ListItem.Standard {
112- text: i18n.tr("Call diversion")
113+ text: i18n.tr("Call forwarding")
114 progression: true
115- onClicked: pageStack.push(Qt.resolvedUrl("CallDiversion.qml"))
116+ onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"))
117 }
118
119 ListItem.Standard {
120
121=== modified file 'plugins/phone/phone.pro'
122--- plugins/phone/phone.pro 2013-07-30 17:03:38 +0000
123+++ plugins/phone/phone.pro 2013-08-01 15:04:53 +0000
124@@ -5,7 +5,7 @@
125 TARGET = phone
126
127 QML_SOURCES = \
128- CallDiversion.qml \
129+ CallForwarding.qml \
130 CallWaiting.qml \
131 PageComponent.qml \
132 ServiceInfo.qml \
133
134=== modified file 'po/ubuntu-system-settings.pot'
135--- po/ubuntu-system-settings.pot 2013-07-30 09:41:21 +0000
136+++ po/ubuntu-system-settings.pot 2013-08-01 15:04:53 +0000
137@@ -8,7 +8,7 @@
138 msgstr ""
139 "Project-Id-Version: ubuntu-system-settings\n"
140 "Report-Msgid-Bugs-To: \n"
141-"POT-Creation-Date: 2013-07-30 11:41+0200\n"
142+"POT-Creation-Date: 2013-07-31 10:17-0400\n"
143 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
144 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
145 "Language-Team: LANGUAGE <LL@li.org>\n"
146@@ -50,19 +50,19 @@
147 msgid "Check for updates"
148 msgstr ""
149
150-#: ../plugins/about/PageComponent.qml:110 ../plugins/about/Storage.qml:32
151+#: ../plugins/about/PageComponent.qml:112 ../plugins/about/Storage.qml:32
152 msgid "Storage"
153 msgstr ""
154
155-#: ../plugins/about/PageComponent.qml:116
156+#: ../plugins/about/PageComponent.qml:118
157 msgid "Legal:"
158 msgstr ""
159
160-#: ../plugins/about/PageComponent.qml:120 ../plugins/about/Software.qml:10
161+#: ../plugins/about/PageComponent.qml:122 ../plugins/about/Software.qml:10
162 msgid "Software licenses"
163 msgstr ""
164
165-#: ../plugins/about/PageComponent.qml:126
166+#: ../plugins/about/PageComponent.qml:128
167 msgid "Regulatory info"
168 msgstr ""
169
170@@ -197,7 +197,7 @@
171 msgstr ""
172
173 #: ../plugins/language/DisplayLanguage.qml:84
174-#: ../plugins/phone/CallDiversion.qml:113
175+#: ../plugins/phone/CallForwarding.qml:113
176 #: ../plugins/reset/EraseEverything.qml:35
177 #: ../plugins/reset/ResetAllSettings.qml:35
178 #: ../plugins/reset/ResetLauncherHome.qml:35
179@@ -264,35 +264,36 @@
180 msgid "All languages available:"
181 msgstr ""
182
183-#: ../plugins/phone/CallDiversion.qml:27 ../plugins/phone/CallDiversion.qml:60
184-#: ../plugins/phone/PageComponent.qml:43
185-msgid "Call diversion"
186+#: ../plugins/phone/CallForwarding.qml:27
187+#: ../plugins/phone/CallForwarding.qml:60
188+#: ../plugins/phone/PageComponent.qml:48
189+msgid "Call forwarding"
190 msgstr ""
191
192-#: ../plugins/phone/CallDiversion.qml:74
193+#: ../plugins/phone/CallForwarding.qml:74
194 msgid ""
195 "Redirects phone calls to another number whenever you don't answer, or your "
196 "phone is busy, turned off, or out of range."
197 msgstr ""
198
199-#: ../plugins/phone/CallDiversion.qml:91
200-msgid "Call diversion status can’t be checked right now. Try again later."
201+#: ../plugins/phone/CallForwarding.qml:91
202+msgid "Call forwarding status can’t be checked right now. Try again later."
203 msgstr ""
204
205-#: ../plugins/phone/CallDiversion.qml:102
206+#: ../plugins/phone/CallForwarding.qml:102
207 msgid "Divert to"
208 msgstr ""
209
210-#: ../plugins/phone/CallDiversion.qml:113
211+#: ../plugins/phone/CallForwarding.qml:113
212 msgid "Contacts…"
213 msgstr ""
214
215-#: ../plugins/phone/CallDiversion.qml:113
216+#: ../plugins/phone/CallForwarding.qml:113
217 msgid "Set"
218 msgstr ""
219
220 #: ../plugins/phone/CallWaiting.qml:27 ../plugins/phone/CallWaiting.qml:53
221-#: ../plugins/phone/PageComponent.qml:49
222+#: ../plugins/phone/PageComponent.qml:54
223 msgid "Call waiting"
224 msgstr ""
225
226@@ -302,45 +303,23 @@
227 "between them"
228 msgstr ""
229
230-#: ../plugins/phone/PageComponent.qml:28 ../.build/settings.js:13
231+#: ../plugins/phone/PageComponent.qml:29 ../.build/settings.js:13
232 msgid "Phone"
233 msgstr ""
234
235-#: ../plugins/phone/PageComponent.qml:30
236+#: ../plugins/phone/PageComponent.qml:31
237 msgid "SIM"
238 msgstr ""
239
240-#: ../plugins/phone/PageComponent.qml:57 ../plugins/phone/Services.qml:28
241+#: ../plugins/phone/PageComponent.qml:62 ../plugins/phone/Services.qml:29
242 #, qt-format
243 msgid "%1 Services"
244 msgstr ""
245
246-#: ../plugins/phone/ServiceInfo.qml:34
247+#: ../plugins/phone/ServiceInfo.qml:35
248 msgid "Call"
249 msgstr ""
250
251-#: ../plugins/phone/Services.qml:34
252-msgid "Voicemail"
253-msgstr ""
254-
255-#: ../plugins/phone/Services.qml:34
256-#, qt-format
257-msgid "My %1 Credit & Plan"
258-msgstr ""
259-
260-#: ../plugins/phone/Services.qml:35
261-#, qt-format
262-msgid "Listen to digits of %1"
263-msgstr ""
264-
265-#: ../plugins/phone/Services.qml:35
266-msgid "Traffic report"
267-msgstr ""
268-
269-#: ../plugins/phone/Services.qml:35
270-msgid "Horoscopes"
271-msgstr ""
272-
273 #: ../plugins/reset/EraseEverything.qml:29
274 msgid ""
275 "All documents, saved games, settings, and other items will be permanently "
276@@ -471,49 +450,53 @@
277 msgid "Update phone"
278 msgstr ""
279
280-#: ../plugins/system-update/PageComponent.qml:108
281+#: ../plugins/system-update/PageComponent.qml:113
282 msgid "Congrats! You are already up to date!"
283 msgstr ""
284
285-#: ../plugins/system-update/PageComponent.qml:110
286+#: ../plugins/system-update/PageComponent.qml:115
287 msgid "A new version is available!"
288 msgstr ""
289
290-#: ../plugins/system-update/PageComponent.qml:111
291+#: ../plugins/system-update/PageComponent.qml:116
292 msgid "Checking latest available system version…"
293 msgstr ""
294
295-#: ../plugins/system-update/PageComponent.qml:133
296+#: ../plugins/system-update/PageComponent.qml:153
297 #, qt-format
298 msgid "You can update from version %1 to version %2"
299 msgstr ""
300
301-#: ../plugins/system-update/PageComponent.qml:136
302+#: ../plugins/system-update/PageComponent.qml:156
303 #, qt-format
304 msgid "Size of this update: %1"
305 msgstr ""
306
307-#: ../plugins/system-update/PageComponent.qml:146
308+#: ../plugins/system-update/PageComponent.qml:160
309+msgid "This update will:"
310+msgstr ""
311+
312+#: ../plugins/system-update/PageComponent.qml:170
313 msgid "Apply?"
314 msgstr ""
315
316-#: ../plugins/system-update/PageComponent.qml:155
317+#: ../plugins/system-update/PageComponent.qml:175
318 msgid "Update your phone"
319 msgstr ""
320
321-#: ../plugins/system-update/PageComponent.qml:161
322+#: ../plugins/system-update/PageComponent.qml:181
323 msgid "Cancel update"
324 msgstr ""
325
326-#: ../plugins/system-update/PageComponent.qml:167
327+#: ../plugins/system-update/PageComponent.qml:187
328 msgid "Reboot your phone now"
329 msgstr ""
330
331-#: ../plugins/system-update/PageComponent.qml:183
332+#: ../plugins/system-update/PageComponent.qml:203
333 msgid "We are deeply sorry"
334 msgstr ""
335
336-#: ../plugins/system-update/PageComponent.qml:184
337+#: ../plugins/system-update/PageComponent.qml:204
338 msgid "The update failed. Please try again later"
339 msgstr ""
340
341
342=== removed file 'po/update_pot.sh'
343--- po/update_pot.sh 2013-05-03 19:32:01 +0000
344+++ po/update_pot.sh 1970-01-01 00:00:00 +0000
345@@ -1,5 +0,0 @@
346-#! /bin/bash
347-
348-cd ../src
349-make ../po/system-settings.pot
350-
351
352=== modified file 'src/system-settings.pro'
353--- src/system-settings.pro 2013-07-03 18:59:27 +0000
354+++ src/system-settings.pro 2013-08-01 15:04:53 +0000
355@@ -56,7 +56,7 @@
356 PLUGIN_PRIVATE_MODULE_DIR=\\\"$${PLUGIN_PRIVATE_MODULE_DIR}\\\" \
357 PLUGIN_QML_DIR=\\\"$${PLUGIN_QML_DIR}\\\"
358
359-po.target = ../po/system-settings.pot
360+po.target = ../po/ubuntu-system-settings.pot
361 po.depends = $${SOURCES}
362 po.commands = xgettext -o $@ -d $${I18N_DOMAIN} --keyword=_ $^
363

Subscribers

People subscribed via source and target branches