Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/predefined-world-city-translation-fix into lp:ubuntu-clock-app

  1. predefined-world-city-translation-fix
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: David Planella
Approved revision: 215
Merged at revision: 206
Proposed branch: lp:~nik90/ubuntu-clock-app/predefined-world-city-translation-fix
Merge into: lp:ubuntu-clock-app
Diff against target: 3932 lines (+2159/-1605)
12 files modified
CMakeLists.txt (+1/-1)
app/worldclock/WorldCityList.qml (+10/-11)
app/worldclock/world-city-list.xml (+0/-1388)
backend/CMakeLists.txt (+5/-1)
backend/modules/Timezone/backend.cpp (+2/-2)
backend/modules/Timezone/statictimezonemodel.cpp (+346/-0)
backend/modules/Timezone/statictimezonemodel.h (+42/-0)
backend/modules/Timezone/xmltimezonemodel.cpp (+0/-139)
backend/modules/Timezone/xmltimezonemodel.h (+0/-54)
debian/changelog (+2/-0)
po/CMakeLists.txt (+1/-1)
po/com.ubuntu.clock.pot (+1750/-8)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/predefined-world-city-translation-fix
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Needs Information
Michael Zanetti c++ plugin code Pending
Review via email: mp+251180@code.launchpad.net

Commit message

Fixes predefined local city and countries list not being translatable in the timezone selection page.

Description of the change

This MP fixes the predefined city and countries list not being translatable in the timezone selection page.

It fixes this bug by predefining the cities and countries as a list in c++ instead of xml thereby allowing gettext to mark those strings up for translation.

Note: This only allows translation of predefined cities and countries that are shown by default. On the other hand, results obtained from geonames.org will not be translated. This will be fixed in another MP as the code paths is quite different to this fix.

This MP looks really big since the XML list and plugin is no longer required the following files were removed and also the pot file update is also included in the diff.
- xmltimezonemodel.cpp
- xmltimezonemodel.h
- world-city-list.xml

To post a comment you must log in.
lp:~nik90/ubuntu-clock-app/predefined-world-city-translation-fix updated
210. By Nekhelesh Ramananthan

Removed xml list

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

@mzanetti, if you don't mind please review only the c++ parts which are statictimezonemodel.cpp and statictimezonemodel.h. The rest of the code diff is just trivial changes.

@dpm, As can be seen in the pot file, it now includes the city and country names that need to be translated.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

Hey,

no big mistakes spotted. Seems fine. If you want, for easier readability you could perhaps create a method like:

void addTimeZone(const QString &city, const QString &country, const QString &timeZoneName) {
    TimeZone tz;
    tz.cityName = city;
    tz.timeZone = QTimeZone(timeZoneName);
    tz.country = tr(country);
    m_timeZones.append(tz);
}

and then call a lot of:

addTimeZone(tr("Anadyr"), tr("Russia"), "Asia/Anadyr");
addTimeZone(tr("Anchorage"), tr("United States"), "America/Anchorage");

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:210
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/617/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2145
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2145/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
lp:~nik90/ubuntu-clock-app/predefined-world-city-translation-fix updated
211. By Nekhelesh Ramananthan

Improved predefined city list format

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

> Hey,
>
> no big mistakes spotted. Seems fine. If you want, for easier readability you
> could perhaps create a method like:
>
> void addTimeZone(const QString &city, const QString &country, const QString
> &timeZoneName) {
> TimeZone tz;
> tz.cityName = city;
> tz.timeZone = QTimeZone(timeZoneName);

This had to be tz.timeZone QTimeZone(timeZoneName.toLatin1()) for it to work. Was not sure exactly why.

> tz.country = tr(country);
> m_timeZones.append(tz);
> }
>
> and then call a lot of:
>
> addTimeZone(tr("Anadyr"), tr("Russia"), "Asia/Anadyr");
> addTimeZone(tr("Anchorage"), tr("United States"), "America/Anchorage");

Yup Done. That looks much better. Thnx :)

lp:~nik90/ubuntu-clock-app/predefined-world-city-translation-fix updated
212. By Nekhelesh Ramananthan

Commented code

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:212
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/618/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2150
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2150/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

The only part I'm not sure of is the tr() method. If I understand it correctly, it's the same upstream translation method, which uses the Qt translation framework.

If that's the case, that won't work with Ubuntu apps, which use gettext. So the code needs to use either Ubuntu's i18n.tr() methods (which call gettext) or gettext functions directly. Here is an example of the click scope using gettext directly:

http://bazaar.launchpad.net/~ubuntuone-control-tower/unity-scope-click/trunk/view/head:/libclickscope/click/click-i18n.h
http://bazaar.launchpad.net/~ubuntuone-control-tower/unity-scope-click/trunk/view/head:/libclickscope/click/highlights.cpp#L127

review: Needs Information
lp:~nik90/ubuntu-clock-app/predefined-world-city-translation-fix updated
213. By Nekhelesh Ramananthan

Changed tr() to gettext() calls

214. By Nekhelesh Ramananthan

Switched from gettext() to _(

215. By Nekhelesh Ramananthan

Added --keyword=_ to generate proper pot file

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

As per the discussion on IRC, I changed the tr() calls to _() calls to make it compatible with gettext(). The only one thing I am not sure about is in http://bazaar.launchpad.net/~ubuntuone-control-tower/unity-scope-click/trunk/view/head:/libclickscope/click/CMakeLists.txt

add_definitions(
  -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
  -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}\"
)

I am wondering if I should also include -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}\" as well?

review: Needs Information
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:215
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/620/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2166
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2166/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

I believe we don't need GETTEXT_LOCALEDIR unless we're explicitly using it somewhere.

IIRC we use LOCALEDIR to install the .mo files in the right locations in clock, which is probably defined here:

http://bazaar.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/utopic-3.0/view/head:/CMakeLists.txt#L33

review: Approve
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Ack. Thnx for the review dpm, mzanetti.

Preview Diff

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

Subscribers

People subscribed via source and target branches