Merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-city-name-fix into lp:ubuntu-clock-app

Proposed by Bartosz Kosiorek on 2015-07-28
Status: Merged
Approved by: Bartosz Kosiorek on 2015-08-16
Approved revision: 330
Merged at revision: 336
Proposed branch: lp:~gang65/ubuntu-clock-app/ubuntu-clock-city-name-fix
Merge into: lp:ubuntu-clock-app
Diff against target: 3872 lines (+982/-928)
51 files modified
app/alarm/AlarmModelComponent.qml (+1/-1)
app/alarm/AlarmPage.qml (+1/-1)
app/alarm/AlarmSettingsPage.qml (+1/-1)
app/alarm/AlarmUtils.qml (+1/-1)
app/components/AnalogMode.qml (+1/-1)
app/components/AnalogShadow.qml (+1/-1)
app/components/Background.qml (+1/-1)
app/components/Clock.qml (+1/-1)
app/components/ClockCircle.qml (+1/-1)
app/components/DigitalMode.qml (+1/-1)
app/components/DigitalShadow.qml (+1/-1)
app/components/EmptyState.qml (+1/-1)
app/components/Shadow.qml (+1/-1)
app/components/SubtitledListItem.qml (+1/-1)
app/upstreamcomponents/FakeHeader.qml (+1/-1)
app/upstreamcomponents/FastScroll.js (+1/-1)
app/upstreamcomponents/FastScroll.qml (+1/-1)
app/worldclock/AddWorldCityButton.qml (+1/-1)
app/worldclock/UserWorldCityDelegate.qml (+3/-3)
app/worldclock/UserWorldCityList.qml (+1/-1)
app/worldclock/WorldCityList.qml (+22/-18)
backend/modules/Alarm/Settings/alarmsettings.cpp (+1/-1)
backend/modules/Alarm/Settings/alarmsettings.h (+1/-1)
backend/modules/Alarm/Settings/backend.cpp (+1/-1)
backend/modules/Alarm/Settings/backend.h (+1/-1)
backend/modules/DateTime/backend.cpp (+1/-1)
backend/modules/DateTime/backend.h (+1/-1)
backend/modules/DateTime/datetime.cpp (+1/-1)
backend/modules/DateTime/datetime.h (+1/-1)
backend/modules/GeoLocation/backend.cpp (+1/-1)
backend/modules/GeoLocation/backend.h (+1/-1)
backend/modules/GeoLocation/geolocation.cpp (+1/-1)
backend/modules/GeoLocation/geolocation.h (+1/-1)
backend/modules/Timezone/backend.cpp (+1/-1)
backend/modules/Timezone/backend.h (+1/-1)
backend/modules/Timezone/generictimezonemodel.cpp (+28/-12)
backend/modules/Timezone/generictimezonemodel.h (+1/-1)
backend/modules/Timezone/jsontimezonemodel.cpp (+11/-10)
backend/modules/Timezone/jsontimezonemodel.h (+1/-1)
backend/modules/Timezone/statictimezonemodel.cpp (+327/-308)
backend/modules/Timezone/statictimezonemodel.h (+4/-1)
backend/modules/Timezone/timezonemodel.cpp (+18/-12)
backend/modules/Timezone/timezonemodel.h (+6/-4)
debian/changelog (+6/-3)
po/com.ubuntu.clock.pot (+516/-516)
tests/autopilot/ubuntu_clock_app/CMakePluginParser.py (+1/-1)
tests/autopilot/ubuntu_clock_app/fixture_setup.py (+1/-1)
tests/autopilot/ubuntu_clock_app/tests/__init__.py (+1/-1)
tests/autopilot/ubuntu_clock_app/tests/test_clock.py (+1/-1)
tests/unit/ClockTestCase.qml (+1/-1)
tests/unit/MockClockApp.qml (+1/-1)
To merge this branch: bzr merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-city-name-fix
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan Approve on 2015-08-16
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-08-16
Niklas Wenzel (community) 2015-07-28 Needs Information on 2015-08-11
Review via email: mp+266153@code.launchpad.net

Commit message

Translate city and country names after language switch (LP: #1477492)
Fix issue when unable to add city/country with apostrophes (LP: #1473074)

Description of the change

Translate city and country names after language switch (LP: #1477492)
Fix issue when unable to add city/country with apostrophes (LP: #1473074)
Save CityId in User database instead of localized name

To post a comment you must log in.

FAILED: Continuous integration, rev:314
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-city-name-fix/+merge/266153/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/727/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/72

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/727/rebuild

review: Needs Fixing (continuous-integration)

FAILED: Continuous integration, rev:316
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-city-name-fix/+merge/266153/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/728/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/73

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/728/rebuild

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)
Niklas Wenzel (nikwen) wrote :

Looks good to me. Well done! ;)

See my inline comments for a few remarks. Some of them are questions though as you might have a reason why you did things differently.
Nevertheless, I'd like someone who is more familiar with the clock app code to review this as well. However, from looking at the code, everything in there looks reasonable to me.

Thanks!

review: Needs Information
review: Approve (continuous-integration)
review: Approve (continuous-integration)
Nekhelesh Ramananthan (nik90) wrote :

I haven't yet reviewed the entire MP yet, but as a start could you update the copyright year of the file you have modified in this MP to 2015 as well. So something like "Copyright (C) 2014-2015 Canonical Ltd"

review: Needs Fixing
Nekhelesh Ramananthan (nik90) wrote :

On testing I observed the following issues,

First, language switching nicely switched the world city translations as well. Good Job on that! However there seems to be some regressions that have been introduced.

1. FastScroll is broken even when the phone language is English. I believe bug 1483880 was reported for fastscroll not working for non-latin characters. But my issue is reproducible even for latin characters which is a regression.

2. Search for a city using the search toolbar function is broken in all languages (Quite serious). In fact it doesn't even go online to search Ubuntu Geonames for a city not found in the list we ship with clock app.

3. In other languages, the static city list is not ordered alphabetically. I see the order like A, A`, P, C, D etc.

review: Needs Fixing (testing)
review: Approve (continuous-integration)
review: Approve (continuous-integration)
review: Approve (continuous-integration)
review: Approve (continuous-integration)
Nekhelesh Ramananthan (nik90) wrote :

Just tested it now again and it works nicely without regressions and fixes the issues it set out to fix. Will approve after I finish my code review. Thanks for working on this!

review: Abstain
Nekhelesh Ramananthan (nik90) wrote :

Code looks good except for some really really minor quibbles that I have pointed out. Most of them cant be ignored if you wish to do so, however there were some spelling mistakes and confusion in the function names. Please fix them. Thanks.

review: Needs Fixing
Nekhelesh Ramananthan (nik90) wrote :

Added inline comments

review: Approve (continuous-integration)
Nekhelesh Ramananthan (nik90) wrote :

* Does the MP add/remove user visible strings? If Yes, has the pot file been
    updated?

* Does the MP change the UI? If Yes, has it been approved by design?

No UI Changes.

* Did you perform an exploratory manual test run of your code change and any
    related functionality?

Yes, tested on N4, #95. All world city features work as expected!

* If the MP fixes a bug or implements a feature, are there accompanying unit
    and autopilot tests?

No accompanying unit test, but that is acceptable for now.

* Is the clock app trunk buildable and runnable using Qtcreator?

Yes

* Was the debian changelog updated?

Yes, but is causing a code conflict. Please fix the debian changelog and then top-approve when ready!

* Was the copyright years updated if necessary?

Yes, more than sufficiently ;)

review: Approve
330. By Bartosz Kosiorek on 2015-08-16

Updated translation template

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmModelComponent.qml'
2--- app/alarm/AlarmModelComponent.qml 2015-07-15 22:31:52 +0000
3+++ app/alarm/AlarmModelComponent.qml 2015-08-16 20:56:40 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2014 Canonical Ltd
7+ * Copyright (C) 2014-2015 Canonical Ltd
8 *
9 * This file is part of Ubuntu Clock App
10 *
11
12=== modified file 'app/alarm/AlarmPage.qml'
13--- app/alarm/AlarmPage.qml 2015-07-24 13:32:46 +0000
14+++ app/alarm/AlarmPage.qml 2015-08-16 20:56:40 +0000
15@@ -1,5 +1,5 @@
16 /*
17- * Copyright (C) 2014 Canonical Ltd
18+ * Copyright (C) 2014-2015 Canonical Ltd
19 *
20 * This file is part of Ubuntu Clock App
21 *
22
23=== modified file 'app/alarm/AlarmSettingsPage.qml'
24--- app/alarm/AlarmSettingsPage.qml 2015-08-11 20:39:12 +0000
25+++ app/alarm/AlarmSettingsPage.qml 2015-08-16 20:56:40 +0000
26@@ -1,5 +1,5 @@
27 /*
28- * Copyright (C) 2014 Canonical Ltd
29+ * Copyright (C) 2014-2015 Canonical Ltd
30 *
31 * This file is part of Ubuntu Clock App
32 *
33
34=== modified file 'app/alarm/AlarmUtils.qml'
35--- app/alarm/AlarmUtils.qml 2015-08-04 12:30:46 +0000
36+++ app/alarm/AlarmUtils.qml 2015-08-16 20:56:40 +0000
37@@ -1,5 +1,5 @@
38 /*
39- * Copyright (C) 2014 Canonical Ltd
40+ * Copyright (C) 2014-2015 Canonical Ltd
41 *
42 * This file is part of Ubuntu Clock App
43 *
44
45=== modified file 'app/components/AnalogMode.qml'
46--- app/components/AnalogMode.qml 2015-05-27 16:03:23 +0000
47+++ app/components/AnalogMode.qml 2015-08-16 20:56:40 +0000
48@@ -1,5 +1,5 @@
49 /*
50- * Copyright (C) 2014 Canonical Ltd
51+ * Copyright (C) 2014-2015 Canonical Ltd
52 *
53 * This file is part of Ubuntu Clock App
54 *
55
56=== modified file 'app/components/AnalogShadow.qml'
57--- app/components/AnalogShadow.qml 2015-05-27 16:03:23 +0000
58+++ app/components/AnalogShadow.qml 2015-08-16 20:56:40 +0000
59@@ -1,5 +1,5 @@
60 /*
61- * Copyright (C) 2014 Canonical Ltd
62+ * Copyright (C) 2014-2015 Canonical Ltd
63 *
64 * This file is part of Ubuntu Clock App
65 *
66
67=== modified file 'app/components/Background.qml'
68--- app/components/Background.qml 2015-05-27 16:03:23 +0000
69+++ app/components/Background.qml 2015-08-16 20:56:40 +0000
70@@ -1,5 +1,5 @@
71 /*
72- * Copyright (C) 2014 Canonical Ltd
73+ * Copyright (C) 2014-2015 Canonical Ltd
74 *
75 * This file is part of Ubuntu Clock App
76 *
77
78=== modified file 'app/components/Clock.qml'
79--- app/components/Clock.qml 2015-05-27 16:03:23 +0000
80+++ app/components/Clock.qml 2015-08-16 20:56:40 +0000
81@@ -1,5 +1,5 @@
82 /*
83- * Copyright (C) 2014 Canonical Ltd
84+ * Copyright (C) 2014-2015 Canonical Ltd
85 *
86 * This file is part of Ubuntu Clock App
87 *
88
89=== modified file 'app/components/ClockCircle.qml'
90--- app/components/ClockCircle.qml 2015-05-27 16:03:23 +0000
91+++ app/components/ClockCircle.qml 2015-08-16 20:56:40 +0000
92@@ -1,5 +1,5 @@
93 /*
94- * Copyright (C) 2014 Canonical Ltd
95+ * Copyright (C) 2014-2015 Canonical Ltd
96 *
97 * This file is part of Ubuntu Clock App
98 *
99
100=== modified file 'app/components/DigitalMode.qml'
101--- app/components/DigitalMode.qml 2015-05-27 16:03:23 +0000
102+++ app/components/DigitalMode.qml 2015-08-16 20:56:40 +0000
103@@ -1,5 +1,5 @@
104 /*
105- * Copyright (C) 2014 Canonical Ltd
106+ * Copyright (C) 2014-2015 Canonical Ltd
107 *
108 * This file is part of Ubuntu Clock App
109 *
110
111=== modified file 'app/components/DigitalShadow.qml'
112--- app/components/DigitalShadow.qml 2015-05-27 16:03:23 +0000
113+++ app/components/DigitalShadow.qml 2015-08-16 20:56:40 +0000
114@@ -1,5 +1,5 @@
115 /*
116- * Copyright (C) 2014 Canonical Ltd
117+ * Copyright (C) 2014-2015 Canonical Ltd
118 *
119 * This file is part of Ubuntu Clock App
120 *
121
122=== modified file 'app/components/EmptyState.qml'
123--- app/components/EmptyState.qml 2015-07-16 21:02:18 +0000
124+++ app/components/EmptyState.qml 2015-08-16 20:56:40 +0000
125@@ -1,5 +1,5 @@
126 /*
127- * Copyright (C) 2014 Canonical Ltd
128+ * Copyright (C) 2014-2015 Canonical Ltd
129 *
130 * This file is part of Ubuntu Clock App
131 *
132
133=== modified file 'app/components/Shadow.qml'
134--- app/components/Shadow.qml 2015-05-27 16:03:23 +0000
135+++ app/components/Shadow.qml 2015-08-16 20:56:40 +0000
136@@ -1,5 +1,5 @@
137 /*
138- * Copyright (C) 2014 Canonical Ltd
139+ * Copyright (C) 2014-2015 Canonical Ltd
140 *
141 * This file is part of Ubuntu Clock App
142 *
143
144=== modified file 'app/components/SubtitledListItem.qml'
145--- app/components/SubtitledListItem.qml 2015-06-03 16:05:03 +0000
146+++ app/components/SubtitledListItem.qml 2015-08-16 20:56:40 +0000
147@@ -1,5 +1,5 @@
148 /*
149- * Copyright (C) 2014 Canonical Ltd
150+ * Copyright (C) 2014-2015 Canonical Ltd
151 *
152 * This file is part of Ubuntu Clock App
153 *
154
155=== modified file 'app/upstreamcomponents/FakeHeader.qml'
156--- app/upstreamcomponents/FakeHeader.qml 2015-05-27 16:03:23 +0000
157+++ app/upstreamcomponents/FakeHeader.qml 2015-08-16 20:56:40 +0000
158@@ -1,5 +1,5 @@
159 /*
160- * Copyright (C) 2014 Canonical Ltd
161+ * Copyright (C) 2014-2015 Canonical Ltd
162 *
163 * This file is part of Ubuntu Clock App
164 *
165
166=== modified file 'app/upstreamcomponents/FastScroll.js'
167--- app/upstreamcomponents/FastScroll.js 2014-07-28 13:02:59 +0000
168+++ app/upstreamcomponents/FastScroll.js 2015-08-16 20:56:40 +0000
169@@ -1,7 +1,7 @@
170 /****************************************************************************
171 **
172 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
173-** Copyright (C) 2014 Canonical Ltda
174+** Copyright (C) 2014-2015 Canonical Ltda
175 ** All rights reserved.
176 ** Contact: Nokia Corporation (qt-info@nokia.com)
177 **
178
179=== modified file 'app/upstreamcomponents/FastScroll.qml'
180--- app/upstreamcomponents/FastScroll.qml 2015-05-27 16:03:23 +0000
181+++ app/upstreamcomponents/FastScroll.qml 2015-08-16 20:56:40 +0000
182@@ -1,7 +1,7 @@
183 /****************************************************************************
184 **
185 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
186-** Copyright (C) 2014 Canonical Ltda
187+** Copyright (C) 2014-2015 Canonical Ltda
188 ** All rights reserved.
189 ** Contact: Nokia Corporation (qt-info@nokia.com)
190 **
191
192=== modified file 'app/worldclock/AddWorldCityButton.qml'
193--- app/worldclock/AddWorldCityButton.qml 2015-05-27 16:03:23 +0000
194+++ app/worldclock/AddWorldCityButton.qml 2015-08-16 20:56:40 +0000
195@@ -1,5 +1,5 @@
196 /*
197- * Copyright (C) 2014 Canonical Ltd
198+ * Copyright (C) 2014-2015 Canonical Ltd
199 *
200 * This file is part of Ubuntu Clock App
201 *
202
203=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
204--- app/worldclock/UserWorldCityDelegate.qml 2015-05-27 16:03:23 +0000
205+++ app/worldclock/UserWorldCityDelegate.qml 2015-08-16 20:56:40 +0000
206@@ -1,5 +1,5 @@
207 /*
208- * Copyright (C) 2014 Canonical Ltd
209+ * Copyright (C) 2014-2015 Canonical Ltd
210 *
211 * This file is part of Ubuntu Clock App
212 *
213@@ -52,7 +52,7 @@
214 }
215
216 Label {
217- text: model.city
218+ text: model.cityName
219 objectName: "userCityNameText"
220 width: parent.width
221 elide: Text.ElideRight
222@@ -60,7 +60,7 @@
223 }
224
225 Label {
226- text: model.country
227+ text: model.countryName
228 objectName: "userCountryNameText"
229 fontSize: "xx-small"
230 width: parent.width
231
232=== modified file 'app/worldclock/UserWorldCityList.qml'
233--- app/worldclock/UserWorldCityList.qml 2015-05-27 16:03:23 +0000
234+++ app/worldclock/UserWorldCityList.qml 2015-08-16 20:56:40 +0000
235@@ -1,5 +1,5 @@
236 /*
237- * Copyright (C) 2014 Canonical Ltd
238+ * Copyright (C) 2014-2015 Canonical Ltd
239 *
240 * This file is part of Ubuntu Clock App
241 *
242
243=== modified file 'app/worldclock/WorldCityList.qml'
244--- app/worldclock/WorldCityList.qml 2015-07-24 13:16:28 +0000
245+++ app/worldclock/WorldCityList.qml 2015-08-16 20:56:40 +0000
246@@ -1,5 +1,5 @@
247 /*
248- * Copyright (C) 2014 Canonical Ltd
249+ * Copyright (C) 2014-2015 Canonical Ltd
250 *
251 * This file is part of Ubuntu Clock App
252 *
253@@ -124,7 +124,7 @@
254 var url = String("%1%2%3")
255 .arg("http://geoname-lookup.ubuntu.com/?query=")
256 .arg(searchField.text)
257- .arg("&app=com.ubuntu.clock&version=3.4.x")
258+ .arg("&app=com.ubuntu.clock&version=3.5.x")
259 console.log("Online URL: " + url)
260 if (jsonTimeZoneModelLoader.status === Loader.Ready) {
261 jsonTimeZoneModel.source = Qt.resolvedUrl(url)
262@@ -196,9 +196,9 @@
263 }
264 }
265
266- sort.property: "city"
267+ sort.property: "cityName"
268 sort.order: Qt.AscendingOrder
269- filter.property: "city"
270+ filter.property: "cityName"
271 filter.pattern: searchComponentLoader.status === Loader.Ready ? RegExp(searchComponentLoader.item.text, "gi")
272 : RegExp("", "gi")
273 }
274@@ -266,24 +266,27 @@
275 id: cityList
276 objectName: "cityList"
277
278- function addWorldCity(city, country, timezone) {
279- console.log("[LOG]: Adding city to U1db Database")
280+ function addWorldCity(cityId, countryName, timezone) {
281+ console.log("[LOG]: Adding " + cityId.toString() + " city to U1db Database")
282 clockDB.putDoc
283 (
284 {
285 "worldlocation":
286 {
287- "city": city,
288- "country": country,
289+ "city": cityId,
290+ "country": countryName.replace("'"," "),
291 "timezone": timezone
292 }
293 },
294- encodeURIComponent(city + "_" + country)
295+ // Apostrophes are forbidden by database, so we replace it with spaces.
296+ // It will be replaced/translated next time after read from database.
297+ // Country field is used only by jsonTimeZoneModel (lp: #1473074).
298+ encodeURIComponent(cityId + "_" + countryName.replace("'"," "))
299 )
300 }
301
302 function getSectionText(index) {
303- return sortedTimeZoneModel.get(index).city.substring(0,1)
304+ return sortedTimeZoneModel.get(index).cityName.substring(0,1)
305 }
306
307 onFlickStarted: {
308@@ -299,7 +302,7 @@
309
310 clip: true
311
312- section.property: "city"
313+ section.property: "cityName"
314 section.criteria: ViewSection.FirstCharacter
315 section.labelPositioning: ViewSection.InlineLabels
316
317@@ -334,7 +337,7 @@
318 }
319
320 Label {
321- text: city
322+ text: cityName
323 objectName: "defaultCityNameText"
324 width: parent.width
325 elide: Text.ElideRight
326@@ -342,7 +345,7 @@
327 }
328
329 Label {
330- text: country
331+ text: countryName
332 objectName: "defaultCountryNameText"
333 fontSize: "xx-small"
334 width: parent.width
335@@ -361,12 +364,13 @@
336 }
337
338 onClicked: {
339- var tempCountry = country.split(",")
340- if(tempCountry.length > 2) {
341- cityList.addWorldCity(city, tempCountry[1] + ","
342- + tempCountry[2], timezoneID)
343+ var splittedCountryName = countryName.split(",")
344+ if(splittedCountryName.length > 2) {
345+ cityList.addWorldCity(cityId,
346+ splittedCountryName[1] + "," + splittedCountryName[2],
347+ timezoneID)
348 } else {
349- cityList.addWorldCity(city, country, timezoneID)
350+ cityList.addWorldCity(cityId, countryName, timezoneID)
351 }
352
353 mainStack.pop()
354
355=== modified file 'backend/modules/Alarm/Settings/alarmsettings.cpp'
356--- backend/modules/Alarm/Settings/alarmsettings.cpp 2014-09-06 16:28:39 +0000
357+++ backend/modules/Alarm/Settings/alarmsettings.cpp 2015-08-16 20:56:40 +0000
358@@ -1,5 +1,5 @@
359 /*
360- * Copyright (C) 2014 Canonical Ltd
361+ * Copyright (C) 2014-2015 Canonical Ltd
362 *
363 * This file is part of Ubuntu Clock App
364 *
365
366=== modified file 'backend/modules/Alarm/Settings/alarmsettings.h'
367--- backend/modules/Alarm/Settings/alarmsettings.h 2014-09-06 16:28:39 +0000
368+++ backend/modules/Alarm/Settings/alarmsettings.h 2015-08-16 20:56:40 +0000
369@@ -1,5 +1,5 @@
370 /*
371- * Copyright (C) 2014 Canonical Ltd
372+ * Copyright (C) 2014-2015 Canonical Ltd
373 *
374 * This file is part of Ubuntu Clock App
375 *
376
377=== modified file 'backend/modules/Alarm/Settings/backend.cpp'
378--- backend/modules/Alarm/Settings/backend.cpp 2014-07-17 12:21:45 +0000
379+++ backend/modules/Alarm/Settings/backend.cpp 2015-08-16 20:56:40 +0000
380@@ -1,5 +1,5 @@
381 /*
382- * Copyright (C) 2014 Canonical Ltd
383+ * Copyright (C) 2014-2015 Canonical Ltd
384 *
385 * This file is part of Ubuntu Clock App
386 *
387
388=== modified file 'backend/modules/Alarm/Settings/backend.h'
389--- backend/modules/Alarm/Settings/backend.h 2014-07-17 12:21:45 +0000
390+++ backend/modules/Alarm/Settings/backend.h 2015-08-16 20:56:40 +0000
391@@ -1,5 +1,5 @@
392 /*
393- * Copyright (C) 2014 Canonical Ltd
394+ * Copyright (C) 2014-2015 Canonical Ltd
395 *
396 * This file is part of Ubuntu Clock App
397 *
398
399=== modified file 'backend/modules/DateTime/backend.cpp'
400--- backend/modules/DateTime/backend.cpp 2014-07-26 09:34:15 +0000
401+++ backend/modules/DateTime/backend.cpp 2015-08-16 20:56:40 +0000
402@@ -1,5 +1,5 @@
403 /*
404- * Copyright (C) 2014 Canonical Ltd
405+ * Copyright (C) 2014-2015 Canonical Ltd
406 *
407 * This file is part of Ubuntu Clock App
408 *
409
410=== modified file 'backend/modules/DateTime/backend.h'
411--- backend/modules/DateTime/backend.h 2014-07-26 09:34:15 +0000
412+++ backend/modules/DateTime/backend.h 2015-08-16 20:56:40 +0000
413@@ -1,5 +1,5 @@
414 /*
415- * Copyright (C) 2014 Canonical Ltd
416+ * Copyright (C) 2014-2015 Canonical Ltd
417 *
418 * This file is part of Ubuntu Clock App
419 *
420
421=== modified file 'backend/modules/DateTime/datetime.cpp'
422--- backend/modules/DateTime/datetime.cpp 2014-07-27 13:39:30 +0000
423+++ backend/modules/DateTime/datetime.cpp 2015-08-16 20:56:40 +0000
424@@ -1,5 +1,5 @@
425 /*
426- * Copyright (C) 2014 Canonical Ltd
427+ * Copyright (C) 2014-2015 Canonical Ltd
428 *
429 * This file is part of Ubuntu Clock App
430 *
431
432=== modified file 'backend/modules/DateTime/datetime.h'
433--- backend/modules/DateTime/datetime.h 2014-07-29 13:53:44 +0000
434+++ backend/modules/DateTime/datetime.h 2015-08-16 20:56:40 +0000
435@@ -1,5 +1,5 @@
436 /*
437- * Copyright (C) 2014 Canonical Ltd
438+ * Copyright (C) 2014-2015 Canonical Ltd
439 *
440 * This file is part of Ubuntu Clock App
441 *
442
443=== modified file 'backend/modules/GeoLocation/backend.cpp'
444--- backend/modules/GeoLocation/backend.cpp 2014-11-04 15:58:05 +0000
445+++ backend/modules/GeoLocation/backend.cpp 2015-08-16 20:56:40 +0000
446@@ -1,5 +1,5 @@
447 /*
448- * Copyright (C) 2014 Canonical Ltd
449+ * Copyright (C) 2014-2015 Canonical Ltd
450 *
451 * This file is part of Ubuntu Clock App
452 *
453
454=== modified file 'backend/modules/GeoLocation/backend.h'
455--- backend/modules/GeoLocation/backend.h 2014-08-21 15:46:45 +0000
456+++ backend/modules/GeoLocation/backend.h 2015-08-16 20:56:40 +0000
457@@ -1,5 +1,5 @@
458 /*
459- * Copyright (C) 2014 Canonical Ltd
460+ * Copyright (C) 2014-2015 Canonical Ltd
461 *
462 * This file is part of Ubuntu Clock App
463 *
464
465=== modified file 'backend/modules/GeoLocation/geolocation.cpp'
466--- backend/modules/GeoLocation/geolocation.cpp 2015-06-16 05:38:09 +0000
467+++ backend/modules/GeoLocation/geolocation.cpp 2015-08-16 20:56:40 +0000
468@@ -1,5 +1,5 @@
469 /*
470- * Copyright (C) 2014 Canonical Ltd
471+ * Copyright (C) 2014-2015 Canonical Ltd
472 *
473 * This file is part of Ubuntu Clock App
474 *
475
476=== modified file 'backend/modules/GeoLocation/geolocation.h'
477--- backend/modules/GeoLocation/geolocation.h 2014-11-04 15:58:05 +0000
478+++ backend/modules/GeoLocation/geolocation.h 2015-08-16 20:56:40 +0000
479@@ -1,5 +1,5 @@
480 /*
481- * Copyright (C) 2014 Canonical Ltd
482+ * Copyright (C) 2014-2015 Canonical Ltd
483 *
484 * This file is part of Ubuntu Clock App
485 *
486
487=== modified file 'backend/modules/Timezone/backend.cpp'
488--- backend/modules/Timezone/backend.cpp 2015-02-26 21:24:05 +0000
489+++ backend/modules/Timezone/backend.cpp 2015-08-16 20:56:40 +0000
490@@ -1,5 +1,5 @@
491 /*
492- * Copyright (C) 2014 Canonical Ltd
493+ * Copyright (C) 2014-2015 Canonical Ltd
494 *
495 * This file is part of Ubuntu Clock App
496 *
497
498=== modified file 'backend/modules/Timezone/backend.h'
499--- backend/modules/Timezone/backend.h 2014-07-17 12:21:45 +0000
500+++ backend/modules/Timezone/backend.h 2015-08-16 20:56:40 +0000
501@@ -1,5 +1,5 @@
502 /*
503- * Copyright (C) 2014 Canonical Ltd
504+ * Copyright (C) 2014-2015 Canonical Ltd
505 *
506 * This file is part of Ubuntu Clock App
507 *
508
509=== modified file 'backend/modules/Timezone/generictimezonemodel.cpp'
510--- backend/modules/Timezone/generictimezonemodel.cpp 2014-08-10 13:06:37 +0000
511+++ backend/modules/Timezone/generictimezonemodel.cpp 2015-08-16 20:56:40 +0000
512@@ -1,5 +1,5 @@
513 /*
514- * Copyright (C) 2014 Canonical Ltd
515+ * Copyright (C) 2014-2015 Canonical Ltd
516 *
517 * This file is part of Ubuntu Clock App
518 *
519@@ -17,6 +17,7 @@
520 */
521
522 #include "generictimezonemodel.h"
523+#include "statictimezonemodel.h"
524
525 #include <QDebug>
526
527@@ -32,7 +33,8 @@
528
529 void GenericTimeZoneModel::setResults(const QList<QVariant> &results)
530 {
531- if(m_results == results) {
532+ if(m_results == results)
533+ {
534 // Don't parse the results again if it is the same results being set again
535 return;
536 }
537@@ -47,7 +49,8 @@
538
539 void GenericTimeZoneModel::loadTimeZonesFromVariantList()
540 {
541- if(m_results.isEmpty()) {
542+ if(m_results.isEmpty())
543+ {
544 // Don't parse an empty results
545 return;
546 }
547@@ -55,24 +58,37 @@
548 // Let QML know model is being reset and rebuilt
549 beginResetModel();
550
551- m_timeZones.clear();
552+ m_citiesData.clear();
553
554- TimeZone tz;
555+ CityData cityData;
556
557 /*
558 Cycle through the u1db query model results and transfer them to the
559 TimeZone list.
560 */
561- for (int i=0; i < m_results.size(); i++) {
562+ StaticTimeZoneModel timeZonesData;
563+ for (int i=0; i < m_results.size(); i++)
564+ {
565 // Map query model results to timezone tz
566- tz.cityName = m_results.value(i).toMap().value("city").toString();
567- tz.country = m_results.value(i).toMap().value("country").toString();
568- tz.timeZone = QTimeZone(m_results.value(i).toMap().value("timezone").toString().toLatin1());
569-
570- m_timeZones.append(tz);
571+ cityData.cityId = m_results.value(i).toMap().value("city").toString();
572+
573+ TimeZoneModel::CityData translatedCityData = timeZonesData.getTranslatedCityData(cityData.cityId);
574+ if (translatedCityData.cityId == "")
575+ {
576+ cityData.cityName = cityData.cityId;
577+ cityData.countryName = m_results.value(i).toMap().value("country").toString();
578+ }
579+ else
580+ {
581+ cityData.cityName = translatedCityData.cityName;
582+ cityData.countryName = translatedCityData.countryName;
583+ }
584+ cityData.timeZone = QTimeZone(m_results.value(i).toMap().value("timezone").toString().toLatin1());
585+
586+ m_citiesData.append(cityData);
587
588 // Clear tz before next iteration
589- tz = TimeZone();
590+ cityData = CityData();
591 }
592
593
594
595=== modified file 'backend/modules/Timezone/generictimezonemodel.h'
596--- backend/modules/Timezone/generictimezonemodel.h 2014-07-22 13:10:43 +0000
597+++ backend/modules/Timezone/generictimezonemodel.h 2015-08-16 20:56:40 +0000
598@@ -1,5 +1,5 @@
599 /*
600- * Copyright (C) 2014 Canonical Ltd
601+ * Copyright (C) 2014-2015 Canonical Ltd
602 *
603 * This file is part of Ubuntu Clock App
604 *
605
606=== modified file 'backend/modules/Timezone/jsontimezonemodel.cpp'
607--- backend/modules/Timezone/jsontimezonemodel.cpp 2014-08-17 10:50:57 +0000
608+++ backend/modules/Timezone/jsontimezonemodel.cpp 2015-08-16 20:56:40 +0000
609@@ -1,5 +1,5 @@
610 /*
611- * Copyright (C) 2014 Canonical Ltd
612+ * Copyright (C) 2014-2015 Canonical Ltd
613 *
614 * This file is part of Ubuntu Clock App
615 *
616@@ -83,35 +83,36 @@
617 // Let QML know model is being reset and rebuilt
618 beginResetModel();
619
620- m_timeZones.clear();
621+ m_citiesData.clear();
622
623 /*
624 Cycle through each QVariant object and transfer them to the TimeZone
625 list.
626 */
627 foreach (const QVariant &entry, timezoneData.toList()) {
628- TimeZone tz;
629+ CityData cityData;
630
631 auto data = entry.toMap();
632 auto admin1 = data.value("admin1").toString();
633 auto admin2 = data.value("admin2").toString();
634 auto country = data.value("country").toString();
635
636- tz.cityName = data.value("name").toString();
637+ cityData.cityId = data.value("name").toString();
638+ cityData.cityName = cityData.cityId;
639
640 if (!admin1.isEmpty() && !admin2.isEmpty()) {
641- tz.country = QString("%1, %2, %3").arg(admin2).arg(admin1).arg(country);
642+ cityData.countryName = QString("%1, %2, %3").arg(admin2).arg(admin1).arg(country);
643 } else if (!admin1.isEmpty()) {
644- tz.country = QString("%1, %2").arg(admin1).arg(country);
645+ cityData.countryName = QString("%1, %2").arg(admin1).arg(country);
646 } else if (!admin2.isEmpty()) {
647- tz.country = QString("%1, %2").arg(admin2).arg(country);
648+ cityData.countryName = QString("%1, %2").arg(admin2).arg(country);
649 } else {
650- tz.country = country;
651+ cityData.countryName = country;
652 }
653
654- tz.timeZone = QTimeZone(data.value("timezone").toString().toLatin1());
655+ cityData.timeZone = QTimeZone(data.value("timezone").toString().toLatin1());
656
657- m_timeZones.append(tz);
658+ m_citiesData.append(cityData);
659 }
660
661 setStatus(TimeZoneModel::Ready);
662
663=== modified file 'backend/modules/Timezone/jsontimezonemodel.h'
664--- backend/modules/Timezone/jsontimezonemodel.h 2014-08-16 12:46:46 +0000
665+++ backend/modules/Timezone/jsontimezonemodel.h 2015-08-16 20:56:40 +0000
666@@ -1,5 +1,5 @@
667 /*
668- * Copyright (C) 2014 Canonical Ltd
669+ * Copyright (C) 2014-2015 Canonical Ltd
670 *
671 * This file is part of Ubuntu Clock App
672 *
673
674=== modified file 'backend/modules/Timezone/statictimezonemodel.cpp'
675--- backend/modules/Timezone/statictimezonemodel.cpp 2015-03-31 13:44:52 +0000
676+++ backend/modules/Timezone/statictimezonemodel.cpp 2015-08-16 20:56:40 +0000
677@@ -29,12 +29,13 @@
678 loadDefaultCityList();
679 }
680
681-void StaticTimeZoneModel::addCity(const QString &city, const QString &timezone, const QString &country) {
682- TimeZone tz;
683- tz.cityName = city;
684- tz.country = country;
685- tz.timeZone = QTimeZone(timezone.toLatin1());
686- m_timeZones.append(tz);
687+void StaticTimeZoneModel::addCity(const QString &cityId, const QString &cityName, const QString &timezone, const QString &countryName) {
688+ CityData cityData;
689+ cityData.cityId = cityId;
690+ cityData.cityName = cityName;
691+ cityData.countryName = countryName;
692+ cityData.timeZone = QTimeZone(timezone.toLatin1());
693+ m_citiesData.append(cityData);
694 }
695
696 void StaticTimeZoneModel::loadDefaultCityList()
697@@ -42,309 +43,327 @@
698 // Let QML know model is being reset and rebuilt
699 beginResetModel();
700
701- m_timeZones.clear();
702-
703- addCity(_("Abidjan"), "Africa/Abidjan", _("Ivory Coast"));
704- addCity(_("Accra"), "Africa/Accra", _("Ghana"));
705- addCity(_("Addis Ababa"), "Africa/Addis_Ababa", _("Ethiopia"));
706- addCity(_("Adelaide"), "Australia/Adelaide", _("Australia"));
707- addCity(_("Albuquerque"), "America/Denver", _("United States"));
708- addCity(_("Algiers"), "Africa/Algiers", _("Algeria"));
709- addCity(_("Almaty"), "Asia/Almaty", _("Kazakhstan"));
710- addCity(_("Amman"), "Asia/Amman", _("Jordan"));
711- addCity(_("Amsterdam"), "Europe/Amsterdam", _("Netherlands"));
712- addCity(_("Anadyr"), "Asia/Anadyr", _("Russia"));
713- addCity(_("Anchorage"), "America/Anchorage", _("United States"));
714- addCity(_("Andorra"), "Europe/Andorra", _("Andorra"));
715- addCity(_("Ankara"), "Europe/Istanbul", _("Turkey"));
716- addCity(_("Ann Arbor"), "America/Detroit", _("United States"));
717- addCity(_("Antananarivo"), "Indian/Antananarivo", _("Madagascar"));
718- addCity(_("Aqtau"), "Asia/Aqtau", _("Kazakhstan"));
719- addCity(_("Aruba"), "America/Aruba", _("Aruba"));
720- addCity(_("Asunción"), "America/Asuncion", _("Paraguay"));
721- addCity(_("Athens"), "Europe/Athens", _("Greece"));
722- addCity(_("Atlanta"), "America/New_York", _("United States"));
723- addCity(_("Auckland"), "Pacific/Auckland", _("New Zealand"));
724- addCity(_("Austin"), "America/Chicago", _("United States"));
725-
726- addCity(_("Baghdad"), "Asia/Baghdad", _("Iraq"));
727- addCity(_("Bahrain"), "Asia/Bahrain", _("Bahrain"));
728- addCity(_("Baku"), "Asia/Baku", _("Azerbaijan"));
729- addCity(_("Baltimore"), "America/New_York", _("United States"));
730- addCity(_("Bangalore"), "Asia/Kolkata", _("India"));
731- addCity(_("Bangkok"), "Asia/Bangkok", _("Thailand"));
732- addCity(_("Barbados"), "America/Barbados", _("Barbados"));
733- addCity(_("Barcelona"), "Europe/Madrid", _("Spain"));
734- addCity(_("Beijing"), "Asia/Shanghai", _("China"));
735- addCity(_("Beirut"), "Asia/Beirut", _("Lebanon"));
736- addCity(_("Belfast"), "Europe/Belfast", _("United Kingdom"));
737- addCity(_("Belgrade"), "Europe/Belgrade", _("Serbia"));
738- addCity(_("Belize"), "America/Belize", _("Belize"));
739- addCity(_("Belo Horizonte"), "America/Sao_Paulo", _("Brazil"));
740- addCity(_("Berlin"), "Europe/Berlin", _("Germany"));
741- addCity(_("Bermuda"), "Atlantic/Bermuda", _("Bermuda"));
742- addCity(_("Beulah"), "America/North_Dakota/Beulah", _("United States"));
743- addCity(_("Black Rock City"), "America/Chicago", _("United States"));
744- addCity(_("Blantyre"), "Africa/Blantyre", _("Malawi"));
745- addCity(_("Bogotá"), "America/Bogota", _("Colombia"));
746- addCity(_("Boston"), "America/New_York", _("United States"));
747- addCity(_("Boulder"), "America/Denver", _("United States"));
748- addCity(_("Brasília"), "America/Sao_Paulo", _("Brazil"));
749- addCity(_("Bratislava"), "Europe/Bratislava", _("Slovakia"));
750- addCity(_("Brazzaville"), "Africa/Brazzaville", _("Republic of the Congo"));
751- addCity(_("Brisbane"), "Australia/Brisbane", _("Australia"));
752- addCity(_("Brussels"), "Europe/Brussels", _("Belgium"));
753- addCity(_("Bucharest"), "Europe/Bucharest", _("Romania"));
754- addCity(_("Budapest"), "Europe/Budapest", _("Hungary"));
755- addCity(_("Buenos Aires"), "America/Argentina/Buenos_Aires", _("Argentina"));
756-
757- addCity(_("Cairo"), "Africa/Cairo", _("Egypt"));
758- addCity(_("Calcutta"), "Asia/Calcutta", _("India"));
759- addCity(_("Calgary"), "America/Edmonton", _("Canada"));
760- addCity(_("Cambridge"), "Europe/London", _("United Kingdom"));
761- addCity(_("Canary"), "Atlantic/Canary", _("Australia"));
762- addCity(_("Canberra"), "Australia/Canberra", _("Australia"));
763- addCity(_("Cancún"), "America/Cancun", _("Mexico"));
764- addCity(_("Cape Town"), "Africa/Johannesburg", _("South Africa"));
765- addCity(_("Caracas"), "America/Caracas", _("Venezuela"));
766- addCity(_("Casablanca"), "Africa/Casablanca", _("Morocco"));
767- addCity(_("Cayman Palms"), "America/Cayman", _("Cayman Islands"));
768- addCity(_("Chicago"), "America/Chicago", _("United States"));
769- addCity(_("Chihuahua"), "America/Chihuahua", _("Mexico"));
770- addCity(_("Chişinău"), "Europe/Chisinau", _("Moldova"));
771- addCity(_("Cincinnati"), "America/New_York", _("United States"));
772- addCity(_("Cleveland"), "America/New_York", _("United States"));
773- addCity(_("Colombo"), "Asia/Colombo", _("Sri Lanka"));
774- addCity(_("Columbus"), "America/New_York", _("United States"));
775- addCity(_("Conakry"), "Africa/Conakry", _("Guinea"));
776- addCity(_("Copenhagen"), "Europe/Copenhagen", _("Denmark"));
777- addCity(_("Costa Rica"), "America/Costa_Rica", _("Costa Rica"));
778- addCity(_("Curaçao"), "America/Curacao", _("Curacao"));
779-
780- addCity(_("Dakar"), "Africa/Dakar", _("Senegal"));
781- addCity(_("Dallas"), "America/Chicago", _("United States"));
782- addCity(_("Damascus"), "Asia/Damascus", _("Syria"));
783- addCity(_("Dar es Salaam"), "Africa/Dar_es_Salaam", _("Tanzania"));
784- addCity(_("Darwin"), "Australia/Darwin", _("Australia"));
785- addCity(_("Dawson Creek"), "America/Dawson_Creek", _("Canada"));
786- addCity(_("Delhi"), "Asia/Kolkata", _("India"));
787- addCity(_("Denver"), "America/Denver", _("United States"));
788- addCity(_("Detroit"), "America/Detroit", _("United States"));
789- addCity(_("Dhaka"), "Asia/Dhaka", _("Bangladesh"));
790- addCity(_("Djibouti"), "Africa/Djibouti", _("Djibouti"));
791- addCity(_("Doha"), "Asia/Qatar", _("Qatar"));
792- addCity(_("Dominica"), "America/Dominica", _("Dominica"));
793- addCity(_("Dubai"), "Asia/Dubai", _("United Arab Emirates"));
794- addCity(_("Dublin"), "Europe/Dublin", _("Ireland"));
795-
796- addCity(_("Easter Island"), "Pacific/Easter", _("Chile"));
797- addCity(_("Edmonton"), "America/Edmonton", _("Canada"));
798- addCity(_("El Salvador"), "America/El_Salvador", _("El Salvador"));
799-
800- addCity(_("Fiji"), "Pacific/Fiji", _("Fiji"));
801- addCity(_("Fortaleza"), "America/Fortaleza", _("Brazil"));
802- addCity(_("Frankfurt"), "Europe/Berlin", _("Germany"));
803- addCity(_("Freetown"), "Africa/Freetown", _("Sierra Leone"));
804-
805- addCity(_("Gaborone"), "Africa/Gaborone", _("Botswana"));
806- addCity(_("Gaza"), "Asia/Gaza", _("Palestine"));
807- addCity(_("Gibraltar"), "Europe/Gibraltar", _("Gibraltar"));
808- addCity(_("Grand Turk"), "America/Grand_Turk", _("Turks and Caicos Islands"));
809- addCity(_("Grenada"), "America/Grenada", _("Grenada"));
810- addCity(_("Guam"), "Pacific/Guam", _("Guam"));
811- addCity(_("Guangzhou"), "Asia/Shanghai", _("China"));
812- addCity(_("Guatemala"), "America/Guatemala", _("Guatemala"));
813- addCity(_("Gurgaon"), "Asia/Kolkata", _("India"));
814- addCity(_("Guyana"), "America/Guyana", _("Guyana"));
815-
816- addCity(_("Haifa"), "Asia/Jerusalem", _("Israel"));
817- addCity(_("Halifax"), "America/Halifax", _("Canada"));
818- addCity(_("Hamburg"), "Europe/Berlin", _("Germany"));
819- addCity(_("Hanoi"), "Asia/Ho_Chi_Minh", _("Vietnam"));
820- addCity(_("Harare"), "Africa/Harare", _("Zimbabwe"));
821- addCity(_("Havana"), "America/Havana", _("Cuba"));
822- addCity(_("Hebron"), "Asia/Hebron", _("Palestine"));
823- addCity(_("Helsinki"), "Europe/Helsinki", _("Finland"));
824- addCity(_("Ho Chi Minh City"), "Asia/Ho_Chi_Minh", _("Vietnam"));
825- addCity(_("Hong Kong"), "Asia/Hong_Kong", _("Hong Kong"));
826- addCity(_("Honolulu"), "Pacific/Honolulu", _("United States"));
827- addCity(_("Houston"), "America/Chicago", _("United States"));
828- addCity(_("Hyderabad"), "Asia/Kolkata", _("India"));
829-
830- addCity(_("Indianapolis"), "America/Indiana/Indianapolis", _("United States"));
831- addCity(_("Islamabad"), "Asia/Karachi", _("Pakistan"));
832- addCity(_("Isle of Man"), "Europe/Isle_of_Man", _("Isle of Man"));
833- addCity(_("Istanbul"), "Europe/Istanbul", _("Turkey"));
834-
835- addCity(_("Jacksonville"), "America/New_York", _("United States"));
836- addCity(_("Jakarta"), "Asia/Jakarta", _("Indonesia"));
837- addCity(_("Jerusalem"), "Asia/Jerusalem", _("Israel"));
838- addCity(_("Johannesburg"), "Africa/Johannesburg", _("South Africa"));
839-
840- addCity(_("Kabul"), "Asia/Kabul", _("Afghanistan"));
841- addCity(_("Kampala"), "Africa/Kampala", _("Uganda"));
842- addCity(_("Karachi"), "Asia/Karachi", _("Pakistan"));
843- addCity(_("Khartoum"), "Africa/Khartoum", _("Sudan"));
844- addCity(_("Kiev"), "Europe/Kiev", _("Ukraine"));
845- addCity(_("Kigali"), "Africa/Kigali", _("Rwanda"));
846- addCity(_("Kingston"), "America/Toronto", _("Canada"));
847- addCity(_("Kinshasa"), "Africa/Kinshasa", _("Democratic Republic of the Congo"));
848- addCity(_("Kiritimati"), "Pacific/Kiritimati", _("Kiribati"));
849- addCity(_("Kirkland"), "America/Montreal", _("Canada"));
850- addCity(_("Knox"), "Australia/Melbourne", _("Australia"));
851- addCity(_("Knoxville"), "America/New_York", _("United States"));
852- addCity(_("Kraków"), "Europe/Warsaw", _("Poland"));
853- addCity(_("Kuala Lumpur"), "Asia/Kuala_Lumpur", _("Malaysia"));
854- addCity(_("Kuwait City"), "Asia/Kuwait", _("Kuwait"));
855- addCity(_("Kyiv"), "Europe/Kiev", _("Ukraine"));
856-
857- addCity(_("Lagos"), "Africa/Lagos", _("Nigeria"));
858- addCity(_("Lahore"), "Asia/Karachi", _("Pakistan"));
859- addCity(_("Las Vegas"), "America/Los_Angeles", _("United States"));
860- addCity(_("Lima"), "America/Lima", _("Peru"));
861- addCity(_("Lisbon"), "Europe/Lisbon", _("Portugal"));
862- addCity(_("London"), "Europe/London", _("United Kingdom"));
863- addCity(_("Longyearbyen"), "Arctic/Longyearbyen", _("Svalbard and Jan Mayen"));
864- addCity(_("Los Angeles"), "America/Los_Angeles", _("United States"));
865- addCity(_("Louisville"), "America/Kentucky/Louisville", _("United States"));
866- addCity(_("Luxembourg"), "Europe/Luxembourg", _("Luxembourg"));
867-
868- addCity(_("Macau"), "Asia/Macau", _("Macao"));
869- addCity(_("Madison"), "America/Chicago", _("United States"));
870- addCity(_("Madrid"), "Europe/Madrid", _("Spain"));
871- addCity(_("Maldives"), "Indian/Maldives", _("Maldives"));
872- addCity(_("Malta"), "Europe/Malta", _("Malta"));
873- addCity(_("Managua"), "America/Managua", _("Nicaragua"));
874- addCity(_("Manchester"), "Europe/London", _("United Kingdom"));
875- addCity(_("Manila"), "Asia/Manila", _("Philippines"));
876- addCity(_("Marengo"), "America/Indiana/Marengo", _("United States"));
877- addCity(_("Martinique"), "America/Martinique", _("Canada"));
878- addCity(_("Maseru"), "Africa/Maseru", _("Lesotho"));
879- addCity(_("Melbourne"), "Australia/Melbourne", _("Australia"));
880- addCity(_("Memphis"), "America/Chicago", _("United States"));
881- addCity(_("Mendoza"), "America/Argentina/Mendoza", _("Argentina"));
882- addCity(_("Metlakatla"), "America/Metlakatla", _("United States"));
883- addCity(_("Mexico City"), "America/Mexico_City", _("Mexico"));
884- addCity(_("Miami"), "America/New_York", _("United States"));
885- addCity(_("Milan"), "Europe/Rome", _("Italy"));
886- addCity(_("Milwaukee"), "America/Chicago", _("United States"));
887- addCity(_("Minneapolis"), "America/Chicago", _("United States"));
888- addCity(_("Minsk"), "Europe/Minsk", _("Belarus"));
889- addCity(_("Mogadishu"), "Africa/Mogadishu", _("Somalia"));
890- addCity(_("Monrovia"), "Africa/Monrovia", _("Liberia"));
891- addCity(_("Monaco"), "Europe/Monaco", _("Monaco"));
892- addCity(_("Monterrey"), "America/Monterrey", _("Mexico"));
893- addCity(_("Montevideo"), "America/Montevideo", _("Uruguay"));
894- addCity(_("Montreal"), "America/Montreal", _("Canada"));
895- addCity(_("Moscow"), "Europe/Moscow", _("Russia"));
896- addCity(_("Mountain View"), "America/Los_Angeles", _("United States"));
897- addCity(_("Mumbai"), "Asia/Kolkata", _("India"));
898- addCity(_("Munich"), "Europe/Berlin", _("Germany"));
899- addCity(_("Muscat"), "Asia/Muscat", _("Oman"));
900-
901- addCity(_("Nairobi"), "Africa/Nairobi", _("Kenya"));
902- addCity(_("Nashville"), "America/Chicago", _("United States"));
903- addCity(_("Nassau"), "America/Nassau", _("Bahamas"));
904- addCity(_("New Orleans"), "America/Chicago", _("United States"));
905- addCity(_("New Salem"), "America/North_Dakota/New_Salem", _("United States"));
906- addCity(_("New South Wales"), "Australia/Sydney", _("Australia"));
907- addCity(_("New York"), "America/New_York", _("United States"));
908- addCity(_("Newfoundland"), "America/St_Johns", _("United States"));
909- addCity(_("Nouméa"), "Pacific/Noumea", _("New Caledonia"));
910- addCity(_("Nuestra Señora de La Paz"), "America/Bogota", _("Colombia"));
911-
912- addCity(_("Oklahoma City"), "America/Chicago", _("United States"));
913- addCity(_("Osaka"), "Asia/Tokyo", _("Japan"));
914- addCity(_("Oslo"), "Europe/Oslo", _("Norway"));
915- addCity(_("Ottawa"), "America/Toronto", _("Canada"));
916- addCity(_("Oulu"), "Europe/Helsinki", _("Finland"));
917-
918- addCity(_("Panamá"), "America/Panama", _("Panama"));
919- addCity(_("Paramaribo"), "America/Paramaribo", _("Suriname"));
920- addCity(_("Paris"), "Europe/Paris", _("France"));
921- addCity(_("Perth"), "Australia/Perth", _("Australia"));
922- addCity(_("Petersburg"), "America/Indiana/Petersburg", _("Russia"));
923- addCity(_("Philadelphia"), "America/New_York", _("United States"));
924- addCity(_("Phnom Penh"), "Asia/Phnom_Penh", _("Cambodia"));
925- addCity(_("Phoenix"), "America/Phoenix", _("United States"));
926- addCity(_("Pittsburgh"), "America/New_York", _("United States"));
927- addCity(_("Port of Spain"), "America/Port_of_Spain", _("Trinidad and Tobago"));
928- addCity(_("Port au Prince"), "America/Port-au-Prince", _("Haiti"));
929- addCity(_("Portland"), "America/Los_Angeles", _("United States"));
930- addCity(_("Prague"), "Europe/Prague", _("Czech"));
931- addCity(_("Pyongyang"), "Asia/Pyongyang", _("North Korea"));
932-
933- addCity(_("Queensland"), "Australia/Brisbane", _("United States"));
934- addCity(_("Quito"), "America/Guayaquil", _("Ecuador"));
935-
936- addCity(_("Rangoon"), "Asia/Rangoon", _("Myanmar"));
937- addCity(_("Reno"), "America/Los_Angeles", _("United States"));
938- addCity(_("Reston"), "America/New_York", _("United States"));
939- addCity(_("Reykjavík"), "Atlantic/Reykjavik", _("Iceland"));
940- addCity(_("Riga"), "Europe/Riga", _("Latvia"));
941- addCity(_("Rio de Janeiro"), "America/Sao_Paulo", _("Brazil"));
942- addCity(_("Riyadh"), "Asia/Riyadh", _("Saudi Arabia"));
943- addCity(_("Rome"), "Europe/Rome", _("Italy"));
944-
945- addCity(_("Sacramento"), "America/Los_Angeles", _("United States"));
946- addCity(_("Salt Lake City"), "America/Denver", _("United States"));
947- addCity(_("Samoa"), "Pacific/Apia", _("Samoa"));
948- addCity(_("San Antonio"), "America/Chicago", _("United States"));
949- addCity(_("San Diego"), "America/Los_Angeles", _("United States"));
950- addCity(_("San Francisco"), "America/Costa_Rica", _("United States"));
951- addCity(_("San José"), "America/Costa_Rica", _("Costa Rica"));
952- addCity(_("San Juan"), "America/Puerto_Rico", _("Puerto Rico"));
953- addCity(_("San Marino"), "Europe/San_Marino", _("San Marino"));
954- addCity(_("San Salvador"), "America/El_Salvador", _("El Salvador"));
955- addCity(_("Sanaa"), "Asia/Aden", _("Yemen"));
956- addCity(_("Santiago"), "America/Santiago", _("Chile"));
957- addCity(_("Santo Domingo"), "America/Santo_Domingo", _("Dominican Republic"));
958- addCity(_("São Paulo"), "America/Sao_Paulo", _("Brazil"));
959- addCity(_("São Tomé"), "Africa/Sao_Tome", _("São Tomé and Príncipe"));
960- addCity(_("Sarajevo"), "Europe/Sarajevo", _("Bosnia and Herzegovina"));
961- addCity(_("Saskatchewan"), "America/Regina", _("Canada"));
962- addCity(_("Seattle"), "America/Los_Angeles", _("United States"));
963- addCity(_("Seoul"), "Asia/Seoul", _("South Korea"));
964- addCity(_("Shanghai"), "Asia/Shanghai", _("China"));
965- addCity(_("Singapore"), "Asia/Singapore", _("Singapore"));
966- addCity(_("Simferopol"), "Europe/Simferopol", _("Ukraine"));
967- addCity(_("Skopje"), "Europe/Skopje", _("Macedonia"));
968- addCity(_("Sofia"), "Europe/Sofia", _("Bulgaria"));
969- addCity(_("St.Johns"), "America/St_Johns", _("Canada"));
970- addCity(_("St.Kitts"), "America/St_Kitts", _("Saint Kitts and Nevis"));
971- addCity(_("St.Louis"), "America/Chicago", _("United States"));
972- addCity(_("Stanley"), "Atlantic/Stanley", _("Falkland Islands"));
973- addCity(_("Stockholm"), "Europe/Stockholm", _("Sweden"));
974- addCity(_("Suva"), "Pacific/Fiji", _("Fiji"));
975- addCity(_("Sydney"), "Australia/Sydney", _("Australia"));
976-
977- addCity(_("Taipei"), "Asia/Taipei", _("Taiwan"));
978- addCity(_("Tallinn"), "Europe/Tallinn", _("Estonia"));
979- addCity(_("Tehran"), "Asia/Tehran", _("Iran"));
980- addCity(_("Tokyo"), "Asia/Tokyo", _("Japan"));
981- addCity(_("Toronto"), "America/Toronto", _("Canada"));
982- addCity(_("Tripoli"), "Africa/Tripoli", _("Libya"));
983- addCity(_("Tunis"), "Africa/Tunis", _("Tunisia"));
984-
985- addCity(_("Ulan Bator"), "Asia/Ulan_Bator", _("Mongolia"));
986- addCity(_("UTC"), "UTC", _("UTC"));
987-
988- addCity(_("Vancouver"), "America/Vancouver", _("Canada"));
989- addCity(_("Vatican City"), "Europe/Vatican", _("Vatican City"));
990- addCity(_("Vevay"), "America/Indiana/Vevay", _("United States"));
991- addCity(_("Vienna"), "Europe/Vienna", _("Austria"));
992- addCity(_("Vilnius"), "Europe/Vilnius", _("Lithuania"));
993- addCity(_("Vincennes"), "America/Indiana/Vincennes", _("France"));
994-
995- addCity(_("Warsaw"), "Europe/Warsaw", _("Poland"));
996- addCity(_("Washington D.C."), "America/New_York", _("United States"));
997- addCity(_("Winamac"), "America/Indiana/Winamac", _("United States"));
998- addCity(_("Winnipeg"), "America/Winnipeg", _("Canada"));
999- addCity(_("Wrocław"), "Europe/Warsaw", _("Poland"));
1000-
1001- addCity(_("Zagreb"), "Europe/Zagreb", _("Croatia"));
1002- addCity(_("Zürich"), "Europe/Zurich", _("Switzerland"));
1003+ m_citiesData.clear();
1004+
1005+ addCity("Abidjan", _("Abidjan"), "Africa/Abidjan", _("Ivory Coast"));
1006+ addCity("Accra", _("Accra"), "Africa/Accra", _("Ghana"));
1007+ addCity("Addis Ababa", _("Addis Ababa"), "Africa/Addis_Ababa", _("Ethiopia"));
1008+ addCity("Adelaide", _("Adelaide"), "Australia/Adelaide", _("Australia"));
1009+ addCity("Albuquerque", _("Albuquerque"), "America/Denver", _("United States"));
1010+ addCity("Algiers", _("Algiers"), "Africa/Algiers", _("Algeria"));
1011+ addCity("Almaty", _("Almaty"), "Asia/Almaty", _("Kazakhstan"));
1012+ addCity("Amman", _("Amman"), "Asia/Amman", _("Jordan"));
1013+ addCity("Amsterdam", _("Amsterdam"), "Europe/Amsterdam", _("Netherlands"));
1014+ addCity("Anadyr", _("Anadyr"), "Asia/Anadyr", _("Russia"));
1015+ addCity("Anchorage", _("Anchorage"), "America/Anchorage", _("United States"));
1016+ addCity("Andorra", _("Andorra"), "Europe/Andorra", _("Andorra"));
1017+ addCity("Ankara", _("Ankara"), "Europe/Istanbul", _("Turkey"));
1018+ addCity("Ann Arbor", _("Ann Arbor"), "America/Detroit", _("United States"));
1019+ addCity("Antananarivo", _("Antananarivo"), "Indian/Antananarivo", _("Madagascar"));
1020+ addCity("Aqtau", _("Aqtau"), "Asia/Aqtau", _("Kazakhstan"));
1021+ addCity("Aruba", _("Aruba"), "America/Aruba", _("Aruba"));
1022+ addCity("Asunción", _("Asunción"), "America/Asuncion", _("Paraguay"));
1023+ addCity("Athens", _("Athens"), "Europe/Athens", _("Greece"));
1024+ addCity("Atlanta", _("Atlanta"), "America/New_York", _("United States"));
1025+ addCity("Auckland", _("Auckland"), "Pacific/Auckland", _("New Zealand"));
1026+ addCity("Austin", _("Austin"), "America/Chicago", _("United States"));
1027+
1028+ addCity("Baghdad", _("Baghdad"), "Asia/Baghdad", _("Iraq"));
1029+ addCity("Bahrain", _("Bahrain"), "Asia/Bahrain", _("Bahrain"));
1030+ addCity("Baku", _("Baku"), "Asia/Baku", _("Azerbaijan"));
1031+ addCity("Baltimore", _("Baltimore"), "America/New_York", _("United States"));
1032+ addCity("Bangalore", _("Bangalore"), "Asia/Kolkata", _("India"));
1033+ addCity("Bangkok", _("Bangkok"), "Asia/Bangkok", _("Thailand"));
1034+ addCity("Barbados", _("Barbados"), "America/Barbados", _("Barbados"));
1035+ addCity("Barcelona", _("Barcelona"), "Europe/Madrid", _("Spain"));
1036+ addCity("Beijing", _("Beijing"), "Asia/Shanghai", _("China"));
1037+ addCity("Beirut", _("Beirut"), "Asia/Beirut", _("Lebanon"));
1038+ addCity("Belfast", _("Belfast"), "Europe/Belfast", _("United Kingdom"));
1039+ addCity("Belgrade", _("Belgrade"), "Europe/Belgrade", _("Serbia"));
1040+ addCity("Belize", _("Belize"), "America/Belize", _("Belize"));
1041+ addCity("Belo Horizonte", _("Belo Horizonte"), "America/Sao_Paulo", _("Brazil"));
1042+ addCity("Berlin", _("Berlin"), "Europe/Berlin", _("Germany"));
1043+ addCity("Bermuda", _("Bermuda"), "Atlantic/Bermuda", _("Bermuda"));
1044+ addCity("Beulah", _("Beulah"), "America/North_Dakota/Beulah", _("United States"));
1045+ addCity("Black Rock City", _("Black Rock City"), "America/Chicago", _("United States"));
1046+ addCity("Blantyre", _("Blantyre"), "Africa/Blantyre", _("Malawi"));
1047+ addCity("Bogotá", _("Bogotá"), "America/Bogota", _("Colombia"));
1048+ addCity("Boston", _("Boston"), "America/New_York", _("United States"));
1049+ addCity("Boulder", _("Boulder"), "America/Denver", _("United States"));
1050+ addCity("Brasília", _("Brasília"), "America/Sao_Paulo", _("Brazil"));
1051+ addCity("Bratislava", _("Bratislava"), "Europe/Bratislava", _("Slovakia"));
1052+ addCity("Brazzaville", _("Brazzaville"), "Africa/Brazzaville", _("Republic of the Congo"));
1053+ addCity("Brisbane", _("Brisbane"), "Australia/Brisbane", _("Australia"));
1054+ addCity("Brussels", _("Brussels"), "Europe/Brussels", _("Belgium"));
1055+ addCity("Bucharest", _("Bucharest"), "Europe/Bucharest", _("Romania"));
1056+ addCity("Budapest", _("Budapest"), "Europe/Budapest", _("Hungary"));
1057+ addCity("Buenos Aires", _("Buenos Aires"), "America/Argentina/Buenos_Aires", _("Argentina"));
1058+
1059+ addCity("Cairo", _("Cairo"), "Africa/Cairo", _("Egypt"));
1060+ addCity("Calcutta", _("Calcutta"), "Asia/Calcutta", _("India"));
1061+ addCity("Calgary", _("Calgary"), "America/Edmonton", _("Canada"));
1062+ addCity("Cambridge", _("Cambridge"), "Europe/London", _("United Kingdom"));
1063+ addCity("Canary", _("Canary"), "Atlantic/Canary", _("Australia"));
1064+ addCity("Canberra", _("Canberra"), "Australia/Canberra", _("Australia"));
1065+ addCity("Cancún", _("Cancún"), "America/Cancun", _("Mexico"));
1066+ addCity("Cape Town", _("Cape Town"), "Africa/Johannesburg", _("South Africa"));
1067+ addCity("Caracas", _("Caracas"), "America/Caracas", _("Venezuela"));
1068+ addCity("Casablanca", _("Casablanca"), "Africa/Casablanca", _("Morocco"));
1069+ addCity("Cayman Palms", _("Cayman Palms"), "America/Cayman", _("Cayman Islands"));
1070+ addCity("Chicago", _("Chicago"), "America/Chicago", _("United States"));
1071+ addCity("Chihuahua", _("Chihuahua"), "America/Chihuahua", _("Mexico"));
1072+ addCity("Chişinău", _("Chişinău"), "Europe/Chisinau", _("Moldova"));
1073+ addCity("Cincinnati", _("Cincinnati"), "America/New_York", _("United States"));
1074+ addCity("Cleveland", _("Cleveland"), "America/New_York", _("United States"));
1075+ addCity("Colombo", _("Colombo"), "Asia/Colombo", _("Sri Lanka"));
1076+ addCity("Columbus", _("Columbus"), "America/New_York", _("United States"));
1077+ addCity("Conakry", _("Conakry"), "Africa/Conakry", _("Guinea"));
1078+ addCity("Copenhagen", _("Copenhagen"), "Europe/Copenhagen", _("Denmark"));
1079+ addCity("Costa Rica", _("Costa Rica"), "America/Costa_Rica", _("Costa Rica"));
1080+ addCity("Curaçao", _("Curaçao"), "America/Curacao", _("Curacao"));
1081+
1082+ addCity("Dakar", _("Dakar"), "Africa/Dakar", _("Senegal"));
1083+ addCity("Dallas", _("Dallas"), "America/Chicago", _("United States"));
1084+ addCity("Damascus", _("Damascus"), "Asia/Damascus", _("Syria"));
1085+ addCity("Dar es Salaam", _("Dar es Salaam"), "Africa/Dar_es_Salaam", _("Tanzania"));
1086+ addCity("Darwin", _("Darwin"), "Australia/Darwin", _("Australia"));
1087+ addCity("Dawson Creek", _("Dawson Creek"), "America/Dawson_Creek", _("Canada"));
1088+ addCity("Delhi", _("Delhi"), "Asia/Kolkata", _("India"));
1089+ addCity("Denver", _("Denver"), "America/Denver", _("United States"));
1090+ addCity("Detroit", _("Detroit"), "America/Detroit", _("United States"));
1091+ addCity("Dhaka", _("Dhaka"), "Asia/Dhaka", _("Bangladesh"));
1092+ addCity("Djibouti", _("Djibouti"), "Africa/Djibouti", _("Djibouti"));
1093+ addCity("Doha", _("Doha"), "Asia/Qatar", _("Qatar"));
1094+ addCity("Dominica", _("Dominica"), "America/Dominica", _("Dominica"));
1095+ addCity("Dubai", _("Dubai"), "Asia/Dubai", _("United Arab Emirates"));
1096+ addCity("Dublin", _("Dublin"), "Europe/Dublin", _("Ireland"));
1097+
1098+ addCity("Easter Island", _("Easter Island"), "Pacific/Easter", _("Chile"));
1099+ addCity("Edmonton", _("Edmonton"), "America/Edmonton", _("Canada"));
1100+ addCity("El Salvador", _("El Salvador"), "America/El_Salvador", _("El Salvador"));
1101+
1102+ addCity("Fiji", _("Fiji"), "Pacific/Fiji", _("Fiji"));
1103+ addCity("Fortaleza", _("Fortaleza"), "America/Fortaleza", _("Brazil"));
1104+ addCity("Frankfurt", _("Frankfurt"), "Europe/Berlin", _("Germany"));
1105+ addCity("Freetown", _("Freetown"), "Africa/Freetown", _("Sierra Leone"));
1106+
1107+ addCity("Gaborone", _("Gaborone"), "Africa/Gaborone", _("Botswana"));
1108+ addCity("Gaza", _("Gaza"), "Asia/Gaza", _("Palestine"));
1109+ addCity("Gibraltar", _("Gibraltar"), "Europe/Gibraltar", _("Gibraltar"));
1110+ addCity("Grand Turk", _("Grand Turk"), "America/Grand_Turk", _("Turks and Caicos Islands"));
1111+ addCity("Grenada", _("Grenada"), "America/Grenada", _("Grenada"));
1112+ addCity("Guam", _("Guam"), "Pacific/Guam", _("Guam"));
1113+ addCity("Guangzhou", _("Guangzhou"), "Asia/Shanghai", _("China"));
1114+ addCity("Guatemala", _("Guatemala"), "America/Guatemala", _("Guatemala"));
1115+ addCity("Gurgaon", _("Gurgaon"), "Asia/Kolkata", _("India"));
1116+ addCity("Guyana", _("Guyana"), "America/Guyana", _("Guyana"));
1117+
1118+ addCity("Haifa", _("Haifa"), "Asia/Jerusalem", _("Israel"));
1119+ addCity("Halifax", _("Halifax"), "America/Halifax", _("Canada"));
1120+ addCity("Hamburg", _("Hamburg"), "Europe/Berlin", _("Germany"));
1121+ addCity("Hanoi", _("Hanoi"), "Asia/Ho_Chi_Minh", _("Vietnam"));
1122+ addCity("Harare", _("Harare"), "Africa/Harare", _("Zimbabwe"));
1123+ addCity("Havana", _("Havana"), "America/Havana", _("Cuba"));
1124+ addCity("Hebron", _("Hebron"), "Asia/Hebron", _("Palestine"));
1125+ addCity("Helsinki", _("Helsinki"), "Europe/Helsinki", _("Finland"));
1126+ addCity("Ho Chi Minh City", _("Ho Chi Minh City"), "Asia/Ho_Chi_Minh", _("Vietnam"));
1127+ addCity("Hong Kong", _("Hong Kong"), "Asia/Hong_Kong", _("Hong Kong"));
1128+ addCity("Honolulu", _("Honolulu"), "Pacific/Honolulu", _("United States"));
1129+ addCity("Houston", _("Houston"), "America/Chicago", _("United States"));
1130+ addCity("Hyderabad", _("Hyderabad"), "Asia/Kolkata", _("India"));
1131+
1132+ addCity("Indianapolis", _("Indianapolis"), "America/Indiana/Indianapolis", _("United States"));
1133+ addCity("Islamabad", _("Islamabad"), "Asia/Karachi", _("Pakistan"));
1134+ addCity("Isle of Man", _("Isle of Man"), "Europe/Isle_of_Man", _("Isle of Man"));
1135+ addCity("Istanbul", _("Istanbul"), "Europe/Istanbul", _("Turkey"));
1136+
1137+ addCity("Jacksonville", _("Jacksonville"), "America/New_York", _("United States"));
1138+ addCity("Jakarta", _("Jakarta"), "Asia/Jakarta", _("Indonesia"));
1139+ addCity("Jerusalem", _("Jerusalem"), "Asia/Jerusalem", _("Israel"));
1140+ addCity("Johannesburg", _("Johannesburg"), "Africa/Johannesburg", _("South Africa"));
1141+
1142+ addCity("Kabul", _("Kabul"), "Asia/Kabul", _("Afghanistan"));
1143+ addCity("Kampala", _("Kampala"), "Africa/Kampala", _("Uganda"));
1144+ addCity("Karachi", _("Karachi"), "Asia/Karachi", _("Pakistan"));
1145+ addCity("Khartoum", _("Khartoum"), "Africa/Khartoum", _("Sudan"));
1146+ addCity("Kiev", _("Kiev"), "Europe/Kiev", _("Ukraine"));
1147+ addCity("Kigali", _("Kigali"), "Africa/Kigali", _("Rwanda"));
1148+ addCity("Kingston", _("Kingston"), "America/Toronto", _("Canada"));
1149+ addCity("Kinshasa", _("Kinshasa"), "Africa/Kinshasa", _("Democratic Republic of the Congo"));
1150+ addCity("Kiritimati", _("Kiritimati"), "Pacific/Kiritimati", _("Kiribati"));
1151+ addCity("Kirkland", _("Kirkland"), "America/Montreal", _("Canada"));
1152+ addCity("Knox", _("Knox"), "Australia/Melbourne", _("Australia"));
1153+ addCity("Knoxville", _("Knoxville"), "America/New_York", _("United States"));
1154+ addCity("Kraków", _("Kraków"), "Europe/Warsaw", _("Poland"));
1155+ addCity("Kuala Lumpur", _("Kuala Lumpur"), "Asia/Kuala_Lumpur", _("Malaysia"));
1156+ addCity("Kuwait Cit", _("Kuwait City"), "Asia/Kuwait", _("Kuwait"));
1157+ addCity("Kyiv", _("Kyiv"), "Europe/Kiev", _("Ukraine"));
1158+
1159+ addCity("Lagos", _("Lagos"), "Africa/Lagos", _("Nigeria"));
1160+ addCity("Lahore", _("Lahore"), "Asia/Karachi", _("Pakistan"));
1161+ addCity("Las Vegas", _("Las Vegas"), "America/Los_Angeles", _("United States"));
1162+ addCity("Lima", _("Lima"), "America/Lima", _("Peru"));
1163+ addCity("Lisbon", _("Lisbon"), "Europe/Lisbon", _("Portugal"));
1164+ addCity("London", _("London"), "Europe/London", _("United Kingdom"));
1165+ addCity("Longyearbyen", _("Longyearbyen"), "Arctic/Longyearbyen", _("Svalbard and Jan Mayen"));
1166+ addCity("Los Angeles", _("Los Angeles"), "America/Los_Angeles", _("United States"));
1167+ addCity("Louisville", _("Louisville"), "America/Kentucky/Louisville", _("United States"));
1168+ addCity("Luxembourg", _("Luxembourg"), "Europe/Luxembourg", _("Luxembourg"));
1169+
1170+ addCity("Macau", _("Macau"), "Asia/Macau", _("Macao"));
1171+ addCity("Madison", _("Madison"), "America/Chicago", _("United States"));
1172+ addCity("Madrid", _("Madrid"), "Europe/Madrid", _("Spain"));
1173+ addCity("Maldives", _("Maldives"), "Indian/Maldives", _("Maldives"));
1174+ addCity("Malta", _("Malta"), "Europe/Malta", _("Malta"));
1175+ addCity("Managua", _("Managua"), "America/Managua", _("Nicaragua"));
1176+ addCity("Manchester", _("Manchester"), "Europe/London", _("United Kingdom"));
1177+ addCity("Manila", _("Manila"), "Asia/Manila", _("Philippines"));
1178+ addCity("Marengo", _("Marengo"), "America/Indiana/Marengo", _("United States"));
1179+ addCity("Martinique", _("Martinique"), "America/Martinique", _("Canada"));
1180+ addCity("Maseru", _("Maseru"), "Africa/Maseru", _("Lesotho"));
1181+ addCity("Melbourne", _("Melbourne"), "Australia/Melbourne", _("Australia"));
1182+ addCity("Memphis", _("Memphis"), "America/Chicago", _("United States"));
1183+ addCity("Mendoza", _("Mendoza"), "America/Argentina/Mendoza", _("Argentina"));
1184+ addCity("Metlakatla", _("Metlakatla"), "America/Metlakatla", _("United States"));
1185+ addCity("Mexico City", _("Mexico City"), "America/Mexico_City", _("Mexico"));
1186+ addCity("Miami", _("Miami"), "America/New_York", _("United States"));
1187+ addCity("Milan", _("Milan"), "Europe/Rome", _("Italy"));
1188+ addCity("Milwaukee", _("Milwaukee"), "America/Chicago", _("United States"));
1189+ addCity("Minneapolis", _("Minneapolis"), "America/Chicago", _("United States"));
1190+ addCity("Minsk", _("Minsk"), "Europe/Minsk", _("Belarus"));
1191+ addCity("Mogadishu", _("Mogadishu"), "Africa/Mogadishu", _("Somalia"));
1192+ addCity("Monrovia", _("Monrovia"), "Africa/Monrovia", _("Liberia"));
1193+ addCity("Monaco", _("Monaco"), "Europe/Monaco", _("Monaco"));
1194+ addCity("Monterrey", _("Monterrey"), "America/Monterrey", _("Mexico"));
1195+ addCity("Montevideo", _("Montevideo"), "America/Montevideo", _("Uruguay"));
1196+ addCity("Montreal", _("Montreal"), "America/Montreal", _("Canada"));
1197+ addCity("Moscow", _("Moscow"), "Europe/Moscow", _("Russia"));
1198+ addCity("Mountain View", _("Mountain View"), "America/Los_Angeles", _("United States"));
1199+ addCity("Mumbai", _("Mumbai"), "Asia/Kolkata", _("India"));
1200+ addCity("Munich", _("Munich"), "Europe/Berlin", _("Germany"));
1201+ addCity("Muscat", _("Muscat"), "Asia/Muscat", _("Oman"));
1202+
1203+ addCity("Nairobi", _("Nairobi"), "Africa/Nairobi", _("Kenya"));
1204+ addCity("Nashville", _("Nashville"), "America/Chicago", _("United States"));
1205+ addCity("Nassau", _("Nassau"), "America/Nassau", _("Bahamas"));
1206+ addCity("New Orleans", _("New Orleans"), "America/Chicago", _("United States"));
1207+ addCity("New Salem", _("New Salem"), "America/North_Dakota/New_Salem", _("United States"));
1208+ addCity("New South Wales", _("New South Wales"), "Australia/Sydney", _("Australia"));
1209+ addCity("New York", _("New York"), "America/New_York", _("United States"));
1210+ addCity("Newfoundland", _("Newfoundland"), "America/St_Johns", _("United States"));
1211+ addCity("Nouméa", _("Nouméa"), "Pacific/Noumea", _("New Caledonia"));
1212+ addCity("Nuestra Señora de La Paz", _("Nuestra Señora de La Paz"), "America/Bogota", _("Colombia"));
1213+
1214+ addCity("Oklahoma City", _("Oklahoma City"), "America/Chicago", _("United States"));
1215+ addCity("Osaka", _("Osaka"), "Asia/Tokyo", _("Japan"));
1216+ addCity("Oslo", _("Oslo"), "Europe/Oslo", _("Norway"));
1217+ addCity("Ottawa", _("Ottawa"), "America/Toronto", _("Canada"));
1218+ addCity("Oulu", _("Oulu"), "Europe/Helsinki", _("Finland"));
1219+
1220+ addCity("Panamá", _("Panamá"), "America/Panama", _("Panama"));
1221+ addCity("Paramaribo", _("Paramaribo"), "America/Paramaribo", _("Suriname"));
1222+ addCity("Paris", _("Paris"), "Europe/Paris", _("France"));
1223+ addCity("Perth", _("Perth"), "Australia/Perth", _("Australia"));
1224+ addCity("Petersburg", _("Petersburg"), "America/Indiana/Petersburg", _("Russia"));
1225+ addCity("Philadelphia", _("Philadelphia"), "America/New_York", _("United States"));
1226+ addCity("Phnom Penh", _("Phnom Penh"), "Asia/Phnom_Penh", _("Cambodia"));
1227+ addCity("Phoenix", _("Phoenix"), "America/Phoenix", _("United States"));
1228+ addCity("Pittsburgh", _("Pittsburgh"), "America/New_York", _("United States"));
1229+ addCity("Port of Spain", _("Port of Spain"), "America/Port_of_Spain", _("Trinidad and Tobago"));
1230+ addCity("Port au Prince", _("Port au Prince"), "America/Port-au-Prince", _("Haiti"));
1231+ addCity("Portland", _("Portland"), "America/Los_Angeles", _("United States"));
1232+ addCity("Prague", _("Prague"), "Europe/Prague", _("Czech"));
1233+ addCity("Pyongyang", _("Pyongyang"), "Asia/Pyongyang", _("North Korea"));
1234+
1235+ addCity("Queensland", _("Queensland"), "Australia/Brisbane", _("United States"));
1236+ addCity("Quito", _("Quito"), "America/Guayaquil", _("Ecuador"));
1237+
1238+ addCity("Rangoon", _("Rangoon"), "Asia/Rangoon", _("Myanmar"));
1239+ addCity("Reno", _("Reno"), "America/Los_Angeles", _("United States"));
1240+ addCity("Reston", _("Reston"), "America/New_York", _("United States"));
1241+ addCity("Reykjavík", _("Reykjavík"), "Atlantic/Reykjavik", _("Iceland"));
1242+ addCity("Riga", _("Riga"), "Europe/Riga", _("Latvia"));
1243+ addCity("Rio de Janeiro", _("Rio de Janeiro"), "America/Sao_Paulo", _("Brazil"));
1244+ addCity("Riyadh", _("Riyadh"), "Asia/Riyadh", _("Saudi Arabia"));
1245+ addCity("Rome", _("Rome"), "Europe/Rome", _("Italy"));
1246+
1247+ addCity("Sacramento", _("Sacramento"), "America/Los_Angeles", _("United States"));
1248+ addCity("Salt Lake City", _("Salt Lake City"), "America/Denver", _("United States"));
1249+ addCity("Samoa", _("Samoa"), "Pacific/Apia", _("Samoa"));
1250+ addCity("San Antonio", _("San Antonio"), "America/Chicago", _("United States"));
1251+ addCity("San Diego", _("San Diego"), "America/Los_Angeles", _("United States"));
1252+ addCity("San Francisco", _("San Francisco"), "America/Costa_Rica", _("United States"));
1253+ addCity("San José", _("San José"), "America/Costa_Rica", _("Costa Rica"));
1254+ addCity("San Juan", _("San Juan"), "America/Puerto_Rico", _("Puerto Rico"));
1255+ addCity("San Marino", _("San Marino"), "Europe/San_Marino", _("San Marino"));
1256+ addCity("San Salvador", _("San Salvador"), "America/El_Salvador", _("El Salvador"));
1257+ addCity("Sanaa", _("Sanaa"), "Asia/Aden", _("Yemen"));
1258+ addCity("Santiago", _("Santiago"), "America/Santiago", _("Chile"));
1259+ addCity("Santo Domingo", _("Santo Domingo"), "America/Santo_Domingo", _("Dominican Republic"));
1260+ addCity("São Paulo", _("São Paulo"), "America/Sao_Paulo", _("Brazil"));
1261+ addCity("São Tomé", _("São Tomé"), "Africa/Sao_Tome", _("São Tomé and Príncipe"));
1262+ addCity("Sarajevo", _("Sarajevo"), "Europe/Sarajevo", _("Bosnia and Herzegovina"));
1263+ addCity("Saskatchewan", _("Saskatchewan"), "America/Regina", _("Canada"));
1264+ addCity("Seattle", _("Seattle"), "America/Los_Angeles", _("United States"));
1265+ addCity("Seoul", _("Seoul"), "Asia/Seoul", _("South Korea"));
1266+ addCity("Shanghai", _("Shanghai"), "Asia/Shanghai", _("China"));
1267+ addCity("Singapore", _("Singapore"), "Asia/Singapore", _("Singapore"));
1268+ addCity("Simferopol", _("Simferopol"), "Europe/Simferopol", _("Ukraine"));
1269+ addCity("Skopje", _("Skopje"), "Europe/Skopje", _("Macedonia"));
1270+ addCity("Sofia", _("Sofia"), "Europe/Sofia", _("Bulgaria"));
1271+ addCity("St.Johns", _("St.Johns"), "America/St_Johns", _("Canada"));
1272+ addCity("St.Kitts", _("St.Kitts"), "America/St_Kitts", _("Saint Kitts and Nevis"));
1273+ addCity("St.Louis", _("St.Louis"), "America/Chicago", _("United States"));
1274+ addCity("Stanley", _("Stanley"), "Atlantic/Stanley", _("Falkland Islands"));
1275+ addCity("Stockholm", _("Stockholm"), "Europe/Stockholm", _("Sweden"));
1276+ addCity("Suva", _("Suva"), "Pacific/Fiji", _("Fiji"));
1277+ addCity("Sydney", _("Sydney"), "Australia/Sydney", _("Australia"));
1278+
1279+ addCity("Taipei", _("Taipei"), "Asia/Taipei", _("Taiwan"));
1280+ addCity("Tallinn", _("Tallinn"), "Europe/Tallinn", _("Estonia"));
1281+ addCity("Tehran", _("Tehran"), "Asia/Tehran", _("Iran"));
1282+ addCity("Tokyo", _("Tokyo"), "Asia/Tokyo", _("Japan"));
1283+ addCity("Toronto", _("Toronto"), "America/Toronto", _("Canada"));
1284+ addCity("Tripoli", _("Tripoli"), "Africa/Tripoli", _("Libya"));
1285+ addCity("Tunis", _("Tunis"), "Africa/Tunis", _("Tunisia"));
1286+
1287+ addCity("Ulan Bator", _("Ulan Bator"), "Asia/Ulan_Bator", _("Mongolia"));
1288+ addCity("UTC", _("UTC"), "UTC", _("UTC"));
1289+
1290+ addCity("Vancouver", _("Vancouver"), "America/Vancouver", _("Canada"));
1291+ addCity("Vatican City", _("Vatican City"), "Europe/Vatican", _("Vatican City"));
1292+ addCity("Vevay", _("Vevay"), "America/Indiana/Vevay", _("United States"));
1293+ addCity("Vienna", _("Vienna"), "Europe/Vienna", _("Austria"));
1294+ addCity("Vilnius", _("Vilnius"), "Europe/Vilnius", _("Lithuania"));
1295+ addCity("Vincennes", _("Vincennes"), "America/Indiana/Vincennes", _("France"));
1296+
1297+ addCity("Warsaw", _("Warsaw"), "Europe/Warsaw", _("Poland"));
1298+ addCity("Washington D.C.", _("Washington D.C."), "America/New_York", _("United States"));
1299+ addCity("Winamac", _("Winamac"), "America/Indiana/Winamac", _("United States"));
1300+ addCity("Winnipeg", _("Winnipeg"), "America/Winnipeg", _("Canada"));
1301+ addCity("Wrocław", _("Wrocław"), "Europe/Warsaw", _("Poland"));
1302+
1303+ addCity("Zagreb", _("Zagreb"), "Europe/Zagreb", _("Croatia"));
1304+ addCity("Zürich", _("Zürich"), "Europe/Zurich", _("Switzerland"));
1305
1306 // Let QML know model is reusable again
1307 endResetModel();
1308 }
1309+
1310+TimeZoneModel::CityData StaticTimeZoneModel::getTranslatedCityData(const QString &cityId)
1311+{
1312+ for (QList<TimeZoneModel::CityData>::const_iterator tz_iter = m_citiesData.begin(); tz_iter != m_citiesData.end(); ++tz_iter)
1313+ {
1314+ if (QString::compare(tz_iter->cityId, cityId) == 0)
1315+ {
1316+ return *tz_iter;
1317+ }
1318+ }
1319+
1320+ TimeZoneModel::CityData emptyCityData;
1321+ emptyCityData.cityId = "";
1322+ emptyCityData.cityName = "";
1323+ emptyCityData.countryName = "";
1324+ return emptyCityData;
1325+}
1326+
1327
1328=== modified file 'backend/modules/Timezone/statictimezonemodel.h'
1329--- backend/modules/Timezone/statictimezonemodel.h 2015-02-27 12:14:50 +0000
1330+++ backend/modules/Timezone/statictimezonemodel.h 2015-08-16 20:56:40 +0000
1331@@ -31,12 +31,15 @@
1332 public:
1333 StaticTimeZoneModel(QObject *parent = 0);
1334
1335+ // Function to get translated translated city and country name
1336+ TimeZoneModel::CityData getTranslatedCityData(const QString &cityId);
1337+
1338 private:
1339 // Function to define the default city list
1340 void loadDefaultCityList();
1341
1342 // Function to append city list item into m_timeZones object
1343- void addCity(const QString &city, const QString &timezone, const QString &country);
1344+ void addCity(const QString &cityId, const QString &cityName, const QString &timezone, const QString &countryName);
1345 };
1346
1347 #endif // STATICTIMEZONEMODEL_H
1348
1349=== modified file 'backend/modules/Timezone/timezonemodel.cpp'
1350--- backend/modules/Timezone/timezonemodel.cpp 2014-09-02 14:31:44 +0000
1351+++ backend/modules/Timezone/timezonemodel.cpp 2015-08-16 20:56:40 +0000
1352@@ -1,5 +1,5 @@
1353 /*
1354- * Copyright (C) 2014 Canonical Ltd
1355+ * Copyright (C) 2014-2015 Canonical Ltd
1356 *
1357 * This file is part of Ubuntu Clock App
1358 *
1359@@ -46,7 +46,7 @@
1360 */
1361 Q_UNUSED(parent)
1362
1363- return m_timeZones.count();
1364+ return m_citiesData.count();
1365 }
1366
1367 /*
1368@@ -68,16 +68,18 @@
1369 */
1370
1371 switch (role) {
1372+ case RoleCityId:
1373+ return m_citiesData.at(row).cityId;
1374 case RoleCityName:
1375- return m_timeZones.at(row).cityName;
1376+ return m_citiesData.at(row).cityName;
1377 case RoleCountryName:
1378- return m_timeZones.at(row).country;
1379+ return m_citiesData.at(row).countryName;
1380 case RoleTimeZoneId:
1381- return m_timeZones.at(row).timeZone.id();
1382+ return m_citiesData.at(row).timeZone.id();
1383 }
1384
1385 QDateTime currentDateTime = QDateTime::currentDateTime();
1386- QDateTime worldCityTime(currentDateTime.toTimeZone(m_timeZones.at(row).timeZone));
1387+ QDateTime worldCityTime(currentDateTime.toTimeZone(m_citiesData.at(row).timeZone));
1388
1389 switch (role) {
1390 case RoleTimeString:
1391@@ -104,8 +106,9 @@
1392 QHash<int, QByteArray> TimeZoneModel::roleNames() const
1393 {
1394 QHash<int, QByteArray> roles;
1395- roles.insert(RoleCityName, "city");
1396- roles.insert(RoleCountryName, "country");
1397+ roles.insert(RoleCityId, "cityId");
1398+ roles.insert(RoleCityName, "cityName");
1399+ roles.insert(RoleCountryName, "countryName");
1400 roles.insert(RoleTimeZoneId, "timezoneID");
1401 roles.insert(RoleTimeString, "localTime");
1402 roles.insert(RoleTimeTo, "timeTo");
1403@@ -119,11 +122,13 @@
1404
1405 void TimeZoneModel::setUpdateInterval(int updateInterval)
1406 {
1407- if (m_updateTimer.interval() != updateInterval) {
1408+ if (m_updateTimer.interval() != updateInterval)
1409+ {
1410 m_updateTimer.setInterval(updateInterval);
1411 emit updateIntervalChanged();
1412
1413- if (m_updateTimer.interval() > 0) {
1414+ if (m_updateTimer.interval() > 0)
1415+ {
1416 m_updateTimer.start();
1417 }
1418 else {
1419@@ -143,7 +148,7 @@
1420 */
1421
1422 QModelIndex startIndex = index(0);
1423- QModelIndex endIndex = index(m_timeZones.count() - 1);
1424+ QModelIndex endIndex = index(m_citiesData.count() - 1);
1425 QVector<int> roles;
1426 roles << RoleTimeString << RoleTimeTo;
1427 emit dataChanged(startIndex, endIndex, roles);
1428@@ -151,7 +156,8 @@
1429
1430 void TimeZoneModel::setStatus(TimeZoneModel::Status status)
1431 {
1432- if(m_status == status) {
1433+ if(m_status == status)
1434+ {
1435 return;
1436 }
1437
1438
1439=== modified file 'backend/modules/Timezone/timezonemodel.h'
1440--- backend/modules/Timezone/timezonemodel.h 2014-09-02 14:31:44 +0000
1441+++ backend/modules/Timezone/timezonemodel.h 2015-08-16 20:56:40 +0000
1442@@ -1,5 +1,5 @@
1443 /*
1444- * Copyright (C) 2014 Canonical Ltd
1445+ * Copyright (C) 2014-2015 Canonical Ltd
1446 *
1447 * This file is part of Ubuntu Clock App
1448 *
1449@@ -49,6 +49,7 @@
1450
1451 public:
1452 enum Roles {
1453+ RoleCityId,
1454 RoleCityName,
1455 RoleCountryName,
1456 RoleTimeZoneId,
1457@@ -113,14 +114,15 @@
1458
1459 protected:
1460 // Create a simple container class to hold our information
1461- struct TimeZone{
1462+ struct CityData {
1463+ QString cityId;
1464 QString cityName;
1465- QString country;
1466+ QString countryName;
1467 QTimeZone timeZone;
1468 };
1469
1470 // Keep a list of TimeZone objects, holding all our timeZones.
1471- QList<TimeZone> m_timeZones;
1472+ QList<CityData> m_citiesData;
1473
1474 // Private property to keep track of the status of the timezonemodel
1475 Status m_status;
1476
1477=== modified file 'debian/changelog'
1478--- debian/changelog 2015-08-14 13:39:38 +0000
1479+++ debian/changelog 2015-08-16 20:56:40 +0000
1480@@ -2,9 +2,12 @@
1481
1482 [Bartosz Kosiorek]
1483 * Disable automatic translation and update README.translations
1484+ * Silent warning which is displayed during clock run
1485 * Change "Silence after" to "Alarm stops afer" according to UX design
1486 * Fix default alarm time issue (LP: #1484926)
1487-
1488+ * Translate city and country names after language switch (LP: #1477492)
1489+ * Fix issue when unable to add city/country with apostrophes (LP: #1473074)
1490+
1491 [Nekhelesh Ramananthan]
1492 * Increase the height of times in the alarm screen (LP: #1365428)
1493 * Fixed the confusing behavior of the confirmation button (LP: #1408015)
1494@@ -13,9 +16,9 @@
1495 * Changed default alarm sound (LP: #1354370)
1496
1497 [Victor Thompson]
1498- * Show all README files in QtCreator
1499+ * Show all README files in QtCreator
1500
1501- -- Bartosz Kosiorek <gang65@poczta.onet.pl> Fri, 24 Jul 2015 18:05:38 +0200
1502+ -- Bartosz Kosiorek <gang65@poczta.onet.pl> Thu, 13 Aug 2015 00:03:45 +0200
1503
1504 ubuntu-clock-app (3.4) vivid; urgency=medium
1505
1506
1507=== modified file 'po/com.ubuntu.clock.pot'
1508--- po/com.ubuntu.clock.pot 2015-08-11 20:39:12 +0000
1509+++ po/com.ubuntu.clock.pot 2015-08-16 20:56:40 +0000
1510@@ -8,7 +8,7 @@
1511 msgstr ""
1512 "Project-Id-Version: \n"
1513 "Report-Msgid-Bugs-To: \n"
1514-"POT-Creation-Date: 2015-08-11 22:38+0200\n"
1515+"POT-Creation-Date: 2015-08-16 22:55+0200\n"
1516 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1517 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1518 "Language-Team: LANGUAGE <LL@li.org>\n"
1519@@ -18,12 +18,12 @@
1520 "Content-Transfer-Encoding: 8bit\n"
1521 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
1522
1523-#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1524+#: ../app/alarm/AlarmLabel.qml:33 ../app/alarm/AlarmLabel.qml:71
1525 #: ../app/alarm/EditAlarmPage.qml:290
1526 msgid "Label"
1527 msgstr ""
1528
1529-#: ../app/alarm/AlarmList.qml:49 ../app/alarm/AlarmPage.qml:99
1530+#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:99
1531 #: ../app/worldclock/UserWorldCityList.qml:101
1532 msgid "Delete"
1533 msgstr ""
1534@@ -46,7 +46,7 @@
1535 msgid "Select None"
1536 msgstr ""
1537
1538-#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:37
1539+#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:59
1540 msgid "Select All"
1541 msgstr ""
1542
1543@@ -58,7 +58,7 @@
1544 msgid "Tap the + icon to add an alarm"
1545 msgstr ""
1546
1547-#: ../app/alarm/AlarmRepeat.qml:33 ../app/alarm/EditAlarmPage.qml:280
1548+#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:280
1549 msgid "Repeat"
1550 msgstr ""
1551
1552@@ -233,1745 +233,1745 @@
1553 msgid "Please check your network connection and try again"
1554 msgstr ""
1555
1556-#: ../backend/modules/Timezone/statictimezonemodel.cpp:47
1557+#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
1558 msgid "Abidjan"
1559 msgstr ""
1560
1561-#: ../backend/modules/Timezone/statictimezonemodel.cpp:47
1562+#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
1563 msgid "Ivory Coast"
1564 msgstr ""
1565
1566-#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
1567+#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
1568 msgid "Accra"
1569 msgstr ""
1570
1571-#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
1572+#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
1573 msgid "Ghana"
1574 msgstr ""
1575
1576-#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
1577+#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
1578 msgid "Addis Ababa"
1579 msgstr ""
1580
1581-#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
1582+#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
1583 msgid "Ethiopia"
1584 msgstr ""
1585
1586-#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
1587+#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
1588 msgid "Adelaide"
1589 msgstr ""
1590
1591-#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
1592-#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
1593-#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
1594+#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
1595+#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
1596 #: ../backend/modules/Timezone/statictimezonemodel.cpp:106
1597-#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
1598-#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
1599-#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
1600-#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
1601-#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
1602-#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
1603+#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
1604+#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
1605+#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
1606+#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
1607+#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
1608+#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
1609+#: ../backend/modules/Timezone/statictimezonemodel.cpp:320
1610 msgid "Australia"
1611 msgstr ""
1612
1613-#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
1614+#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
1615 msgid "Albuquerque"
1616 msgstr ""
1617
1618-#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
1619-#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
1620-#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
1621-#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
1622-#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
1623-#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
1624-#: ../backend/modules/Timezone/statictimezonemodel.cpp:86
1625+#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
1626+#: ../backend/modules/Timezone/statictimezonemodel.cpp:58
1627+#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
1628+#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
1629+#: ../backend/modules/Timezone/statictimezonemodel.cpp:69
1630+#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
1631 #: ../backend/modules/Timezone/statictimezonemodel.cpp:87
1632-#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
1633+#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
1634 #: ../backend/modules/Timezone/statictimezonemodel.cpp:91
1635-#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
1636-#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
1637+#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
1638+#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
1639 #: ../backend/modules/Timezone/statictimezonemodel.cpp:116
1640-#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
1641-#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
1642-#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
1643+#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
1644+#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
1645+#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
1646 #: ../backend/modules/Timezone/statictimezonemodel.cpp:132
1647-#: ../backend/modules/Timezone/statictimezonemodel.cpp:170
1648+#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
1649 #: ../backend/modules/Timezone/statictimezonemodel.cpp:171
1650-#: ../backend/modules/Timezone/statictimezonemodel.cpp:174
1651-#: ../backend/modules/Timezone/statictimezonemodel.cpp:179
1652-#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
1653-#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
1654-#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
1655+#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
1656+#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
1657+#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
1658+#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
1659+#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
1660 #: ../backend/modules/Timezone/statictimezonemodel.cpp:209
1661-#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
1662-#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
1663-#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
1664-#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
1665-#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
1666-#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
1667+#: ../backend/modules/Timezone/statictimezonemodel.cpp:210
1668+#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
1669+#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
1670+#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
1671+#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
1672+#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
1673 #: ../backend/modules/Timezone/statictimezonemodel.cpp:231
1674-#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
1675-#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
1676-#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
1677+#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
1678+#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
1679+#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
1680 #: ../backend/modules/Timezone/statictimezonemodel.cpp:249
1681-#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
1682+#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
1683 #: ../backend/modules/Timezone/statictimezonemodel.cpp:252
1684-#: ../backend/modules/Timezone/statictimezonemodel.cpp:256
1685-#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
1686-#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
1687+#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
1688+#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
1689+#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
1690 #: ../backend/modules/Timezone/statictimezonemodel.cpp:270
1691-#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
1692-#: ../backend/modules/Timezone/statictimezonemodel.cpp:277
1693-#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
1694+#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
1695+#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
1696+#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
1697 #: ../backend/modules/Timezone/statictimezonemodel.cpp:282
1698-#: ../backend/modules/Timezone/statictimezonemodel.cpp:289
1699+#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
1700 #: ../backend/modules/Timezone/statictimezonemodel.cpp:290
1701-#: ../backend/modules/Timezone/statictimezonemodel.cpp:292
1702+#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
1703 #: ../backend/modules/Timezone/statictimezonemodel.cpp:293
1704 #: ../backend/modules/Timezone/statictimezonemodel.cpp:294
1705-#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
1706-#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
1707-#: ../backend/modules/Timezone/statictimezonemodel.cpp:334
1708-#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
1709+#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
1710+#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
1711+#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
1712+#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
1713 #: ../backend/modules/Timezone/statictimezonemodel.cpp:341
1714+#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
1715 msgid "United States"
1716 msgstr ""
1717
1718-#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
1719+#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
1720 msgid "Algiers"
1721 msgstr ""
1722
1723-#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
1724+#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
1725 msgid "Algeria"
1726 msgstr ""
1727
1728-#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
1729+#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
1730 msgid "Almaty"
1731 msgstr ""
1732
1733-#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
1734-#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
1735+#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
1736+#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
1737 msgid "Kazakhstan"
1738 msgstr ""
1739
1740-#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
1741+#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
1742 msgid "Amman"
1743 msgstr ""
1744
1745-#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
1746+#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
1747 msgid "Jordan"
1748 msgstr ""
1749
1750-#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
1751+#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
1752 msgid "Amsterdam"
1753 msgstr ""
1754
1755-#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
1756+#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
1757 msgid "Netherlands"
1758 msgstr ""
1759
1760-#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
1761+#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
1762 msgid "Anadyr"
1763 msgstr ""
1764
1765-#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
1766-#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
1767-#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
1768+#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
1769+#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
1770+#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
1771 msgid "Russia"
1772 msgstr ""
1773
1774-#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
1775+#: ../backend/modules/Timezone/statictimezonemodel.cpp:58
1776 msgid "Anchorage"
1777 msgstr ""
1778
1779-#: ../backend/modules/Timezone/statictimezonemodel.cpp:58
1780+#: ../backend/modules/Timezone/statictimezonemodel.cpp:59
1781 msgid "Andorra"
1782 msgstr ""
1783
1784-#: ../backend/modules/Timezone/statictimezonemodel.cpp:59
1785+#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
1786 msgid "Ankara"
1787 msgstr ""
1788
1789-#: ../backend/modules/Timezone/statictimezonemodel.cpp:59
1790-#: ../backend/modules/Timezone/statictimezonemodel.cpp:177
1791+#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
1792+#: ../backend/modules/Timezone/statictimezonemodel.cpp:178
1793 msgid "Turkey"
1794 msgstr ""
1795
1796-#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
1797+#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
1798 msgid "Ann Arbor"
1799 msgstr ""
1800
1801-#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
1802+#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
1803 msgid "Antananarivo"
1804 msgstr ""
1805
1806-#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
1807+#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
1808 msgid "Madagascar"
1809 msgstr ""
1810
1811-#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
1812+#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
1813 msgid "Aqtau"
1814 msgstr ""
1815
1816-#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
1817+#: ../backend/modules/Timezone/statictimezonemodel.cpp:64
1818 msgid "Aruba"
1819 msgstr ""
1820
1821-#: ../backend/modules/Timezone/statictimezonemodel.cpp:64
1822+#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
1823 msgid "Asunción"
1824 msgstr ""
1825
1826-#: ../backend/modules/Timezone/statictimezonemodel.cpp:64
1827+#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
1828 msgid "Paraguay"
1829 msgstr ""
1830
1831-#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
1832+#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
1833 msgid "Athens"
1834 msgstr ""
1835
1836-#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
1837+#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
1838 msgid "Greece"
1839 msgstr ""
1840
1841-#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
1842+#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
1843 msgid "Atlanta"
1844 msgstr ""
1845
1846-#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
1847+#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
1848 msgid "Auckland"
1849 msgstr ""
1850
1851-#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
1852+#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
1853 msgid "New Zealand"
1854 msgstr ""
1855
1856-#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
1857+#: ../backend/modules/Timezone/statictimezonemodel.cpp:69
1858 msgid "Austin"
1859 msgstr ""
1860
1861-#: ../backend/modules/Timezone/statictimezonemodel.cpp:70
1862+#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
1863 msgid "Baghdad"
1864 msgstr ""
1865
1866-#: ../backend/modules/Timezone/statictimezonemodel.cpp:70
1867+#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
1868 msgid "Iraq"
1869 msgstr ""
1870
1871-#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
1872+#: ../backend/modules/Timezone/statictimezonemodel.cpp:72
1873 msgid "Bahrain"
1874 msgstr ""
1875
1876-#: ../backend/modules/Timezone/statictimezonemodel.cpp:72
1877+#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
1878 msgid "Baku"
1879 msgstr ""
1880
1881-#: ../backend/modules/Timezone/statictimezonemodel.cpp:72
1882+#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
1883 msgid "Azerbaijan"
1884 msgstr ""
1885
1886-#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
1887+#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
1888 msgid "Baltimore"
1889 msgstr ""
1890
1891-#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
1892+#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
1893 msgid "Bangalore"
1894 msgstr ""
1895
1896-#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
1897-#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
1898-#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
1899-#: ../backend/modules/Timezone/statictimezonemodel.cpp:157
1900-#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
1901-#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
1902+#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
1903+#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
1904+#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
1905+#: ../backend/modules/Timezone/statictimezonemodel.cpp:158
1906+#: ../backend/modules/Timezone/statictimezonemodel.cpp:173
1907+#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
1908 msgid "India"
1909 msgstr ""
1910
1911-#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
1912+#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
1913 msgid "Bangkok"
1914 msgstr ""
1915
1916-#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
1917+#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
1918 msgid "Thailand"
1919 msgstr ""
1920
1921-#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
1922+#: ../backend/modules/Timezone/statictimezonemodel.cpp:77
1923 msgid "Barbados"
1924 msgstr ""
1925
1926-#: ../backend/modules/Timezone/statictimezonemodel.cpp:77
1927+#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
1928 msgid "Barcelona"
1929 msgstr ""
1930
1931-#: ../backend/modules/Timezone/statictimezonemodel.cpp:77
1932-#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
1933+#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
1934+#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
1935 msgid "Spain"
1936 msgstr ""
1937
1938-#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
1939+#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
1940 msgid "Beijing"
1941 msgstr ""
1942
1943-#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
1944-#: ../backend/modules/Timezone/statictimezonemodel.cpp:155
1945-#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
1946+#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
1947+#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
1948+#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
1949 msgid "China"
1950 msgstr ""
1951
1952-#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
1953+#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
1954 msgid "Beirut"
1955 msgstr ""
1956
1957-#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
1958+#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
1959 msgid "Lebanon"
1960 msgstr ""
1961
1962-#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
1963+#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
1964 msgid "Belfast"
1965 msgstr ""
1966
1967-#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
1968-#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
1969-#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
1970-#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
1971+#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
1972+#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
1973+#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
1974+#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
1975 msgid "United Kingdom"
1976 msgstr ""
1977
1978-#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
1979+#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
1980 msgid "Belgrade"
1981 msgstr ""
1982
1983-#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
1984+#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
1985 msgid "Serbia"
1986 msgstr ""
1987
1988-#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
1989+#: ../backend/modules/Timezone/statictimezonemodel.cpp:83
1990 msgid "Belize"
1991 msgstr ""
1992
1993-#: ../backend/modules/Timezone/statictimezonemodel.cpp:83
1994+#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
1995 msgid "Belo Horizonte"
1996 msgstr ""
1997
1998-#: ../backend/modules/Timezone/statictimezonemodel.cpp:83
1999-#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
2000-#: ../backend/modules/Timezone/statictimezonemodel.cpp:145
2001-#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
2002-#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
2003+#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
2004+#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
2005+#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
2006+#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
2007+#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
2008 msgid "Brazil"
2009 msgstr ""
2010
2011-#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
2012+#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
2013 msgid "Berlin"
2014 msgstr ""
2015
2016-#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
2017-#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
2018-#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
2019-#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
2020+#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
2021+#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
2022+#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
2023+#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
2024 msgid "Germany"
2025 msgstr ""
2026
2027-#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
2028+#: ../backend/modules/Timezone/statictimezonemodel.cpp:86
2029 msgid "Bermuda"
2030 msgstr ""
2031
2032-#: ../backend/modules/Timezone/statictimezonemodel.cpp:86
2033+#: ../backend/modules/Timezone/statictimezonemodel.cpp:87
2034 msgid "Beulah"
2035 msgstr ""
2036
2037-#: ../backend/modules/Timezone/statictimezonemodel.cpp:87
2038+#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
2039 msgid "Black Rock City"
2040 msgstr ""
2041
2042-#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
2043+#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
2044 msgid "Blantyre"
2045 msgstr ""
2046
2047-#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
2048+#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
2049 msgid "Malawi"
2050 msgstr ""
2051
2052-#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
2053+#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
2054 msgid "Bogotá"
2055 msgstr ""
2056
2057-#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
2058-#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
2059+#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
2060+#: ../backend/modules/Timezone/statictimezonemodel.cpp:255
2061 msgid "Colombia"
2062 msgstr ""
2063
2064-#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
2065+#: ../backend/modules/Timezone/statictimezonemodel.cpp:91
2066 msgid "Boston"
2067 msgstr ""
2068
2069-#: ../backend/modules/Timezone/statictimezonemodel.cpp:91
2070+#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
2071 msgid "Boulder"
2072 msgstr ""
2073
2074-#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
2075+#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
2076 msgid "Brasília"
2077 msgstr ""
2078
2079-#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
2080+#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
2081 msgid "Bratislava"
2082 msgstr ""
2083
2084-#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
2085+#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
2086 msgid "Slovakia"
2087 msgstr ""
2088
2089-#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
2090+#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
2091 msgid "Brazzaville"
2092 msgstr ""
2093
2094-#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
2095+#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
2096 msgid "Republic of the Congo"
2097 msgstr ""
2098
2099-#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
2100+#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
2101 msgid "Brisbane"
2102 msgstr ""
2103
2104-#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
2105+#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
2106 msgid "Brussels"
2107 msgstr ""
2108
2109-#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
2110+#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
2111 msgid "Belgium"
2112 msgstr ""
2113
2114-#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
2115+#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
2116 msgid "Bucharest"
2117 msgstr ""
2118
2119-#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
2120+#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
2121 msgid "Romania"
2122 msgstr ""
2123
2124-#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
2125+#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
2126 msgid "Budapest"
2127 msgstr ""
2128
2129-#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
2130+#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
2131 msgid "Hungary"
2132 msgstr ""
2133
2134-#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
2135+#: ../backend/modules/Timezone/statictimezonemodel.cpp:100
2136 msgid "Buenos Aires"
2137 msgstr ""
2138
2139-#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
2140-#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
2141+#: ../backend/modules/Timezone/statictimezonemodel.cpp:100
2142+#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
2143 msgid "Argentina"
2144 msgstr ""
2145
2146-#: ../backend/modules/Timezone/statictimezonemodel.cpp:101
2147+#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
2148 msgid "Cairo"
2149 msgstr ""
2150
2151-#: ../backend/modules/Timezone/statictimezonemodel.cpp:101
2152+#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
2153 msgid "Egypt"
2154 msgstr ""
2155
2156-#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
2157+#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
2158 msgid "Calcutta"
2159 msgstr ""
2160
2161-#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
2162+#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
2163 msgid "Calgary"
2164 msgstr ""
2165
2166-#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
2167-#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
2168-#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
2169-#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
2170-#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
2171-#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
2172-#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
2173-#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
2174-#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
2175-#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
2176-#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
2177-#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
2178-#: ../backend/modules/Timezone/statictimezonemodel.cpp:332
2179-#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
2180+#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
2181+#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
2182+#: ../backend/modules/Timezone/statictimezonemodel.cpp:142
2183+#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
2184+#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
2185+#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
2186+#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
2187+#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
2188+#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
2189+#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
2190+#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
2191+#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
2192+#: ../backend/modules/Timezone/statictimezonemodel.cpp:333
2193+#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
2194 msgid "Canada"
2195 msgstr ""
2196
2197-#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
2198+#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
2199 msgid "Cambridge"
2200 msgstr ""
2201
2202-#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
2203+#: ../backend/modules/Timezone/statictimezonemodel.cpp:106
2204 msgid "Canary"
2205 msgstr ""
2206
2207-#: ../backend/modules/Timezone/statictimezonemodel.cpp:106
2208+#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
2209 msgid "Canberra"
2210 msgstr ""
2211
2212-#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
2213+#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
2214 msgid "Cancún"
2215 msgstr ""
2216
2217-#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
2218-#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
2219-#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
2220-#: ../backend/modules/Timezone/statictimezonemodel.cpp:236
2221+#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
2222+#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
2223+#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
2224+#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
2225 msgid "Mexico"
2226 msgstr ""
2227
2228-#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
2229+#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
2230 msgid "Cape Town"
2231 msgstr ""
2232
2233-#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
2234-#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
2235+#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
2236+#: ../backend/modules/Timezone/statictimezonemodel.cpp:183
2237 msgid "South Africa"
2238 msgstr ""
2239
2240-#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
2241+#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
2242 msgid "Caracas"
2243 msgstr ""
2244
2245-#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
2246+#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
2247 msgid "Venezuela"
2248 msgstr ""
2249
2250-#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
2251+#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
2252 msgid "Casablanca"
2253 msgstr ""
2254
2255-#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
2256+#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
2257 msgid "Morocco"
2258 msgstr ""
2259
2260-#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
2261+#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
2262 msgid "Cayman Palms"
2263 msgstr ""
2264
2265-#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
2266+#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
2267 msgid "Cayman Islands"
2268 msgstr ""
2269
2270-#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
2271+#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
2272 msgid "Chicago"
2273 msgstr ""
2274
2275-#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
2276+#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
2277 msgid "Chihuahua"
2278 msgstr ""
2279
2280-#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
2281+#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
2282 msgid "Chişinău"
2283 msgstr ""
2284
2285-#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
2286+#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
2287 msgid "Moldova"
2288 msgstr ""
2289
2290-#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
2291+#: ../backend/modules/Timezone/statictimezonemodel.cpp:116
2292 msgid "Cincinnati"
2293 msgstr ""
2294
2295-#: ../backend/modules/Timezone/statictimezonemodel.cpp:116
2296+#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
2297 msgid "Cleveland"
2298 msgstr ""
2299
2300-#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
2301+#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
2302 msgid "Colombo"
2303 msgstr ""
2304
2305-#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
2306+#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
2307 msgid "Sri Lanka"
2308 msgstr ""
2309
2310-#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
2311+#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
2312 msgid "Columbus"
2313 msgstr ""
2314
2315-#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
2316+#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
2317 msgid "Conakry"
2318 msgstr ""
2319
2320-#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
2321+#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
2322 msgid "Guinea"
2323 msgstr ""
2324
2325-#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
2326+#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
2327 msgid "Copenhagen"
2328 msgstr ""
2329
2330-#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
2331+#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
2332 msgid "Denmark"
2333 msgstr ""
2334
2335-#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
2336-#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
2337+#: ../backend/modules/Timezone/statictimezonemodel.cpp:122
2338+#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
2339 msgid "Costa Rica"
2340 msgstr ""
2341
2342-#: ../backend/modules/Timezone/statictimezonemodel.cpp:122
2343+#: ../backend/modules/Timezone/statictimezonemodel.cpp:123
2344 msgid "Curaçao"
2345 msgstr ""
2346
2347-#: ../backend/modules/Timezone/statictimezonemodel.cpp:122
2348+#: ../backend/modules/Timezone/statictimezonemodel.cpp:123
2349 msgid "Curacao"
2350 msgstr ""
2351
2352-#: ../backend/modules/Timezone/statictimezonemodel.cpp:124
2353+#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
2354 msgid "Dakar"
2355 msgstr ""
2356
2357-#: ../backend/modules/Timezone/statictimezonemodel.cpp:124
2358+#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
2359 msgid "Senegal"
2360 msgstr ""
2361
2362-#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
2363+#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
2364 msgid "Dallas"
2365 msgstr ""
2366
2367-#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
2368+#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
2369 msgid "Damascus"
2370 msgstr ""
2371
2372-#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
2373+#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
2374 msgid "Syria"
2375 msgstr ""
2376
2377-#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
2378+#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
2379 msgid "Dar es Salaam"
2380 msgstr ""
2381
2382-#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
2383+#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
2384 msgid "Tanzania"
2385 msgstr ""
2386
2387-#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
2388+#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
2389 msgid "Darwin"
2390 msgstr ""
2391
2392-#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
2393+#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
2394 msgid "Dawson Creek"
2395 msgstr ""
2396
2397-#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
2398+#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
2399 msgid "Delhi"
2400 msgstr ""
2401
2402-#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
2403+#: ../backend/modules/Timezone/statictimezonemodel.cpp:132
2404 msgid "Denver"
2405 msgstr ""
2406
2407-#: ../backend/modules/Timezone/statictimezonemodel.cpp:132
2408+#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
2409 msgid "Detroit"
2410 msgstr ""
2411
2412-#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
2413+#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
2414 msgid "Dhaka"
2415 msgstr ""
2416
2417-#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
2418+#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
2419 msgid "Bangladesh"
2420 msgstr ""
2421
2422-#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
2423+#: ../backend/modules/Timezone/statictimezonemodel.cpp:135
2424 msgid "Djibouti"
2425 msgstr ""
2426
2427-#: ../backend/modules/Timezone/statictimezonemodel.cpp:135
2428+#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
2429 msgid "Doha"
2430 msgstr ""
2431
2432-#: ../backend/modules/Timezone/statictimezonemodel.cpp:135
2433+#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
2434 msgid "Qatar"
2435 msgstr ""
2436
2437-#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
2438+#: ../backend/modules/Timezone/statictimezonemodel.cpp:137
2439 msgid "Dominica"
2440 msgstr ""
2441
2442-#: ../backend/modules/Timezone/statictimezonemodel.cpp:137
2443+#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
2444 msgid "Dubai"
2445 msgstr ""
2446
2447-#: ../backend/modules/Timezone/statictimezonemodel.cpp:137
2448+#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
2449 msgid "United Arab Emirates"
2450 msgstr ""
2451
2452-#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
2453+#: ../backend/modules/Timezone/statictimezonemodel.cpp:139
2454 msgid "Dublin"
2455 msgstr ""
2456
2457-#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
2458+#: ../backend/modules/Timezone/statictimezonemodel.cpp:139
2459 msgid "Ireland"
2460 msgstr ""
2461
2462-#: ../backend/modules/Timezone/statictimezonemodel.cpp:140
2463+#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
2464 msgid "Easter Island"
2465 msgstr ""
2466
2467-#: ../backend/modules/Timezone/statictimezonemodel.cpp:140
2468-#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
2469+#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
2470+#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
2471 msgid "Chile"
2472 msgstr ""
2473
2474-#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
2475+#: ../backend/modules/Timezone/statictimezonemodel.cpp:142
2476 msgid "Edmonton"
2477 msgstr ""
2478
2479-#: ../backend/modules/Timezone/statictimezonemodel.cpp:142
2480-#: ../backend/modules/Timezone/statictimezonemodel.cpp:298
2481+#: ../backend/modules/Timezone/statictimezonemodel.cpp:143
2482+#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
2483 msgid "El Salvador"
2484 msgstr ""
2485
2486-#: ../backend/modules/Timezone/statictimezonemodel.cpp:144
2487-#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
2488+#: ../backend/modules/Timezone/statictimezonemodel.cpp:145
2489+#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
2490 msgid "Fiji"
2491 msgstr ""
2492
2493-#: ../backend/modules/Timezone/statictimezonemodel.cpp:145
2494+#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
2495 msgid "Fortaleza"
2496 msgstr ""
2497
2498-#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
2499+#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
2500 msgid "Frankfurt"
2501 msgstr ""
2502
2503-#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
2504+#: ../backend/modules/Timezone/statictimezonemodel.cpp:148
2505 msgid "Freetown"
2506 msgstr ""
2507
2508-#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
2509+#: ../backend/modules/Timezone/statictimezonemodel.cpp:148
2510 msgid "Sierra Leone"
2511 msgstr ""
2512
2513-#: ../backend/modules/Timezone/statictimezonemodel.cpp:149
2514+#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
2515 msgid "Gaborone"
2516 msgstr ""
2517
2518-#: ../backend/modules/Timezone/statictimezonemodel.cpp:149
2519+#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
2520 msgid "Botswana"
2521 msgstr ""
2522
2523-#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
2524+#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
2525 msgid "Gaza"
2526 msgstr ""
2527
2528-#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
2529-#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
2530+#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
2531+#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
2532 msgid "Palestine"
2533 msgstr ""
2534
2535-#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
2536+#: ../backend/modules/Timezone/statictimezonemodel.cpp:152
2537 msgid "Gibraltar"
2538 msgstr ""
2539
2540-#: ../backend/modules/Timezone/statictimezonemodel.cpp:152
2541+#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
2542 msgid "Grand Turk"
2543 msgstr ""
2544
2545-#: ../backend/modules/Timezone/statictimezonemodel.cpp:152
2546+#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
2547 msgid "Turks and Caicos Islands"
2548 msgstr ""
2549
2550-#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
2551+#: ../backend/modules/Timezone/statictimezonemodel.cpp:154
2552 msgid "Grenada"
2553 msgstr ""
2554
2555-#: ../backend/modules/Timezone/statictimezonemodel.cpp:154
2556+#: ../backend/modules/Timezone/statictimezonemodel.cpp:155
2557 msgid "Guam"
2558 msgstr ""
2559
2560-#: ../backend/modules/Timezone/statictimezonemodel.cpp:155
2561+#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
2562 msgid "Guangzhou"
2563 msgstr ""
2564
2565-#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
2566+#: ../backend/modules/Timezone/statictimezonemodel.cpp:157
2567 msgid "Guatemala"
2568 msgstr ""
2569
2570-#: ../backend/modules/Timezone/statictimezonemodel.cpp:157
2571+#: ../backend/modules/Timezone/statictimezonemodel.cpp:158
2572 msgid "Gurgaon"
2573 msgstr ""
2574
2575-#: ../backend/modules/Timezone/statictimezonemodel.cpp:158
2576+#: ../backend/modules/Timezone/statictimezonemodel.cpp:159
2577 msgid "Guyana"
2578 msgstr ""
2579
2580-#: ../backend/modules/Timezone/statictimezonemodel.cpp:160
2581+#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
2582 msgid "Haifa"
2583 msgstr ""
2584
2585-#: ../backend/modules/Timezone/statictimezonemodel.cpp:160
2586-#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
2587+#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
2588+#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
2589 msgid "Israel"
2590 msgstr ""
2591
2592-#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
2593+#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
2594 msgid "Halifax"
2595 msgstr ""
2596
2597-#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
2598+#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
2599 msgid "Hamburg"
2600 msgstr ""
2601
2602-#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
2603+#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
2604 msgid "Hanoi"
2605 msgstr ""
2606
2607-#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
2608-#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
2609+#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
2610+#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
2611 msgid "Vietnam"
2612 msgstr ""
2613
2614-#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
2615+#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
2616 msgid "Harare"
2617 msgstr ""
2618
2619-#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
2620+#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
2621 msgid "Zimbabwe"
2622 msgstr ""
2623
2624-#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
2625+#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
2626 msgid "Havana"
2627 msgstr ""
2628
2629-#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
2630+#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
2631 msgid "Cuba"
2632 msgstr ""
2633
2634-#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
2635+#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
2636 msgid "Hebron"
2637 msgstr ""
2638
2639-#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
2640+#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
2641 msgid "Helsinki"
2642 msgstr ""
2643
2644-#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
2645-#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
2646+#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
2647+#: ../backend/modules/Timezone/statictimezonemodel.cpp:261
2648 msgid "Finland"
2649 msgstr ""
2650
2651-#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
2652+#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
2653 msgid "Ho Chi Minh City"
2654 msgstr ""
2655
2656-#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
2657+#: ../backend/modules/Timezone/statictimezonemodel.cpp:170
2658 msgid "Hong Kong"
2659 msgstr ""
2660
2661-#: ../backend/modules/Timezone/statictimezonemodel.cpp:170
2662+#: ../backend/modules/Timezone/statictimezonemodel.cpp:171
2663 msgid "Honolulu"
2664 msgstr ""
2665
2666-#: ../backend/modules/Timezone/statictimezonemodel.cpp:171
2667+#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
2668 msgid "Houston"
2669 msgstr ""
2670
2671-#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
2672+#: ../backend/modules/Timezone/statictimezonemodel.cpp:173
2673 msgid "Hyderabad"
2674 msgstr ""
2675
2676-#: ../backend/modules/Timezone/statictimezonemodel.cpp:174
2677+#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
2678 msgid "Indianapolis"
2679 msgstr ""
2680
2681-#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
2682+#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
2683 msgid "Islamabad"
2684 msgstr ""
2685
2686-#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
2687-#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
2688-#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
2689+#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
2690+#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
2691+#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
2692 msgid "Pakistan"
2693 msgstr ""
2694
2695-#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
2696+#: ../backend/modules/Timezone/statictimezonemodel.cpp:177
2697 msgid "Isle of Man"
2698 msgstr ""
2699
2700-#: ../backend/modules/Timezone/statictimezonemodel.cpp:177
2701+#: ../backend/modules/Timezone/statictimezonemodel.cpp:178
2702 msgid "Istanbul"
2703 msgstr ""
2704
2705-#: ../backend/modules/Timezone/statictimezonemodel.cpp:179
2706+#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
2707 msgid "Jacksonville"
2708 msgstr ""
2709
2710-#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
2711+#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
2712 msgid "Jakarta"
2713 msgstr ""
2714
2715-#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
2716+#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
2717 msgid "Indonesia"
2718 msgstr ""
2719
2720-#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
2721+#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
2722 msgid "Jerusalem"
2723 msgstr ""
2724
2725-#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
2726+#: ../backend/modules/Timezone/statictimezonemodel.cpp:183
2727 msgid "Johannesburg"
2728 msgstr ""
2729
2730-#: ../backend/modules/Timezone/statictimezonemodel.cpp:184
2731+#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
2732 msgid "Kabul"
2733 msgstr ""
2734
2735-#: ../backend/modules/Timezone/statictimezonemodel.cpp:184
2736+#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
2737 msgid "Afghanistan"
2738 msgstr ""
2739
2740-#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
2741+#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
2742 msgid "Kampala"
2743 msgstr ""
2744
2745-#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
2746+#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
2747 msgid "Uganda"
2748 msgstr ""
2749
2750-#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
2751+#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
2752 msgid "Karachi"
2753 msgstr ""
2754
2755-#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
2756+#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
2757 msgid "Khartoum"
2758 msgstr ""
2759
2760-#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
2761+#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
2762 msgid "Sudan"
2763 msgstr ""
2764
2765-#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
2766+#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
2767 msgid "Kiev"
2768 msgstr ""
2769
2770-#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
2771-#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
2772-#: ../backend/modules/Timezone/statictimezonemodel.cpp:310
2773+#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
2774+#: ../backend/modules/Timezone/statictimezonemodel.cpp:200
2775+#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
2776 msgid "Ukraine"
2777 msgstr ""
2778
2779-#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
2780+#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
2781 msgid "Kigali"
2782 msgstr ""
2783
2784-#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
2785+#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
2786 msgid "Rwanda"
2787 msgstr ""
2788
2789-#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
2790+#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
2791 msgid "Kingston"
2792 msgstr ""
2793
2794-#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
2795+#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
2796 msgid "Kinshasa"
2797 msgstr ""
2798
2799-#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
2800+#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
2801 msgid "Democratic Republic of the Congo"
2802 msgstr ""
2803
2804-#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
2805+#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
2806 msgid "Kiritimati"
2807 msgstr ""
2808
2809-#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
2810+#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
2811 msgid "Kiribati"
2812 msgstr ""
2813
2814-#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
2815+#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
2816 msgid "Kirkland"
2817 msgstr ""
2818
2819-#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
2820+#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
2821 msgid "Knox"
2822 msgstr ""
2823
2824-#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
2825+#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
2826 msgid "Knoxville"
2827 msgstr ""
2828
2829-#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
2830+#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
2831 msgid "Kraków"
2832 msgstr ""
2833
2834-#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
2835-#: ../backend/modules/Timezone/statictimezonemodel.cpp:339
2836-#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
2837+#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
2838+#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
2839+#: ../backend/modules/Timezone/statictimezonemodel.cpp:344
2840 msgid "Poland"
2841 msgstr ""
2842
2843-#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
2844+#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
2845 msgid "Kuala Lumpur"
2846 msgstr ""
2847
2848-#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
2849+#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
2850 msgid "Malaysia"
2851 msgstr ""
2852
2853-#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
2854+#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
2855 msgid "Kuwait City"
2856 msgstr ""
2857
2858-#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
2859+#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
2860 msgid "Kuwait"
2861 msgstr ""
2862
2863-#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
2864+#: ../backend/modules/Timezone/statictimezonemodel.cpp:200
2865 msgid "Kyiv"
2866 msgstr ""
2867
2868-#: ../backend/modules/Timezone/statictimezonemodel.cpp:201
2869+#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
2870 msgid "Lagos"
2871 msgstr ""
2872
2873-#: ../backend/modules/Timezone/statictimezonemodel.cpp:201
2874+#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
2875 msgid "Nigeria"
2876 msgstr ""
2877
2878-#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
2879+#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
2880 msgid "Lahore"
2881 msgstr ""
2882
2883-#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
2884+#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
2885 msgid "Las Vegas"
2886 msgstr ""
2887
2888-#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
2889+#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
2890 msgid "Lima"
2891 msgstr ""
2892
2893-#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
2894+#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
2895 msgid "Peru"
2896 msgstr ""
2897
2898-#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
2899+#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
2900 msgid "Lisbon"
2901 msgstr ""
2902
2903-#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
2904+#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
2905 msgid "Portugal"
2906 msgstr ""
2907
2908-#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
2909+#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
2910 msgid "London"
2911 msgstr ""
2912
2913-#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
2914+#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
2915 msgid "Longyearbyen"
2916 msgstr ""
2917
2918-#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
2919+#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
2920 msgid "Svalbard and Jan Mayen"
2921 msgstr ""
2922
2923-#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
2924+#: ../backend/modules/Timezone/statictimezonemodel.cpp:209
2925 msgid "Los Angeles"
2926 msgstr ""
2927
2928-#: ../backend/modules/Timezone/statictimezonemodel.cpp:209
2929+#: ../backend/modules/Timezone/statictimezonemodel.cpp:210
2930 msgid "Louisville"
2931 msgstr ""
2932
2933-#: ../backend/modules/Timezone/statictimezonemodel.cpp:210
2934+#: ../backend/modules/Timezone/statictimezonemodel.cpp:211
2935 msgid "Luxembourg"
2936 msgstr ""
2937
2938-#: ../backend/modules/Timezone/statictimezonemodel.cpp:212
2939+#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
2940 msgid "Macau"
2941 msgstr ""
2942
2943-#: ../backend/modules/Timezone/statictimezonemodel.cpp:212
2944+#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
2945 msgid "Macao"
2946 msgstr ""
2947
2948-#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
2949+#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
2950 msgid "Madison"
2951 msgstr ""
2952
2953-#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
2954+#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
2955 msgid "Madrid"
2956 msgstr ""
2957
2958-#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
2959+#: ../backend/modules/Timezone/statictimezonemodel.cpp:216
2960 msgid "Maldives"
2961 msgstr ""
2962
2963-#: ../backend/modules/Timezone/statictimezonemodel.cpp:216
2964+#: ../backend/modules/Timezone/statictimezonemodel.cpp:217
2965 msgid "Malta"
2966 msgstr ""
2967
2968-#: ../backend/modules/Timezone/statictimezonemodel.cpp:217
2969+#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
2970 msgid "Managua"
2971 msgstr ""
2972
2973-#: ../backend/modules/Timezone/statictimezonemodel.cpp:217
2974+#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
2975 msgid "Nicaragua"
2976 msgstr ""
2977
2978-#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
2979+#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
2980 msgid "Manchester"
2981 msgstr ""
2982
2983-#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
2984+#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
2985 msgid "Manila"
2986 msgstr ""
2987
2988-#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
2989+#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
2990 msgid "Philippines"
2991 msgstr ""
2992
2993-#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
2994+#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
2995 msgid "Marengo"
2996 msgstr ""
2997
2998-#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
2999+#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
3000 msgid "Martinique"
3001 msgstr ""
3002
3003-#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
3004+#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
3005 msgid "Maseru"
3006 msgstr ""
3007
3008-#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
3009+#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
3010 msgid "Lesotho"
3011 msgstr ""
3012
3013-#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
3014+#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
3015 msgid "Melbourne"
3016 msgstr ""
3017
3018-#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
3019+#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
3020 msgid "Memphis"
3021 msgstr ""
3022
3023-#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
3024+#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
3025 msgid "Mendoza"
3026 msgstr ""
3027
3028-#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
3029+#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
3030 msgid "Metlakatla"
3031 msgstr ""
3032
3033-#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
3034+#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
3035 msgid "Mexico City"
3036 msgstr ""
3037
3038-#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
3039+#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
3040 msgid "Miami"
3041 msgstr ""
3042
3043-#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
3044+#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
3045 msgid "Milan"
3046 msgstr ""
3047
3048-#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
3049-#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
3050+#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
3051+#: ../backend/modules/Timezone/statictimezonemodel.cpp:288
3052 msgid "Italy"
3053 msgstr ""
3054
3055-#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
3056+#: ../backend/modules/Timezone/statictimezonemodel.cpp:231
3057 msgid "Milwaukee"
3058 msgstr ""
3059
3060-#: ../backend/modules/Timezone/statictimezonemodel.cpp:231
3061+#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
3062 msgid "Minneapolis"
3063 msgstr ""
3064
3065-#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
3066+#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
3067 msgid "Minsk"
3068 msgstr ""
3069
3070-#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
3071+#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
3072 msgid "Belarus"
3073 msgstr ""
3074
3075-#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
3076+#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
3077 msgid "Mogadishu"
3078 msgstr ""
3079
3080-#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
3081+#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
3082 msgid "Somalia"
3083 msgstr ""
3084
3085-#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
3086+#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
3087 msgid "Monrovia"
3088 msgstr ""
3089
3090-#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
3091+#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
3092 msgid "Liberia"
3093 msgstr ""
3094
3095-#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
3096+#: ../backend/modules/Timezone/statictimezonemodel.cpp:236
3097 msgid "Monaco"
3098 msgstr ""
3099
3100-#: ../backend/modules/Timezone/statictimezonemodel.cpp:236
3101+#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
3102 msgid "Monterrey"
3103 msgstr ""
3104
3105-#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
3106+#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
3107 msgid "Montevideo"
3108 msgstr ""
3109
3110-#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
3111+#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
3112 msgid "Uruguay"
3113 msgstr ""
3114
3115-#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
3116+#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
3117 msgid "Montreal"
3118 msgstr ""
3119
3120-#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
3121+#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
3122 msgid "Moscow"
3123 msgstr ""
3124
3125-#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
3126+#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
3127 msgid "Mountain View"
3128 msgstr ""
3129
3130-#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
3131+#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
3132 msgid "Mumbai"
3133 msgstr ""
3134
3135-#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
3136+#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
3137 msgid "Munich"
3138 msgstr ""
3139
3140-#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
3141+#: ../backend/modules/Timezone/statictimezonemodel.cpp:244
3142 msgid "Muscat"
3143 msgstr ""
3144
3145-#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
3146+#: ../backend/modules/Timezone/statictimezonemodel.cpp:244
3147 msgid "Oman"
3148 msgstr ""
3149
3150-#: ../backend/modules/Timezone/statictimezonemodel.cpp:245
3151+#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
3152 msgid "Nairobi"
3153 msgstr ""
3154
3155-#: ../backend/modules/Timezone/statictimezonemodel.cpp:245
3156+#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
3157 msgid "Kenya"
3158 msgstr ""
3159
3160-#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
3161+#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
3162 msgid "Nashville"
3163 msgstr ""
3164
3165-#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
3166+#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
3167 msgid "Nassau"
3168 msgstr ""
3169
3170-#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
3171+#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
3172 msgid "Bahamas"
3173 msgstr ""
3174
3175-#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
3176+#: ../backend/modules/Timezone/statictimezonemodel.cpp:249
3177 msgid "New Orleans"
3178 msgstr ""
3179
3180-#: ../backend/modules/Timezone/statictimezonemodel.cpp:249
3181+#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
3182 msgid "New Salem"
3183 msgstr ""
3184
3185-#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
3186+#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
3187 msgid "New South Wales"
3188 msgstr ""
3189
3190-#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
3191+#: ../backend/modules/Timezone/statictimezonemodel.cpp:252
3192 msgid "New York"
3193 msgstr ""
3194
3195-#: ../backend/modules/Timezone/statictimezonemodel.cpp:252
3196+#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
3197 msgid "Newfoundland"
3198 msgstr ""
3199
3200-#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
3201+#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
3202 msgid "Nouméa"
3203 msgstr ""
3204
3205-#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
3206+#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
3207 msgid "New Caledonia"
3208 msgstr ""
3209
3210-#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
3211+#: ../backend/modules/Timezone/statictimezonemodel.cpp:255
3212 msgid "Nuestra Señora de La Paz"
3213 msgstr ""
3214
3215-#: ../backend/modules/Timezone/statictimezonemodel.cpp:256
3216+#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
3217 msgid "Oklahoma City"
3218 msgstr ""
3219
3220-#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
3221+#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
3222 msgid "Osaka"
3223 msgstr ""
3224
3225-#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
3226-#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
3227+#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
3228+#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
3229 msgid "Japan"
3230 msgstr ""
3231
3232-#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
3233+#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
3234 msgid "Oslo"
3235 msgstr ""
3236
3237-#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
3238+#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
3239 msgid "Norway"
3240 msgstr ""
3241
3242-#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
3243+#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
3244 msgid "Ottawa"
3245 msgstr ""
3246
3247-#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
3248+#: ../backend/modules/Timezone/statictimezonemodel.cpp:261
3249 msgid "Oulu"
3250 msgstr ""
3251
3252-#: ../backend/modules/Timezone/statictimezonemodel.cpp:262
3253+#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
3254 msgid "Panamá"
3255 msgstr ""
3256
3257-#: ../backend/modules/Timezone/statictimezonemodel.cpp:262
3258+#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
3259 msgid "Panama"
3260 msgstr ""
3261
3262-#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
3263+#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
3264 msgid "Paramaribo"
3265 msgstr ""
3266
3267-#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
3268+#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
3269 msgid "Suriname"
3270 msgstr ""
3271
3272-#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
3273+#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
3274 msgid "Paris"
3275 msgstr ""
3276
3277-#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
3278-#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
3279+#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
3280+#: ../backend/modules/Timezone/statictimezonemodel.cpp:338
3281 msgid "France"
3282 msgstr ""
3283
3284-#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
3285+#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
3286 msgid "Perth"
3287 msgstr ""
3288
3289-#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
3290+#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
3291 msgid "Petersburg"
3292 msgstr ""
3293
3294-#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
3295+#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
3296 msgid "Philadelphia"
3297 msgstr ""
3298
3299-#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
3300+#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
3301 msgid "Phnom Penh"
3302 msgstr ""
3303
3304-#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
3305+#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
3306 msgid "Cambodia"
3307 msgstr ""
3308
3309-#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
3310+#: ../backend/modules/Timezone/statictimezonemodel.cpp:270
3311 msgid "Phoenix"
3312 msgstr ""
3313
3314-#: ../backend/modules/Timezone/statictimezonemodel.cpp:270
3315+#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
3316 msgid "Pittsburgh"
3317 msgstr ""
3318
3319-#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
3320+#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
3321 msgid "Port of Spain"
3322 msgstr ""
3323
3324-#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
3325+#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
3326 msgid "Trinidad and Tobago"
3327 msgstr ""
3328
3329-#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
3330+#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
3331 msgid "Port au Prince"
3332 msgstr ""
3333
3334-#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
3335+#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
3336 msgid "Haiti"
3337 msgstr ""
3338
3339-#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
3340+#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
3341 msgid "Portland"
3342 msgstr ""
3343
3344-#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
3345+#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
3346 msgid "Prague"
3347 msgstr ""
3348
3349-#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
3350+#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
3351 msgid "Czech"
3352 msgstr ""
3353
3354-#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
3355+#: ../backend/modules/Timezone/statictimezonemodel.cpp:276
3356 msgid "Pyongyang"
3357 msgstr ""
3358
3359-#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
3360+#: ../backend/modules/Timezone/statictimezonemodel.cpp:276
3361 msgid "North Korea"
3362 msgstr ""
3363
3364-#: ../backend/modules/Timezone/statictimezonemodel.cpp:277
3365+#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
3366 msgid "Queensland"
3367 msgstr ""
3368
3369-#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
3370+#: ../backend/modules/Timezone/statictimezonemodel.cpp:279
3371 msgid "Quito"
3372 msgstr ""
3373
3374-#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
3375+#: ../backend/modules/Timezone/statictimezonemodel.cpp:279
3376 msgid "Ecuador"
3377 msgstr ""
3378
3379-#: ../backend/modules/Timezone/statictimezonemodel.cpp:280
3380+#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
3381 msgid "Rangoon"
3382 msgstr ""
3383
3384-#: ../backend/modules/Timezone/statictimezonemodel.cpp:280
3385+#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
3386 msgid "Myanmar"
3387 msgstr ""
3388
3389-#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
3390+#: ../backend/modules/Timezone/statictimezonemodel.cpp:282
3391 msgid "Reno"
3392 msgstr ""
3393
3394-#: ../backend/modules/Timezone/statictimezonemodel.cpp:282
3395+#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
3396 msgid "Reston"
3397 msgstr ""
3398
3399-#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
3400+#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
3401 msgid "Reykjavík"
3402 msgstr ""
3403
3404-#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
3405+#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
3406 msgid "Iceland"
3407 msgstr ""
3408
3409-#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
3410+#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
3411 msgid "Riga"
3412 msgstr ""
3413
3414-#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
3415+#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
3416 msgid "Latvia"
3417 msgstr ""
3418
3419-#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
3420+#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
3421 msgid "Rio de Janeiro"
3422 msgstr ""
3423
3424-#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
3425+#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
3426 msgid "Riyadh"
3427 msgstr ""
3428
3429-#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
3430+#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
3431 msgid "Saudi Arabia"
3432 msgstr ""
3433
3434-#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
3435+#: ../backend/modules/Timezone/statictimezonemodel.cpp:288
3436 msgid "Rome"
3437 msgstr ""
3438
3439-#: ../backend/modules/Timezone/statictimezonemodel.cpp:289
3440+#: ../backend/modules/Timezone/statictimezonemodel.cpp:290
3441 msgid "Sacramento"
3442 msgstr ""
3443
3444-#: ../backend/modules/Timezone/statictimezonemodel.cpp:290
3445+#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
3446 msgid "Salt Lake City"
3447 msgstr ""
3448
3449-#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
3450+#: ../backend/modules/Timezone/statictimezonemodel.cpp:292
3451 msgid "Samoa"
3452 msgstr ""
3453
3454-#: ../backend/modules/Timezone/statictimezonemodel.cpp:292
3455+#: ../backend/modules/Timezone/statictimezonemodel.cpp:293
3456 msgid "San Antonio"
3457 msgstr ""
3458
3459-#: ../backend/modules/Timezone/statictimezonemodel.cpp:293
3460+#: ../backend/modules/Timezone/statictimezonemodel.cpp:294
3461 msgid "San Diego"
3462 msgstr ""
3463
3464-#: ../backend/modules/Timezone/statictimezonemodel.cpp:294
3465+#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
3466 msgid "San Francisco"
3467 msgstr ""
3468
3469-#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
3470+#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
3471 msgid "San José"
3472 msgstr ""
3473
3474-#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
3475+#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
3476 msgid "San Juan"
3477 msgstr ""
3478
3479-#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
3480+#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
3481 msgid "Puerto Rico"
3482 msgstr ""
3483
3484-#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
3485+#: ../backend/modules/Timezone/statictimezonemodel.cpp:298
3486 msgid "San Marino"
3487 msgstr ""
3488
3489-#: ../backend/modules/Timezone/statictimezonemodel.cpp:298
3490+#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
3491 msgid "San Salvador"
3492 msgstr ""
3493
3494-#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
3495+#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
3496 msgid "Sanaa"
3497 msgstr ""
3498
3499-#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
3500+#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
3501 msgid "Yemen"
3502 msgstr ""
3503
3504-#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
3505+#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
3506 msgid "Santiago"
3507 msgstr ""
3508
3509-#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
3510+#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
3511 msgid "Santo Domingo"
3512 msgstr ""
3513
3514-#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
3515+#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
3516 msgid "Dominican Republic"
3517 msgstr ""
3518
3519-#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
3520+#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
3521 msgid "São Paulo"
3522 msgstr ""
3523
3524-#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
3525+#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
3526 msgid "São Tomé"
3527 msgstr ""
3528
3529-#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
3530+#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
3531 msgid "São Tomé and Príncipe"
3532 msgstr ""
3533
3534-#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
3535+#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
3536 msgid "Sarajevo"
3537 msgstr ""
3538
3539-#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
3540+#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
3541 msgid "Bosnia and Herzegovina"
3542 msgstr ""
3543
3544-#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
3545+#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
3546 msgid "Saskatchewan"
3547 msgstr ""
3548
3549-#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
3550+#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
3551 msgid "Seattle"
3552 msgstr ""
3553
3554-#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
3555+#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
3556 msgid "Seoul"
3557 msgstr ""
3558
3559-#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
3560+#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
3561 msgid "South Korea"
3562 msgstr ""
3563
3564-#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
3565+#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
3566 msgid "Shanghai"
3567 msgstr ""
3568
3569-#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
3570+#: ../backend/modules/Timezone/statictimezonemodel.cpp:310
3571 msgid "Singapore"
3572 msgstr ""
3573
3574-#: ../backend/modules/Timezone/statictimezonemodel.cpp:310
3575+#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
3576 msgid "Simferopol"
3577 msgstr ""
3578
3579-#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
3580+#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
3581 msgid "Skopje"
3582 msgstr ""
3583
3584-#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
3585+#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
3586 msgid "Macedonia"
3587 msgstr ""
3588
3589-#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
3590+#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
3591 msgid "Sofia"
3592 msgstr ""
3593
3594-#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
3595+#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
3596 msgid "Bulgaria"
3597 msgstr ""
3598
3599-#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
3600+#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
3601 msgid "St.Johns"
3602 msgstr ""
3603
3604-#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
3605+#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
3606 msgid "St.Kitts"
3607 msgstr ""
3608
3609-#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
3610+#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
3611 msgid "Saint Kitts and Nevis"
3612 msgstr ""
3613
3614-#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
3615+#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
3616 msgid "St.Louis"
3617 msgstr ""
3618
3619-#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
3620+#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
3621 msgid "Stanley"
3622 msgstr ""
3623
3624-#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
3625+#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
3626 msgid "Falkland Islands"
3627 msgstr ""
3628
3629-#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
3630+#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
3631 msgid "Stockholm"
3632 msgstr ""
3633
3634-#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
3635+#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
3636 msgid "Sweden"
3637 msgstr ""
3638
3639-#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
3640+#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
3641 msgid "Suva"
3642 msgstr ""
3643
3644-#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
3645+#: ../backend/modules/Timezone/statictimezonemodel.cpp:320
3646 msgid "Sydney"
3647 msgstr ""
3648
3649-#: ../backend/modules/Timezone/statictimezonemodel.cpp:321
3650+#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
3651 msgid "Taipei"
3652 msgstr ""
3653
3654-#: ../backend/modules/Timezone/statictimezonemodel.cpp:321
3655+#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
3656 msgid "Taiwan"
3657 msgstr ""
3658
3659-#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
3660+#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
3661 msgid "Tallinn"
3662 msgstr ""
3663
3664-#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
3665+#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
3666 msgid "Estonia"
3667 msgstr ""
3668
3669-#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
3670+#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
3671 msgid "Tehran"
3672 msgstr ""
3673
3674-#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
3675+#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
3676 msgid "Iran"
3677 msgstr ""
3678
3679-#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
3680+#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
3681 msgid "Tokyo"
3682 msgstr ""
3683
3684-#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
3685+#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
3686 msgid "Toronto"
3687 msgstr ""
3688
3689-#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
3690+#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
3691 msgid "Tripoli"
3692 msgstr ""
3693
3694-#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
3695+#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
3696 msgid "Libya"
3697 msgstr ""
3698
3699-#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
3700+#: ../backend/modules/Timezone/statictimezonemodel.cpp:328
3701 msgid "Tunis"
3702 msgstr ""
3703
3704-#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
3705+#: ../backend/modules/Timezone/statictimezonemodel.cpp:328
3706 msgid "Tunisia"
3707 msgstr ""
3708
3709-#: ../backend/modules/Timezone/statictimezonemodel.cpp:329
3710+#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
3711 msgid "Ulan Bator"
3712 msgstr ""
3713
3714-#: ../backend/modules/Timezone/statictimezonemodel.cpp:329
3715+#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
3716 msgid "Mongolia"
3717 msgstr ""
3718
3719-#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
3720+#: ../backend/modules/Timezone/statictimezonemodel.cpp:331
3721 msgid "UTC"
3722 msgstr ""
3723
3724-#: ../backend/modules/Timezone/statictimezonemodel.cpp:332
3725+#: ../backend/modules/Timezone/statictimezonemodel.cpp:333
3726 msgid "Vancouver"
3727 msgstr ""
3728
3729-#: ../backend/modules/Timezone/statictimezonemodel.cpp:333
3730+#: ../backend/modules/Timezone/statictimezonemodel.cpp:334
3731 msgid "Vatican City"
3732 msgstr ""
3733
3734-#: ../backend/modules/Timezone/statictimezonemodel.cpp:334
3735+#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
3736 msgid "Vevay"
3737 msgstr ""
3738
3739-#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
3740+#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
3741 msgid "Vienna"
3742 msgstr ""
3743
3744-#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
3745+#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
3746 msgid "Austria"
3747 msgstr ""
3748
3749-#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
3750+#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
3751 msgid "Vilnius"
3752 msgstr ""
3753
3754-#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
3755+#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
3756 msgid "Lithuania"
3757 msgstr ""
3758
3759-#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
3760+#: ../backend/modules/Timezone/statictimezonemodel.cpp:338
3761 msgid "Vincennes"
3762 msgstr ""
3763
3764-#: ../backend/modules/Timezone/statictimezonemodel.cpp:339
3765+#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
3766 msgid "Warsaw"
3767 msgstr ""
3768
3769-#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
3770+#: ../backend/modules/Timezone/statictimezonemodel.cpp:341
3771 msgid "Washington D.C."
3772 msgstr ""
3773
3774-#: ../backend/modules/Timezone/statictimezonemodel.cpp:341
3775+#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
3776 msgid "Winamac"
3777 msgstr ""
3778
3779-#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
3780+#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
3781 msgid "Winnipeg"
3782 msgstr ""
3783
3784-#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
3785+#: ../backend/modules/Timezone/statictimezonemodel.cpp:344
3786 msgid "Wrocław"
3787 msgstr ""
3788
3789-#: ../backend/modules/Timezone/statictimezonemodel.cpp:345
3790+#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
3791 msgid "Zagreb"
3792 msgstr ""
3793
3794-#: ../backend/modules/Timezone/statictimezonemodel.cpp:345
3795+#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
3796 msgid "Croatia"
3797 msgstr ""
3798
3799-#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
3800+#: ../backend/modules/Timezone/statictimezonemodel.cpp:347
3801 msgid "Zürich"
3802 msgstr ""
3803
3804-#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
3805+#: ../backend/modules/Timezone/statictimezonemodel.cpp:347
3806 msgid "Switzerland"
3807 msgstr ""
3808
3809
3810=== modified file 'tests/autopilot/ubuntu_clock_app/CMakePluginParser.py'
3811--- tests/autopilot/ubuntu_clock_app/CMakePluginParser.py 2015-06-18 20:43:14 +0000
3812+++ tests/autopilot/ubuntu_clock_app/CMakePluginParser.py 2015-08-16 20:56:40 +0000
3813@@ -1,6 +1,6 @@
3814 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3815 #
3816-# Copyright (C) 2014 Canonical Ltd.
3817+# Copyright (C) 2014-2015 Canonical Ltd.
3818 #
3819 # This program is free software; you can redistribute it and/or modify
3820 # it under the terms of the GNU Lesser General Public License as published by
3821
3822=== modified file 'tests/autopilot/ubuntu_clock_app/fixture_setup.py'
3823--- tests/autopilot/ubuntu_clock_app/fixture_setup.py 2014-11-27 12:27:48 +0000
3824+++ tests/autopilot/ubuntu_clock_app/fixture_setup.py 2015-08-16 20:56:40 +0000
3825@@ -1,4 +1,4 @@
3826-# Copyright (C) 2014 Canonical Ltd
3827+# Copyright (C) 2014-2015 Canonical Ltd
3828 #
3829 # This file is part of Ubuntu Clock App
3830 #
3831
3832=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
3833--- tests/autopilot/ubuntu_clock_app/tests/__init__.py 2015-06-18 22:50:14 +0000
3834+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py 2015-08-16 20:56:40 +0000
3835@@ -1,4 +1,4 @@
3836-# Copyright (C) 2014 Canonical Ltd
3837+# Copyright (C) 2014-2015 Canonical Ltd
3838 #
3839 # This file is part of Ubuntu Clock App
3840 #
3841
3842=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
3843--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py 2015-06-17 21:03:43 +0000
3844+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py 2015-08-16 20:56:40 +0000
3845@@ -1,4 +1,4 @@
3846-# Copyright (C) 2014 Canonical Ltd
3847+# Copyright (C) 2014-2015 Canonical Ltd
3848 #
3849 # This file is part of Ubuntu Clock App
3850 #
3851
3852=== modified file 'tests/unit/ClockTestCase.qml'
3853--- tests/unit/ClockTestCase.qml 2015-05-27 16:03:23 +0000
3854+++ tests/unit/ClockTestCase.qml 2015-08-16 20:56:40 +0000
3855@@ -1,5 +1,5 @@
3856 /*
3857- * Copyright (C) 2014 Canonical Ltd
3858+ * Copyright (C) 2014-2015 Canonical Ltd
3859 *
3860 * This file is part of Ubuntu Clock App
3861 *
3862
3863=== modified file 'tests/unit/MockClockApp.qml'
3864--- tests/unit/MockClockApp.qml 2015-06-04 21:46:37 +0000
3865+++ tests/unit/MockClockApp.qml 2015-08-16 20:56:40 +0000
3866@@ -1,5 +1,5 @@
3867 /*
3868- * Copyright (C) 2014 Canonical Ltd
3869+ * Copyright (C) 2014-2015 Canonical Ltd
3870 *
3871 * This file is part of Ubuntu Clock App
3872 *

Subscribers

People subscribed via source and target branches