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

[Bartosz Kosiorek]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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

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

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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

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

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/729/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/74

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

review: Approve (continuous-integration)

[Niklas Wenzel (nikwen)]

Looks good to me. Well done! ;)

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

Thanks!

review: Needs Information

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:320
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/734/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/79

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:321
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/737/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/82

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

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

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

On testing I observed the following issues,

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

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

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

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

review: Needs Fixing (testing)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:322
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/744/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/89

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:323
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/746/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/91

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:325
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/747/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/92

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:326
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/753/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/98

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

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

[Nekhelesh Ramananthan (nik90)]

review: Abstain

[Nekhelesh Ramananthan (nik90)]

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

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

Added inline comments

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:328
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/758/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/103

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

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

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

No UI Changes.

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

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

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

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

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

Yes

* Was the debian changelog updated?

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

* Was the copyright years updated if necessary?

Yes, more than sufficiently ;)

review: Approve

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-city-name-fix]

330. By Bartosz Kosiorek on 2015-08-16

Updated translation template

=== modified file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml	2015-07-15 22:31:52 +0000
+++ app/alarm/AlarmModelComponent.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2015-07-24 13:32:46 +0000
+++ app/alarm/AlarmPage.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2015-08-11 20:39:12 +0000
+++ app/alarm/AlarmSettingsPage.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml	2015-08-04 12:30:46 +0000
+++ app/alarm/AlarmUtils.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml	2015-05-27 16:03:23 +0000
+++ app/components/AnalogMode.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/AnalogShadow.qml'
--- app/components/AnalogShadow.qml	2015-05-27 16:03:23 +0000
+++ app/components/AnalogShadow.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/Background.qml'
--- app/components/Background.qml	2015-05-27 16:03:23 +0000
+++ app/components/Background.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml	2015-05-27 16:03:23 +0000
+++ app/components/Clock.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml	2015-05-27 16:03:23 +0000
+++ app/components/ClockCircle.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml	2015-05-27 16:03:23 +0000
+++ app/components/DigitalMode.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/DigitalShadow.qml'
--- app/components/DigitalShadow.qml	2015-05-27 16:03:23 +0000
+++ app/components/DigitalShadow.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml	2015-07-16 21:02:18 +0000
+++ app/components/EmptyState.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/Shadow.qml'
--- app/components/Shadow.qml	2015-05-27 16:03:23 +0000
+++ app/components/Shadow.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml	2015-06-03 16:05:03 +0000
+++ app/components/SubtitledListItem.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/upstreamcomponents/FakeHeader.qml'
--- app/upstreamcomponents/FakeHeader.qml	2015-05-27 16:03:23 +0000
+++ app/upstreamcomponents/FakeHeader.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/upstreamcomponents/FastScroll.js'
--- app/upstreamcomponents/FastScroll.js	2014-07-28 13:02:59 +0000
+++ app/upstreamcomponents/FastScroll.js	2015-08-16 20:56:40 +0000
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** Copyright (C) 2014 Canonical Ltda
+** Copyright (C) 2014-2015 Canonical Ltda
 ** All rights reserved.
 ** Contact: Nokia Corporation ([e-mail])
 **
 
=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml	2015-05-27 16:03:23 +0000
+++ app/upstreamcomponents/FastScroll.qml	2015-08-16 20:56:40 +0000
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** Copyright (C) 2014 Canonical Ltda
+** Copyright (C) 2014-2015 Canonical Ltda
 ** All rights reserved.
 ** Contact: Nokia Corporation ([e-mail])
 **
 
=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml	2015-05-27 16:03:23 +0000
+++ app/worldclock/AddWorldCityButton.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml	2015-05-27 16:03:23 +0000
+++ app/worldclock/UserWorldCityDelegate.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -52,7 +52,7 @@
             }
 
             Label {
-                text: model.city
+                text: model.cityName
                 objectName: "userCityNameText"
                 width: parent.width
                 elide: Text.ElideRight
@@ -60,7 +60,7 @@
             }
 
             Label {
-                text: model.country
+                text: model.countryName
                 objectName: "userCountryNameText"
                 fontSize: "xx-small"
                 width: parent.width
 
=== modified file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml	2015-05-27 16:03:23 +0000
+++ app/worldclock/UserWorldCityList.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2015-07-24 13:16:28 +0000
+++ app/worldclock/WorldCityList.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -124,7 +124,7 @@
                         var url = String("%1%2%3")
                         .arg("http://geoname-lookup.ubuntu.com/?query=")
                         .arg(searchField.text)
-                        .arg("&app=com.ubuntu.clock&version=3.4.x")
+                        .arg("&app=com.ubuntu.clock&version=3.5.x")
                         console.log("Online URL: " + url)
                         if (jsonTimeZoneModelLoader.status === Loader.Ready) {
                             jsonTimeZoneModel.source = Qt.resolvedUrl(url)
@@ -196,9 +196,9 @@
             }
         }
 
-        sort.property: "city"
+        sort.property: "cityName"
         sort.order: Qt.AscendingOrder
-        filter.property: "city"
+        filter.property: "cityName"
         filter.pattern: searchComponentLoader.status === Loader.Ready ? RegExp(searchComponentLoader.item.text, "gi")
                                                                       : RegExp("", "gi")
     }
@@ -266,24 +266,27 @@
         id: cityList
         objectName: "cityList"
 
-        function addWorldCity(city, country, timezone) {
-            console.log("[LOG]: Adding city to U1db Database")
+        function addWorldCity(cityId, countryName, timezone) {
+            console.log("[LOG]: Adding " + cityId.toString() + " city to U1db Database")
             clockDB.putDoc
                     (
                         {
                             "worldlocation":
                             {
-                                "city": city,
-                                "country": country,
+                                "city": cityId,
+                                "country": countryName.replace("'"," "),
                                 "timezone": timezone
                             }
                         },
-                        encodeURIComponent(city + "_" + country)
+                        // Apostrophes are forbidden by database, so we replace it with spaces.
+                        // It will be replaced/translated next time after read from database.
+                        // Country field is used only by jsonTimeZoneModel (lp: #1473074).
+                        encodeURIComponent(cityId + "_" + countryName.replace("'"," "))
                         )
         }
 
         function getSectionText(index) {
-            return sortedTimeZoneModel.get(index).city.substring(0,1)
+            return sortedTimeZoneModel.get(index).cityName.substring(0,1)
         }
 
         onFlickStarted: {
@@ -299,7 +302,7 @@
 
         clip: true
 
-        section.property: "city"
+        section.property: "cityName"
         section.criteria: ViewSection.FirstCharacter
         section.labelPositioning: ViewSection.InlineLabels
 
@@ -334,7 +337,7 @@
                 }
 
                 Label {
-                    text: city
+                    text: cityName
                     objectName: "defaultCityNameText"
                     width: parent.width
                     elide: Text.ElideRight
@@ -342,7 +345,7 @@
                 }
 
                 Label {
-                    text: country
+                    text: countryName
                     objectName: "defaultCountryNameText"
                     fontSize: "xx-small"
                     width: parent.width
@@ -361,12 +364,13 @@
             }
 
             onClicked: {
-                var tempCountry = country.split(",")
-                if(tempCountry.length > 2) {
-                    cityList.addWorldCity(city, tempCountry[1] + ","
-                                          + tempCountry[2], timezoneID)
+                var splittedCountryName = countryName.split(",")
+                if(splittedCountryName.length > 2) {
+                    cityList.addWorldCity(cityId,
+                                          splittedCountryName[1] + "," + splittedCountryName[2],
+                                          timezoneID)
                 } else {
-                    cityList.addWorldCity(city, country, timezoneID)
+                    cityList.addWorldCity(cityId, countryName, timezoneID)
                 }
 
                 mainStack.pop()
 
=== modified file 'backend/modules/Alarm/Settings/alarmsettings.cpp'
--- backend/modules/Alarm/Settings/alarmsettings.cpp	2014-09-06 16:28:39 +0000
+++ backend/modules/Alarm/Settings/alarmsettings.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Alarm/Settings/alarmsettings.h'
--- backend/modules/Alarm/Settings/alarmsettings.h	2014-09-06 16:28:39 +0000
+++ backend/modules/Alarm/Settings/alarmsettings.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Alarm/Settings/backend.cpp'
--- backend/modules/Alarm/Settings/backend.cpp	2014-07-17 12:21:45 +0000
+++ backend/modules/Alarm/Settings/backend.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Alarm/Settings/backend.h'
--- backend/modules/Alarm/Settings/backend.h	2014-07-17 12:21:45 +0000
+++ backend/modules/Alarm/Settings/backend.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/DateTime/backend.cpp'
--- backend/modules/DateTime/backend.cpp	2014-07-26 09:34:15 +0000
+++ backend/modules/DateTime/backend.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/DateTime/backend.h'
--- backend/modules/DateTime/backend.h	2014-07-26 09:34:15 +0000
+++ backend/modules/DateTime/backend.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/DateTime/datetime.cpp'
--- backend/modules/DateTime/datetime.cpp	2014-07-27 13:39:30 +0000
+++ backend/modules/DateTime/datetime.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/DateTime/datetime.h'
--- backend/modules/DateTime/datetime.h	2014-07-29 13:53:44 +0000
+++ backend/modules/DateTime/datetime.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/GeoLocation/backend.cpp'
--- backend/modules/GeoLocation/backend.cpp	2014-11-04 15:58:05 +0000
+++ backend/modules/GeoLocation/backend.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/GeoLocation/backend.h'
--- backend/modules/GeoLocation/backend.h	2014-08-21 15:46:45 +0000
+++ backend/modules/GeoLocation/backend.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/GeoLocation/geolocation.cpp'
--- backend/modules/GeoLocation/geolocation.cpp	2015-06-16 05:38:09 +0000
+++ backend/modules/GeoLocation/geolocation.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/GeoLocation/geolocation.h'
--- backend/modules/GeoLocation/geolocation.h	2014-11-04 15:58:05 +0000
+++ backend/modules/GeoLocation/geolocation.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Timezone/backend.cpp'
--- backend/modules/Timezone/backend.cpp	2015-02-26 21:24:05 +0000
+++ backend/modules/Timezone/backend.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Timezone/backend.h'
--- backend/modules/Timezone/backend.h	2014-07-17 12:21:45 +0000
+++ backend/modules/Timezone/backend.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Timezone/generictimezonemodel.cpp'
--- backend/modules/Timezone/generictimezonemodel.cpp	2014-08-10 13:06:37 +0000
+++ backend/modules/Timezone/generictimezonemodel.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -17,6 +17,7 @@
  */
 
 #include "generictimezonemodel.h"
+#include "statictimezonemodel.h"
 
 #include <QDebug>
 
@@ -32,7 +33,8 @@
 
 void GenericTimeZoneModel::setResults(const QList<QVariant> &results)
 {
-    if(m_results == results) {
+    if(m_results == results)
+    {
         // Don't parse the results again if it is the same results being set again
         return;
     }
@@ -47,7 +49,8 @@
 
 void GenericTimeZoneModel::loadTimeZonesFromVariantList()
 {
-    if(m_results.isEmpty()) {
+    if(m_results.isEmpty())
+    {
         // Don't parse an empty results
         return;
     }
@@ -55,24 +58,37 @@
     // Let QML know model is being reset and rebuilt
     beginResetModel();
 
-    m_timeZones.clear();
+    m_citiesData.clear();
 
-    TimeZone tz;
+    CityData cityData;
 
     /*
      Cycle through the u1db query model results and transfer them to the
      TimeZone list.
     */
-    for (int i=0; i < m_results.size(); i++) {
+    StaticTimeZoneModel timeZonesData;
+    for (int i=0; i < m_results.size(); i++)
+    {
         // Map query model results to timezone tz
-        tz.cityName = m_results.value(i).toMap().value("city").toString();
-        tz.country = m_results.value(i).toMap().value("country").toString();
-        tz.timeZone = QTimeZone(m_results.value(i).toMap().value("timezone").toString().toLatin1());
-
-        m_timeZones.append(tz);
+        cityData.cityId = m_results.value(i).toMap().value("city").toString();
+
+        TimeZoneModel::CityData translatedCityData = timeZonesData.getTranslatedCityData(cityData.cityId);
+        if (translatedCityData.cityId == "")
+        {
+            cityData.cityName = cityData.cityId;
+            cityData.countryName = m_results.value(i).toMap().value("country").toString();
+        }
+        else
+        {
+            cityData.cityName = translatedCityData.cityName;
+            cityData.countryName = translatedCityData.countryName;
+        }
+        cityData.timeZone = QTimeZone(m_results.value(i).toMap().value("timezone").toString().toLatin1());
+
+        m_citiesData.append(cityData);
 
         // Clear tz before next iteration
-        tz = TimeZone();
+        cityData = CityData();
     }
 
 
 
=== modified file 'backend/modules/Timezone/generictimezonemodel.h'
--- backend/modules/Timezone/generictimezonemodel.h	2014-07-22 13:10:43 +0000
+++ backend/modules/Timezone/generictimezonemodel.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Timezone/jsontimezonemodel.cpp'
--- backend/modules/Timezone/jsontimezonemodel.cpp	2014-08-17 10:50:57 +0000
+++ backend/modules/Timezone/jsontimezonemodel.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -83,35 +83,36 @@
     // Let QML know model is being reset and rebuilt
     beginResetModel();
 
-    m_timeZones.clear();
+    m_citiesData.clear();
 
     /*
      Cycle through each QVariant object and transfer them to the TimeZone
      list.
     */
     foreach (const QVariant &entry, timezoneData.toList()) {
-        TimeZone tz;
+        CityData cityData;
 
         auto data = entry.toMap();
         auto admin1 = data.value("admin1").toString();
         auto admin2 = data.value("admin2").toString();
         auto country = data.value("country").toString();
 
-        tz.cityName = data.value("name").toString();
+        cityData.cityId = data.value("name").toString();
+        cityData.cityName = cityData.cityId;
 
         if (!admin1.isEmpty() && !admin2.isEmpty()) {
-            tz.country = QString("%1, %2, %3").arg(admin2).arg(admin1).arg(country);
+            cityData.countryName = QString("%1, %2, %3").arg(admin2).arg(admin1).arg(country);
         } else if (!admin1.isEmpty()) {
-            tz.country = QString("%1, %2").arg(admin1).arg(country);
+            cityData.countryName = QString("%1, %2").arg(admin1).arg(country);
         } else if (!admin2.isEmpty()) {
-            tz.country = QString("%1, %2").arg(admin2).arg(country);
+            cityData.countryName = QString("%1, %2").arg(admin2).arg(country);
         } else {
-            tz.country = country;
+            cityData.countryName = country;
         }
 
-        tz.timeZone = QTimeZone(data.value("timezone").toString().toLatin1());
+        cityData.timeZone = QTimeZone(data.value("timezone").toString().toLatin1());
 
-        m_timeZones.append(tz);
+        m_citiesData.append(cityData);
     }
 
     setStatus(TimeZoneModel::Ready);
 
=== modified file 'backend/modules/Timezone/jsontimezonemodel.h'
--- backend/modules/Timezone/jsontimezonemodel.h	2014-08-16 12:46:46 +0000
+++ backend/modules/Timezone/jsontimezonemodel.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'backend/modules/Timezone/statictimezonemodel.cpp'
--- backend/modules/Timezone/statictimezonemodel.cpp	2015-03-31 13:44:52 +0000
+++ backend/modules/Timezone/statictimezonemodel.cpp	2015-08-16 20:56:40 +0000
@@ -29,12 +29,13 @@
     loadDefaultCityList();
 }
 
-void StaticTimeZoneModel::addCity(const QString &city, const QString &timezone, const QString &country) {
-    TimeZone tz;
-    tz.cityName = city;
-    tz.country = country;
-    tz.timeZone = QTimeZone(timezone.toLatin1());
-    m_timeZones.append(tz);
+void StaticTimeZoneModel::addCity(const QString &cityId, const QString &cityName, const QString &timezone, const QString &countryName) {
+    CityData cityData;
+    cityData.cityId = cityId;
+    cityData.cityName = cityName;
+    cityData.countryName = countryName;
+    cityData.timeZone = QTimeZone(timezone.toLatin1());
+    m_citiesData.append(cityData);
 }
 
 void StaticTimeZoneModel::loadDefaultCityList()
@@ -42,309 +43,327 @@
     // Let QML know model is being reset and rebuilt
     beginResetModel();
 
-    m_timeZones.clear();
-
-    addCity(_("Abidjan"), "Africa/Abidjan", _("Ivory Coast"));
-    addCity(_("Accra"), "Africa/Accra", _("Ghana"));
-    addCity(_("Addis Ababa"), "Africa/Addis_Ababa", _("Ethiopia"));
-    addCity(_("Adelaide"), "Australia/Adelaide", _("Australia"));
-    addCity(_("Albuquerque"), "America/Denver", _("United States"));
-    addCity(_("Algiers"), "Africa/Algiers", _("Algeria"));
-    addCity(_("Almaty"), "Asia/Almaty", _("Kazakhstan"));
-    addCity(_("Amman"), "Asia/Amman", _("Jordan"));
-    addCity(_("Amsterdam"), "Europe/Amsterdam", _("Netherlands"));
-    addCity(_("Anadyr"), "Asia/Anadyr", _("Russia"));
-    addCity(_("Anchorage"), "America/Anchorage", _("United States"));
-    addCity(_("Andorra"), "Europe/Andorra", _("Andorra"));
-    addCity(_("Ankara"), "Europe/Istanbul", _("Turkey"));
-    addCity(_("Ann Arbor"), "America/Detroit", _("United States"));
-    addCity(_("Antananarivo"), "Indian/Antananarivo", _("Madagascar"));
-    addCity(_("Aqtau"), "Asia/Aqtau", _("Kazakhstan"));
-    addCity(_("Aruba"), "America/Aruba", _("Aruba"));
-    addCity(_("Asunción"), "America/Asuncion", _("Paraguay"));
-    addCity(_("Athens"), "Europe/Athens", _("Greece"));
-    addCity(_("Atlanta"), "America/New_York", _("United States"));
-    addCity(_("Auckland"), "Pacific/Auckland", _("New Zealand"));
-    addCity(_("Austin"), "America/Chicago", _("United States"));
-
-    addCity(_("Baghdad"), "Asia/Baghdad", _("Iraq"));
-    addCity(_("Bahrain"), "Asia/Bahrain", _("Bahrain"));
-    addCity(_("Baku"), "Asia/Baku", _("Azerbaijan"));
-    addCity(_("Baltimore"), "America/New_York", _("United States"));
-    addCity(_("Bangalore"), "Asia/Kolkata", _("India"));
-    addCity(_("Bangkok"), "Asia/Bangkok", _("Thailand"));
-    addCity(_("Barbados"), "America/Barbados", _("Barbados"));
-    addCity(_("Barcelona"), "Europe/Madrid", _("Spain"));
-    addCity(_("Beijing"), "Asia/Shanghai", _("China"));
-    addCity(_("Beirut"), "Asia/Beirut", _("Lebanon"));
-    addCity(_("Belfast"), "Europe/Belfast", _("United Kingdom"));
-    addCity(_("Belgrade"), "Europe/Belgrade", _("Serbia"));
-    addCity(_("Belize"), "America/Belize", _("Belize"));
-    addCity(_("Belo Horizonte"), "America/Sao_Paulo", _("Brazil"));
-    addCity(_("Berlin"), "Europe/Berlin", _("Germany"));
-    addCity(_("Bermuda"), "Atlantic/Bermuda", _("Bermuda"));
-    addCity(_("Beulah"), "America/North_Dakota/Beulah", _("United States"));
-    addCity(_("Black Rock City"), "America/Chicago", _("United States"));
-    addCity(_("Blantyre"), "Africa/Blantyre", _("Malawi"));
-    addCity(_("Bogotá"), "America/Bogota", _("Colombia"));
-    addCity(_("Boston"), "America/New_York", _("United States"));
-    addCity(_("Boulder"), "America/Denver", _("United States"));
-    addCity(_("Brasília"), "America/Sao_Paulo", _("Brazil"));
-    addCity(_("Bratislava"), "Europe/Bratislava", _("Slovakia"));
-    addCity(_("Brazzaville"), "Africa/Brazzaville", _("Republic of the Congo"));
-    addCity(_("Brisbane"), "Australia/Brisbane", _("Australia"));
-    addCity(_("Brussels"), "Europe/Brussels", _("Belgium"));
-    addCity(_("Bucharest"), "Europe/Bucharest", _("Romania"));
-    addCity(_("Budapest"), "Europe/Budapest", _("Hungary"));
-    addCity(_("Buenos Aires"), "America/Argentina/Buenos_Aires", _("Argentina"));
-
-    addCity(_("Cairo"), "Africa/Cairo", _("Egypt"));
-    addCity(_("Calcutta"), "Asia/Calcutta", _("India"));
-    addCity(_("Calgary"), "America/Edmonton", _("Canada"));
-    addCity(_("Cambridge"), "Europe/London", _("United Kingdom"));
-    addCity(_("Canary"), "Atlantic/Canary", _("Australia"));
-    addCity(_("Canberra"), "Australia/Canberra", _("Australia"));
-    addCity(_("Cancún"), "America/Cancun", _("Mexico"));
-    addCity(_("Cape Town"), "Africa/Johannesburg", _("South Africa"));
-    addCity(_("Caracas"), "America/Caracas", _("Venezuela"));
-    addCity(_("Casablanca"), "Africa/Casablanca", _("Morocco"));
-    addCity(_("Cayman Palms"), "America/Cayman", _("Cayman Islands"));
-    addCity(_("Chicago"), "America/Chicago", _("United States"));
-    addCity(_("Chihuahua"), "America/Chihuahua", _("Mexico"));
-    addCity(_("Chişinău"), "Europe/Chisinau", _("Moldova"));
-    addCity(_("Cincinnati"), "America/New_York", _("United States"));
-    addCity(_("Cleveland"), "America/New_York", _("United States"));
-    addCity(_("Colombo"), "Asia/Colombo", _("Sri Lanka"));
-    addCity(_("Columbus"), "America/New_York", _("United States"));
-    addCity(_("Conakry"), "Africa/Conakry", _("Guinea"));
-    addCity(_("Copenhagen"), "Europe/Copenhagen", _("Denmark"));
-    addCity(_("Costa Rica"), "America/Costa_Rica", _("Costa Rica"));
-    addCity(_("Curaçao"), "America/Curacao", _("Curacao"));
-
-    addCity(_("Dakar"), "Africa/Dakar", _("Senegal"));
-    addCity(_("Dallas"), "America/Chicago", _("United States"));
-    addCity(_("Damascus"), "Asia/Damascus", _("Syria"));
-    addCity(_("Dar es Salaam"), "Africa/Dar_es_Salaam", _("Tanzania"));
-    addCity(_("Darwin"), "Australia/Darwin", _("Australia"));
-    addCity(_("Dawson Creek"), "America/Dawson_Creek", _("Canada"));
-    addCity(_("Delhi"), "Asia/Kolkata", _("India"));
-    addCity(_("Denver"), "America/Denver", _("United States"));
-    addCity(_("Detroit"), "America/Detroit", _("United States"));
-    addCity(_("Dhaka"), "Asia/Dhaka", _("Bangladesh"));
-    addCity(_("Djibouti"), "Africa/Djibouti", _("Djibouti"));
-    addCity(_("Doha"), "Asia/Qatar", _("Qatar"));
-    addCity(_("Dominica"), "America/Dominica", _("Dominica"));
-    addCity(_("Dubai"), "Asia/Dubai", _("United Arab Emirates"));
-    addCity(_("Dublin"), "Europe/Dublin", _("Ireland"));
-
-    addCity(_("Easter Island"), "Pacific/Easter", _("Chile"));
-    addCity(_("Edmonton"), "America/Edmonton", _("Canada"));
-    addCity(_("El Salvador"), "America/El_Salvador", _("El Salvador"));
-
-    addCity(_("Fiji"), "Pacific/Fiji", _("Fiji"));
-    addCity(_("Fortaleza"), "America/Fortaleza", _("Brazil"));
-    addCity(_("Frankfurt"), "Europe/Berlin", _("Germany"));
-    addCity(_("Freetown"), "Africa/Freetown", _("Sierra Leone"));
-
-    addCity(_("Gaborone"), "Africa/Gaborone", _("Botswana"));
-    addCity(_("Gaza"), "Asia/Gaza", _("Palestine"));
-    addCity(_("Gibraltar"), "Europe/Gibraltar", _("Gibraltar"));
-    addCity(_("Grand Turk"), "America/Grand_Turk", _("Turks and Caicos Islands"));
-    addCity(_("Grenada"), "America/Grenada", _("Grenada"));
-    addCity(_("Guam"), "Pacific/Guam", _("Guam"));
-    addCity(_("Guangzhou"), "Asia/Shanghai", _("China"));
-    addCity(_("Guatemala"), "America/Guatemala", _("Guatemala"));
-    addCity(_("Gurgaon"), "Asia/Kolkata", _("India"));
-    addCity(_("Guyana"), "America/Guyana", _("Guyana"));
-
-    addCity(_("Haifa"), "Asia/Jerusalem", _("Israel"));
-    addCity(_("Halifax"), "America/Halifax", _("Canada"));
-    addCity(_("Hamburg"), "Europe/Berlin", _("Germany"));
-    addCity(_("Hanoi"), "Asia/Ho_Chi_Minh", _("Vietnam"));
-    addCity(_("Harare"), "Africa/Harare", _("Zimbabwe"));
-    addCity(_("Havana"), "America/Havana", _("Cuba"));
-    addCity(_("Hebron"), "Asia/Hebron", _("Palestine"));
-    addCity(_("Helsinki"), "Europe/Helsinki", _("Finland"));
-    addCity(_("Ho Chi Minh City"), "Asia/Ho_Chi_Minh", _("Vietnam"));
-    addCity(_("Hong Kong"), "Asia/Hong_Kong", _("Hong Kong"));
-    addCity(_("Honolulu"), "Pacific/Honolulu", _("United States"));
-    addCity(_("Houston"), "America/Chicago", _("United States"));
-    addCity(_("Hyderabad"), "Asia/Kolkata", _("India"));
-
-    addCity(_("Indianapolis"), "America/Indiana/Indianapolis", _("United States"));
-    addCity(_("Islamabad"), "Asia/Karachi", _("Pakistan"));
-    addCity(_("Isle of Man"), "Europe/Isle_of_Man", _("Isle of Man"));
-    addCity(_("Istanbul"), "Europe/Istanbul", _("Turkey"));
-
-    addCity(_("Jacksonville"), "America/New_York", _("United States"));
-    addCity(_("Jakarta"), "Asia/Jakarta", _("Indonesia"));
-    addCity(_("Jerusalem"), "Asia/Jerusalem", _("Israel"));
-    addCity(_("Johannesburg"), "Africa/Johannesburg", _("South Africa"));
-
-    addCity(_("Kabul"), "Asia/Kabul", _("Afghanistan"));
-    addCity(_("Kampala"), "Africa/Kampala", _("Uganda"));
-    addCity(_("Karachi"), "Asia/Karachi", _("Pakistan"));
-    addCity(_("Khartoum"), "Africa/Khartoum", _("Sudan"));
-    addCity(_("Kiev"), "Europe/Kiev", _("Ukraine"));
-    addCity(_("Kigali"), "Africa/Kigali", _("Rwanda"));
-    addCity(_("Kingston"), "America/Toronto", _("Canada"));
-    addCity(_("Kinshasa"), "Africa/Kinshasa", _("Democratic Republic of the Congo"));
-    addCity(_("Kiritimati"), "Pacific/Kiritimati", _("Kiribati"));
-    addCity(_("Kirkland"), "America/Montreal", _("Canada"));
-    addCity(_("Knox"), "Australia/Melbourne", _("Australia"));
-    addCity(_("Knoxville"), "America/New_York", _("United States"));
-    addCity(_("Kraków"), "Europe/Warsaw", _("Poland"));
-    addCity(_("Kuala Lumpur"), "Asia/Kuala_Lumpur", _("Malaysia"));
-    addCity(_("Kuwait City"), "Asia/Kuwait", _("Kuwait"));
-    addCity(_("Kyiv"), "Europe/Kiev", _("Ukraine"));
-
-    addCity(_("Lagos"), "Africa/Lagos", _("Nigeria"));
-    addCity(_("Lahore"), "Asia/Karachi", _("Pakistan"));
-    addCity(_("Las Vegas"), "America/Los_Angeles", _("United States"));
-    addCity(_("Lima"), "America/Lima", _("Peru"));
-    addCity(_("Lisbon"), "Europe/Lisbon", _("Portugal"));
-    addCity(_("London"), "Europe/London", _("United Kingdom"));
-    addCity(_("Longyearbyen"), "Arctic/Longyearbyen", _("Svalbard and Jan Mayen"));
-    addCity(_("Los Angeles"), "America/Los_Angeles", _("United States"));
-    addCity(_("Louisville"), "America/Kentucky/Louisville", _("United States"));
-    addCity(_("Luxembourg"), "Europe/Luxembourg", _("Luxembourg"));
-
-    addCity(_("Macau"), "Asia/Macau", _("Macao"));
-    addCity(_("Madison"), "America/Chicago", _("United States"));
-    addCity(_("Madrid"), "Europe/Madrid", _("Spain"));
-    addCity(_("Maldives"), "Indian/Maldives", _("Maldives"));
-    addCity(_("Malta"), "Europe/Malta", _("Malta"));
-    addCity(_("Managua"), "America/Managua", _("Nicaragua"));
-    addCity(_("Manchester"), "Europe/London", _("United Kingdom"));
-    addCity(_("Manila"), "Asia/Manila", _("Philippines"));
-    addCity(_("Marengo"), "America/Indiana/Marengo", _("United States"));
-    addCity(_("Martinique"), "America/Martinique", _("Canada"));
-    addCity(_("Maseru"), "Africa/Maseru", _("Lesotho"));
-    addCity(_("Melbourne"), "Australia/Melbourne", _("Australia"));
-    addCity(_("Memphis"), "America/Chicago", _("United States"));
-    addCity(_("Mendoza"), "America/Argentina/Mendoza", _("Argentina"));
-    addCity(_("Metlakatla"), "America/Metlakatla", _("United States"));
-    addCity(_("Mexico City"), "America/Mexico_City", _("Mexico"));
-    addCity(_("Miami"), "America/New_York", _("United States"));
-    addCity(_("Milan"), "Europe/Rome", _("Italy"));
-    addCity(_("Milwaukee"), "America/Chicago", _("United States"));
-    addCity(_("Minneapolis"), "America/Chicago", _("United States"));
-    addCity(_("Minsk"), "Europe/Minsk", _("Belarus"));
-    addCity(_("Mogadishu"), "Africa/Mogadishu", _("Somalia"));
-    addCity(_("Monrovia"), "Africa/Monrovia", _("Liberia"));
-    addCity(_("Monaco"), "Europe/Monaco", _("Monaco"));
-    addCity(_("Monterrey"), "America/Monterrey", _("Mexico"));
-    addCity(_("Montevideo"), "America/Montevideo", _("Uruguay"));
-    addCity(_("Montreal"), "America/Montreal", _("Canada"));
-    addCity(_("Moscow"), "Europe/Moscow", _("Russia"));
-    addCity(_("Mountain View"), "America/Los_Angeles", _("United States"));
-    addCity(_("Mumbai"), "Asia/Kolkata", _("India"));
-    addCity(_("Munich"), "Europe/Berlin", _("Germany"));
-    addCity(_("Muscat"), "Asia/Muscat", _("Oman"));
-
-    addCity(_("Nairobi"), "Africa/Nairobi", _("Kenya"));
-    addCity(_("Nashville"), "America/Chicago", _("United States"));
-    addCity(_("Nassau"), "America/Nassau", _("Bahamas"));
-    addCity(_("New Orleans"), "America/Chicago", _("United States"));
-    addCity(_("New Salem"), "America/North_Dakota/New_Salem", _("United States"));
-    addCity(_("New South Wales"), "Australia/Sydney", _("Australia"));
-    addCity(_("New York"), "America/New_York", _("United States"));
-    addCity(_("Newfoundland"), "America/St_Johns", _("United States"));
-    addCity(_("Nouméa"), "Pacific/Noumea", _("New Caledonia"));
-    addCity(_("Nuestra Señora de La Paz"), "America/Bogota", _("Colombia"));
-
-    addCity(_("Oklahoma City"), "America/Chicago", _("United States"));
-    addCity(_("Osaka"), "Asia/Tokyo", _("Japan"));
-    addCity(_("Oslo"), "Europe/Oslo", _("Norway"));
-    addCity(_("Ottawa"), "America/Toronto", _("Canada"));
-    addCity(_("Oulu"), "Europe/Helsinki", _("Finland"));
-
-    addCity(_("Panamá"), "America/Panama", _("Panama"));
-    addCity(_("Paramaribo"), "America/Paramaribo", _("Suriname"));
-    addCity(_("Paris"), "Europe/Paris", _("France"));
-    addCity(_("Perth"), "Australia/Perth", _("Australia"));
-    addCity(_("Petersburg"), "America/Indiana/Petersburg", _("Russia"));
-    addCity(_("Philadelphia"), "America/New_York", _("United States"));
-    addCity(_("Phnom Penh"), "Asia/Phnom_Penh", _("Cambodia"));
-    addCity(_("Phoenix"), "America/Phoenix", _("United States"));
-    addCity(_("Pittsburgh"), "America/New_York", _("United States"));
-    addCity(_("Port of Spain"), "America/Port_of_Spain", _("Trinidad and Tobago"));
-    addCity(_("Port au Prince"), "America/Port-au-Prince", _("Haiti"));
-    addCity(_("Portland"), "America/Los_Angeles", _("United States"));
-    addCity(_("Prague"), "Europe/Prague", _("Czech"));
-    addCity(_("Pyongyang"), "Asia/Pyongyang", _("North Korea"));
-
-    addCity(_("Queensland"), "Australia/Brisbane", _("United States"));
-    addCity(_("Quito"), "America/Guayaquil", _("Ecuador"));
-
-    addCity(_("Rangoon"), "Asia/Rangoon", _("Myanmar"));
-    addCity(_("Reno"), "America/Los_Angeles", _("United States"));
-    addCity(_("Reston"), "America/New_York", _("United States"));
-    addCity(_("Reykjavík"), "Atlantic/Reykjavik", _("Iceland"));
-    addCity(_("Riga"), "Europe/Riga", _("Latvia"));
-    addCity(_("Rio de Janeiro"), "America/Sao_Paulo", _("Brazil"));
-    addCity(_("Riyadh"), "Asia/Riyadh", _("Saudi Arabia"));
-    addCity(_("Rome"), "Europe/Rome", _("Italy"));
-
-    addCity(_("Sacramento"), "America/Los_Angeles", _("United States"));
-    addCity(_("Salt Lake City"), "America/Denver", _("United States"));
-    addCity(_("Samoa"), "Pacific/Apia", _("Samoa"));
-    addCity(_("San Antonio"), "America/Chicago", _("United States"));
-    addCity(_("San Diego"), "America/Los_Angeles", _("United States"));
-    addCity(_("San Francisco"), "America/Costa_Rica", _("United States"));
-    addCity(_("San José"), "America/Costa_Rica", _("Costa Rica"));
-    addCity(_("San Juan"), "America/Puerto_Rico", _("Puerto Rico"));
-    addCity(_("San Marino"), "Europe/San_Marino", _("San Marino"));
-    addCity(_("San Salvador"), "America/El_Salvador", _("El Salvador"));
-    addCity(_("Sanaa"), "Asia/Aden", _("Yemen"));
-    addCity(_("Santiago"), "America/Santiago", _("Chile"));
-    addCity(_("Santo Domingo"), "America/Santo_Domingo", _("Dominican Republic"));
-    addCity(_("São Paulo"), "America/Sao_Paulo", _("Brazil"));
-    addCity(_("São Tomé"), "Africa/Sao_Tome", _("São Tomé and Príncipe"));
-    addCity(_("Sarajevo"), "Europe/Sarajevo", _("Bosnia and Herzegovina"));
-    addCity(_("Saskatchewan"), "America/Regina", _("Canada"));
-    addCity(_("Seattle"), "America/Los_Angeles", _("United States"));
-    addCity(_("Seoul"), "Asia/Seoul", _("South Korea"));
-    addCity(_("Shanghai"), "Asia/Shanghai", _("China"));
-    addCity(_("Singapore"), "Asia/Singapore", _("Singapore"));
-    addCity(_("Simferopol"), "Europe/Simferopol", _("Ukraine"));
-    addCity(_("Skopje"), "Europe/Skopje", _("Macedonia"));
-    addCity(_("Sofia"), "Europe/Sofia", _("Bulgaria"));
-    addCity(_("St.Johns"), "America/St_Johns", _("Canada"));
-    addCity(_("St.Kitts"), "America/St_Kitts", _("Saint Kitts and Nevis"));
-    addCity(_("St.Louis"), "America/Chicago", _("United States"));
-    addCity(_("Stanley"), "Atlantic/Stanley", _("Falkland Islands"));
-    addCity(_("Stockholm"), "Europe/Stockholm", _("Sweden"));
-    addCity(_("Suva"), "Pacific/Fiji", _("Fiji"));
-    addCity(_("Sydney"), "Australia/Sydney", _("Australia"));
-
-    addCity(_("Taipei"), "Asia/Taipei", _("Taiwan"));
-    addCity(_("Tallinn"), "Europe/Tallinn", _("Estonia"));
-    addCity(_("Tehran"), "Asia/Tehran", _("Iran"));
-    addCity(_("Tokyo"), "Asia/Tokyo", _("Japan"));
-    addCity(_("Toronto"), "America/Toronto", _("Canada"));
-    addCity(_("Tripoli"), "Africa/Tripoli", _("Libya"));
-    addCity(_("Tunis"), "Africa/Tunis", _("Tunisia"));
-
-    addCity(_("Ulan Bator"), "Asia/Ulan_Bator", _("Mongolia"));
-    addCity(_("UTC"), "UTC", _("UTC"));
-
-    addCity(_("Vancouver"), "America/Vancouver", _("Canada"));
-    addCity(_("Vatican City"), "Europe/Vatican", _("Vatican City"));
-    addCity(_("Vevay"), "America/Indiana/Vevay", _("United States"));
-    addCity(_("Vienna"), "Europe/Vienna", _("Austria"));
-    addCity(_("Vilnius"), "Europe/Vilnius", _("Lithuania"));
-    addCity(_("Vincennes"), "America/Indiana/Vincennes", _("France"));
-
-    addCity(_("Warsaw"), "Europe/Warsaw", _("Poland"));
-    addCity(_("Washington D.C."), "America/New_York", _("United States"));
-    addCity(_("Winamac"), "America/Indiana/Winamac", _("United States"));
-    addCity(_("Winnipeg"), "America/Winnipeg", _("Canada"));
-    addCity(_("Wrocław"), "Europe/Warsaw", _("Poland"));
-
-    addCity(_("Zagreb"), "Europe/Zagreb", _("Croatia"));
-    addCity(_("Zürich"), "Europe/Zurich", _("Switzerland"));
+    m_citiesData.clear();
+
+    addCity("Abidjan", _("Abidjan"), "Africa/Abidjan", _("Ivory Coast"));
+    addCity("Accra", _("Accra"), "Africa/Accra", _("Ghana"));
+    addCity("Addis Ababa", _("Addis Ababa"), "Africa/Addis_Ababa", _("Ethiopia"));
+    addCity("Adelaide", _("Adelaide"), "Australia/Adelaide", _("Australia"));
+    addCity("Albuquerque", _("Albuquerque"), "America/Denver", _("United States"));
+    addCity("Algiers", _("Algiers"), "Africa/Algiers", _("Algeria"));
+    addCity("Almaty", _("Almaty"), "Asia/Almaty", _("Kazakhstan"));
+    addCity("Amman", _("Amman"), "Asia/Amman", _("Jordan"));
+    addCity("Amsterdam", _("Amsterdam"), "Europe/Amsterdam", _("Netherlands"));
+    addCity("Anadyr", _("Anadyr"), "Asia/Anadyr", _("Russia"));
+    addCity("Anchorage", _("Anchorage"), "America/Anchorage", _("United States"));
+    addCity("Andorra", _("Andorra"), "Europe/Andorra", _("Andorra"));
+    addCity("Ankara", _("Ankara"), "Europe/Istanbul", _("Turkey"));
+    addCity("Ann Arbor", _("Ann Arbor"), "America/Detroit", _("United States"));
+    addCity("Antananarivo", _("Antananarivo"), "Indian/Antananarivo", _("Madagascar"));
+    addCity("Aqtau", _("Aqtau"), "Asia/Aqtau", _("Kazakhstan"));
+    addCity("Aruba", _("Aruba"), "America/Aruba", _("Aruba"));
+    addCity("Asunción", _("Asunción"), "America/Asuncion", _("Paraguay"));
+    addCity("Athens", _("Athens"), "Europe/Athens", _("Greece"));
+    addCity("Atlanta", _("Atlanta"), "America/New_York", _("United States"));
+    addCity("Auckland", _("Auckland"), "Pacific/Auckland", _("New Zealand"));
+    addCity("Austin", _("Austin"), "America/Chicago", _("United States"));
+
+    addCity("Baghdad", _("Baghdad"), "Asia/Baghdad", _("Iraq"));
+    addCity("Bahrain", _("Bahrain"), "Asia/Bahrain", _("Bahrain"));
+    addCity("Baku", _("Baku"), "Asia/Baku", _("Azerbaijan"));
+    addCity("Baltimore", _("Baltimore"), "America/New_York", _("United States"));
+    addCity("Bangalore", _("Bangalore"), "Asia/Kolkata", _("India"));
+    addCity("Bangkok", _("Bangkok"), "Asia/Bangkok", _("Thailand"));
+    addCity("Barbados", _("Barbados"), "America/Barbados", _("Barbados"));
+    addCity("Barcelona", _("Barcelona"), "Europe/Madrid", _("Spain"));
+    addCity("Beijing", _("Beijing"), "Asia/Shanghai", _("China"));
+    addCity("Beirut", _("Beirut"), "Asia/Beirut", _("Lebanon"));
+    addCity("Belfast", _("Belfast"), "Europe/Belfast", _("United Kingdom"));
+    addCity("Belgrade", _("Belgrade"), "Europe/Belgrade", _("Serbia"));
+    addCity("Belize", _("Belize"), "America/Belize", _("Belize"));
+    addCity("Belo Horizonte", _("Belo Horizonte"), "America/Sao_Paulo", _("Brazil"));
+    addCity("Berlin", _("Berlin"), "Europe/Berlin", _("Germany"));
+    addCity("Bermuda", _("Bermuda"), "Atlantic/Bermuda", _("Bermuda"));
+    addCity("Beulah", _("Beulah"), "America/North_Dakota/Beulah", _("United States"));
+    addCity("Black Rock City", _("Black Rock City"), "America/Chicago", _("United States"));
+    addCity("Blantyre", _("Blantyre"), "Africa/Blantyre", _("Malawi"));
+    addCity("Bogotá", _("Bogotá"), "America/Bogota", _("Colombia"));
+    addCity("Boston", _("Boston"), "America/New_York", _("United States"));
+    addCity("Boulder", _("Boulder"), "America/Denver", _("United States"));
+    addCity("Brasília", _("Brasília"), "America/Sao_Paulo", _("Brazil"));
+    addCity("Bratislava", _("Bratislava"), "Europe/Bratislava", _("Slovakia"));
+    addCity("Brazzaville", _("Brazzaville"), "Africa/Brazzaville", _("Republic of the Congo"));
+    addCity("Brisbane", _("Brisbane"), "Australia/Brisbane", _("Australia"));
+    addCity("Brussels", _("Brussels"), "Europe/Brussels", _("Belgium"));
+    addCity("Bucharest", _("Bucharest"), "Europe/Bucharest", _("Romania"));
+    addCity("Budapest", _("Budapest"), "Europe/Budapest", _("Hungary"));
+    addCity("Buenos Aires", _("Buenos Aires"), "America/Argentina/Buenos_Aires", _("Argentina"));
+
+    addCity("Cairo", _("Cairo"), "Africa/Cairo", _("Egypt"));
+    addCity("Calcutta", _("Calcutta"), "Asia/Calcutta", _("India"));
+    addCity("Calgary", _("Calgary"), "America/Edmonton", _("Canada"));
+    addCity("Cambridge", _("Cambridge"), "Europe/London", _("United Kingdom"));
+    addCity("Canary", _("Canary"), "Atlantic/Canary", _("Australia"));
+    addCity("Canberra", _("Canberra"), "Australia/Canberra", _("Australia"));
+    addCity("Cancún", _("Cancún"), "America/Cancun", _("Mexico"));
+    addCity("Cape Town", _("Cape Town"), "Africa/Johannesburg", _("South Africa"));
+    addCity("Caracas", _("Caracas"), "America/Caracas", _("Venezuela"));
+    addCity("Casablanca", _("Casablanca"), "Africa/Casablanca", _("Morocco"));
+    addCity("Cayman Palms", _("Cayman Palms"), "America/Cayman", _("Cayman Islands"));
+    addCity("Chicago", _("Chicago"), "America/Chicago", _("United States"));
+    addCity("Chihuahua", _("Chihuahua"), "America/Chihuahua", _("Mexico"));
+    addCity("Chişinău", _("Chişinău"), "Europe/Chisinau", _("Moldova"));
+    addCity("Cincinnati", _("Cincinnati"), "America/New_York", _("United States"));
+    addCity("Cleveland", _("Cleveland"), "America/New_York", _("United States"));
+    addCity("Colombo", _("Colombo"), "Asia/Colombo", _("Sri Lanka"));
+    addCity("Columbus", _("Columbus"), "America/New_York", _("United States"));
+    addCity("Conakry", _("Conakry"), "Africa/Conakry", _("Guinea"));
+    addCity("Copenhagen", _("Copenhagen"), "Europe/Copenhagen", _("Denmark"));
+    addCity("Costa Rica", _("Costa Rica"), "America/Costa_Rica", _("Costa Rica"));
+    addCity("Curaçao", _("Curaçao"), "America/Curacao", _("Curacao"));
+
+    addCity("Dakar", _("Dakar"), "Africa/Dakar", _("Senegal"));
+    addCity("Dallas", _("Dallas"), "America/Chicago", _("United States"));
+    addCity("Damascus", _("Damascus"), "Asia/Damascus", _("Syria"));
+    addCity("Dar es Salaam", _("Dar es Salaam"), "Africa/Dar_es_Salaam", _("Tanzania"));
+    addCity("Darwin", _("Darwin"), "Australia/Darwin", _("Australia"));
+    addCity("Dawson Creek", _("Dawson Creek"), "America/Dawson_Creek", _("Canada"));
+    addCity("Delhi", _("Delhi"), "Asia/Kolkata", _("India"));
+    addCity("Denver", _("Denver"), "America/Denver", _("United States"));
+    addCity("Detroit", _("Detroit"), "America/Detroit", _("United States"));
+    addCity("Dhaka", _("Dhaka"), "Asia/Dhaka", _("Bangladesh"));
+    addCity("Djibouti", _("Djibouti"), "Africa/Djibouti", _("Djibouti"));
+    addCity("Doha", _("Doha"), "Asia/Qatar", _("Qatar"));
+    addCity("Dominica", _("Dominica"), "America/Dominica", _("Dominica"));
+    addCity("Dubai", _("Dubai"), "Asia/Dubai", _("United Arab Emirates"));
+    addCity("Dublin", _("Dublin"), "Europe/Dublin", _("Ireland"));
+
+    addCity("Easter Island", _("Easter Island"), "Pacific/Easter", _("Chile"));
+    addCity("Edmonton", _("Edmonton"), "America/Edmonton", _("Canada"));
+    addCity("El Salvador", _("El Salvador"), "America/El_Salvador", _("El Salvador"));
+
+    addCity("Fiji", _("Fiji"), "Pacific/Fiji", _("Fiji"));
+    addCity("Fortaleza", _("Fortaleza"), "America/Fortaleza", _("Brazil"));
+    addCity("Frankfurt", _("Frankfurt"), "Europe/Berlin", _("Germany"));
+    addCity("Freetown", _("Freetown"), "Africa/Freetown", _("Sierra Leone"));
+
+    addCity("Gaborone", _("Gaborone"), "Africa/Gaborone", _("Botswana"));
+    addCity("Gaza", _("Gaza"), "Asia/Gaza", _("Palestine"));
+    addCity("Gibraltar", _("Gibraltar"), "Europe/Gibraltar", _("Gibraltar"));
+    addCity("Grand Turk", _("Grand Turk"), "America/Grand_Turk", _("Turks and Caicos Islands"));
+    addCity("Grenada", _("Grenada"), "America/Grenada", _("Grenada"));
+    addCity("Guam", _("Guam"), "Pacific/Guam", _("Guam"));
+    addCity("Guangzhou", _("Guangzhou"), "Asia/Shanghai", _("China"));
+    addCity("Guatemala", _("Guatemala"), "America/Guatemala", _("Guatemala"));
+    addCity("Gurgaon", _("Gurgaon"), "Asia/Kolkata", _("India"));
+    addCity("Guyana", _("Guyana"), "America/Guyana", _("Guyana"));
+
+    addCity("Haifa", _("Haifa"), "Asia/Jerusalem", _("Israel"));
+    addCity("Halifax", _("Halifax"), "America/Halifax", _("Canada"));
+    addCity("Hamburg", _("Hamburg"), "Europe/Berlin", _("Germany"));
+    addCity("Hanoi", _("Hanoi"), "Asia/Ho_Chi_Minh", _("Vietnam"));
+    addCity("Harare", _("Harare"), "Africa/Harare", _("Zimbabwe"));
+    addCity("Havana", _("Havana"), "America/Havana", _("Cuba"));
+    addCity("Hebron", _("Hebron"), "Asia/Hebron", _("Palestine"));
+    addCity("Helsinki", _("Helsinki"), "Europe/Helsinki", _("Finland"));
+    addCity("Ho Chi Minh City", _("Ho Chi Minh City"), "Asia/Ho_Chi_Minh", _("Vietnam"));
+    addCity("Hong Kong", _("Hong Kong"), "Asia/Hong_Kong", _("Hong Kong"));
+    addCity("Honolulu", _("Honolulu"), "Pacific/Honolulu", _("United States"));
+    addCity("Houston", _("Houston"), "America/Chicago", _("United States"));
+    addCity("Hyderabad", _("Hyderabad"), "Asia/Kolkata", _("India"));
+
+    addCity("Indianapolis", _("Indianapolis"), "America/Indiana/Indianapolis", _("United States"));
+    addCity("Islamabad", _("Islamabad"), "Asia/Karachi", _("Pakistan"));
+    addCity("Isle of Man", _("Isle of Man"), "Europe/Isle_of_Man", _("Isle of Man"));
+    addCity("Istanbul", _("Istanbul"), "Europe/Istanbul", _("Turkey"));
+
+    addCity("Jacksonville", _("Jacksonville"), "America/New_York", _("United States"));
+    addCity("Jakarta", _("Jakarta"), "Asia/Jakarta", _("Indonesia"));
+    addCity("Jerusalem", _("Jerusalem"), "Asia/Jerusalem", _("Israel"));
+    addCity("Johannesburg", _("Johannesburg"), "Africa/Johannesburg", _("South Africa"));
+
+    addCity("Kabul", _("Kabul"), "Asia/Kabul", _("Afghanistan"));
+    addCity("Kampala", _("Kampala"), "Africa/Kampala", _("Uganda"));
+    addCity("Karachi", _("Karachi"), "Asia/Karachi", _("Pakistan"));
+    addCity("Khartoum", _("Khartoum"), "Africa/Khartoum", _("Sudan"));
+    addCity("Kiev", _("Kiev"), "Europe/Kiev", _("Ukraine"));
+    addCity("Kigali", _("Kigali"), "Africa/Kigali", _("Rwanda"));
+    addCity("Kingston", _("Kingston"), "America/Toronto", _("Canada"));
+    addCity("Kinshasa", _("Kinshasa"), "Africa/Kinshasa", _("Democratic Republic of the Congo"));
+    addCity("Kiritimati", _("Kiritimati"), "Pacific/Kiritimati", _("Kiribati"));
+    addCity("Kirkland", _("Kirkland"), "America/Montreal", _("Canada"));
+    addCity("Knox", _("Knox"), "Australia/Melbourne", _("Australia"));
+    addCity("Knoxville", _("Knoxville"), "America/New_York", _("United States"));
+    addCity("Kraków", _("Kraków"), "Europe/Warsaw", _("Poland"));
+    addCity("Kuala Lumpur", _("Kuala Lumpur"), "Asia/Kuala_Lumpur", _("Malaysia"));
+    addCity("Kuwait Cit", _("Kuwait City"), "Asia/Kuwait", _("Kuwait"));
+    addCity("Kyiv", _("Kyiv"), "Europe/Kiev", _("Ukraine"));
+
+    addCity("Lagos", _("Lagos"), "Africa/Lagos", _("Nigeria"));
+    addCity("Lahore", _("Lahore"), "Asia/Karachi", _("Pakistan"));
+    addCity("Las Vegas", _("Las Vegas"), "America/Los_Angeles", _("United States"));
+    addCity("Lima", _("Lima"), "America/Lima", _("Peru"));
+    addCity("Lisbon", _("Lisbon"), "Europe/Lisbon", _("Portugal"));
+    addCity("London", _("London"), "Europe/London", _("United Kingdom"));
+    addCity("Longyearbyen", _("Longyearbyen"), "Arctic/Longyearbyen", _("Svalbard and Jan Mayen"));
+    addCity("Los Angeles", _("Los Angeles"), "America/Los_Angeles", _("United States"));
+    addCity("Louisville", _("Louisville"), "America/Kentucky/Louisville", _("United States"));
+    addCity("Luxembourg", _("Luxembourg"), "Europe/Luxembourg", _("Luxembourg"));
+
+    addCity("Macau", _("Macau"), "Asia/Macau", _("Macao"));
+    addCity("Madison", _("Madison"), "America/Chicago", _("United States"));
+    addCity("Madrid", _("Madrid"), "Europe/Madrid", _("Spain"));
+    addCity("Maldives", _("Maldives"), "Indian/Maldives", _("Maldives"));
+    addCity("Malta", _("Malta"), "Europe/Malta", _("Malta"));
+    addCity("Managua", _("Managua"), "America/Managua", _("Nicaragua"));
+    addCity("Manchester", _("Manchester"), "Europe/London", _("United Kingdom"));
+    addCity("Manila", _("Manila"), "Asia/Manila", _("Philippines"));
+    addCity("Marengo", _("Marengo"), "America/Indiana/Marengo", _("United States"));
+    addCity("Martinique", _("Martinique"), "America/Martinique", _("Canada"));
+    addCity("Maseru", _("Maseru"), "Africa/Maseru", _("Lesotho"));
+    addCity("Melbourne", _("Melbourne"), "Australia/Melbourne", _("Australia"));
+    addCity("Memphis", _("Memphis"), "America/Chicago", _("United States"));
+    addCity("Mendoza", _("Mendoza"), "America/Argentina/Mendoza", _("Argentina"));
+    addCity("Metlakatla", _("Metlakatla"), "America/Metlakatla", _("United States"));
+    addCity("Mexico City", _("Mexico City"), "America/Mexico_City", _("Mexico"));
+    addCity("Miami", _("Miami"), "America/New_York", _("United States"));
+    addCity("Milan", _("Milan"), "Europe/Rome", _("Italy"));
+    addCity("Milwaukee", _("Milwaukee"), "America/Chicago", _("United States"));
+    addCity("Minneapolis", _("Minneapolis"), "America/Chicago", _("United States"));
+    addCity("Minsk", _("Minsk"), "Europe/Minsk", _("Belarus"));
+    addCity("Mogadishu", _("Mogadishu"), "Africa/Mogadishu", _("Somalia"));
+    addCity("Monrovia", _("Monrovia"), "Africa/Monrovia", _("Liberia"));
+    addCity("Monaco", _("Monaco"), "Europe/Monaco", _("Monaco"));
+    addCity("Monterrey", _("Monterrey"), "America/Monterrey", _("Mexico"));
+    addCity("Montevideo", _("Montevideo"), "America/Montevideo", _("Uruguay"));
+    addCity("Montreal", _("Montreal"), "America/Montreal", _("Canada"));
+    addCity("Moscow", _("Moscow"), "Europe/Moscow", _("Russia"));
+    addCity("Mountain View", _("Mountain View"), "America/Los_Angeles", _("United States"));
+    addCity("Mumbai", _("Mumbai"), "Asia/Kolkata", _("India"));
+    addCity("Munich", _("Munich"), "Europe/Berlin", _("Germany"));
+    addCity("Muscat", _("Muscat"), "Asia/Muscat", _("Oman"));
+
+    addCity("Nairobi", _("Nairobi"), "Africa/Nairobi", _("Kenya"));
+    addCity("Nashville", _("Nashville"), "America/Chicago", _("United States"));
+    addCity("Nassau", _("Nassau"), "America/Nassau", _("Bahamas"));
+    addCity("New Orleans", _("New Orleans"), "America/Chicago", _("United States"));
+    addCity("New Salem", _("New Salem"), "America/North_Dakota/New_Salem", _("United States"));
+    addCity("New South Wales", _("New South Wales"), "Australia/Sydney", _("Australia"));
+    addCity("New York", _("New York"), "America/New_York", _("United States"));
+    addCity("Newfoundland", _("Newfoundland"), "America/St_Johns", _("United States"));
+    addCity("Nouméa", _("Nouméa"), "Pacific/Noumea", _("New Caledonia"));
+    addCity("Nuestra Señora de La Paz", _("Nuestra Señora de La Paz"), "America/Bogota", _("Colombia"));
+
+    addCity("Oklahoma City", _("Oklahoma City"), "America/Chicago", _("United States"));
+    addCity("Osaka", _("Osaka"), "Asia/Tokyo", _("Japan"));
+    addCity("Oslo", _("Oslo"), "Europe/Oslo", _("Norway"));
+    addCity("Ottawa", _("Ottawa"), "America/Toronto", _("Canada"));
+    addCity("Oulu", _("Oulu"), "Europe/Helsinki", _("Finland"));
+
+    addCity("Panamá", _("Panamá"), "America/Panama", _("Panama"));
+    addCity("Paramaribo", _("Paramaribo"), "America/Paramaribo", _("Suriname"));
+    addCity("Paris", _("Paris"), "Europe/Paris", _("France"));
+    addCity("Perth", _("Perth"), "Australia/Perth", _("Australia"));
+    addCity("Petersburg", _("Petersburg"), "America/Indiana/Petersburg", _("Russia"));
+    addCity("Philadelphia", _("Philadelphia"), "America/New_York", _("United States"));
+    addCity("Phnom Penh", _("Phnom Penh"), "Asia/Phnom_Penh", _("Cambodia"));
+    addCity("Phoenix", _("Phoenix"), "America/Phoenix", _("United States"));
+    addCity("Pittsburgh", _("Pittsburgh"), "America/New_York", _("United States"));
+    addCity("Port of Spain", _("Port of Spain"), "America/Port_of_Spain", _("Trinidad and Tobago"));
+    addCity("Port au Prince", _("Port au Prince"), "America/Port-au-Prince", _("Haiti"));
+    addCity("Portland", _("Portland"), "America/Los_Angeles", _("United States"));
+    addCity("Prague", _("Prague"), "Europe/Prague", _("Czech"));
+    addCity("Pyongyang", _("Pyongyang"), "Asia/Pyongyang", _("North Korea"));
+
+    addCity("Queensland", _("Queensland"), "Australia/Brisbane", _("United States"));
+    addCity("Quito", _("Quito"), "America/Guayaquil", _("Ecuador"));
+
+    addCity("Rangoon", _("Rangoon"), "Asia/Rangoon", _("Myanmar"));
+    addCity("Reno", _("Reno"), "America/Los_Angeles", _("United States"));
+    addCity("Reston", _("Reston"), "America/New_York", _("United States"));
+    addCity("Reykjavík", _("Reykjavík"), "Atlantic/Reykjavik", _("Iceland"));
+    addCity("Riga", _("Riga"), "Europe/Riga", _("Latvia"));
+    addCity("Rio de Janeiro", _("Rio de Janeiro"), "America/Sao_Paulo", _("Brazil"));
+    addCity("Riyadh", _("Riyadh"), "Asia/Riyadh", _("Saudi Arabia"));
+    addCity("Rome", _("Rome"), "Europe/Rome", _("Italy"));
+
+    addCity("Sacramento", _("Sacramento"), "America/Los_Angeles", _("United States"));
+    addCity("Salt Lake City", _("Salt Lake City"), "America/Denver", _("United States"));
+    addCity("Samoa", _("Samoa"), "Pacific/Apia", _("Samoa"));
+    addCity("San Antonio", _("San Antonio"), "America/Chicago", _("United States"));
+    addCity("San Diego", _("San Diego"), "America/Los_Angeles", _("United States"));
+    addCity("San Francisco", _("San Francisco"), "America/Costa_Rica", _("United States"));
+    addCity("San José", _("San José"), "America/Costa_Rica", _("Costa Rica"));
+    addCity("San Juan", _("San Juan"), "America/Puerto_Rico", _("Puerto Rico"));
+    addCity("San Marino", _("San Marino"), "Europe/San_Marino", _("San Marino"));
+    addCity("San Salvador", _("San Salvador"), "America/El_Salvador", _("El Salvador"));
+    addCity("Sanaa", _("Sanaa"), "Asia/Aden", _("Yemen"));
+    addCity("Santiago", _("Santiago"), "America/Santiago", _("Chile"));
+    addCity("Santo Domingo", _("Santo Domingo"), "America/Santo_Domingo", _("Dominican Republic"));
+    addCity("São Paulo", _("São Paulo"), "America/Sao_Paulo", _("Brazil"));
+    addCity("São Tomé", _("São Tomé"), "Africa/Sao_Tome", _("São Tomé and Príncipe"));
+    addCity("Sarajevo", _("Sarajevo"), "Europe/Sarajevo", _("Bosnia and Herzegovina"));
+    addCity("Saskatchewan", _("Saskatchewan"), "America/Regina", _("Canada"));
+    addCity("Seattle", _("Seattle"), "America/Los_Angeles", _("United States"));
+    addCity("Seoul", _("Seoul"), "Asia/Seoul", _("South Korea"));
+    addCity("Shanghai", _("Shanghai"), "Asia/Shanghai", _("China"));
+    addCity("Singapore", _("Singapore"), "Asia/Singapore", _("Singapore"));
+    addCity("Simferopol", _("Simferopol"), "Europe/Simferopol", _("Ukraine"));
+    addCity("Skopje", _("Skopje"), "Europe/Skopje", _("Macedonia"));
+    addCity("Sofia", _("Sofia"), "Europe/Sofia", _("Bulgaria"));
+    addCity("St.Johns", _("St.Johns"), "America/St_Johns", _("Canada"));
+    addCity("St.Kitts", _("St.Kitts"), "America/St_Kitts", _("Saint Kitts and Nevis"));
+    addCity("St.Louis", _("St.Louis"), "America/Chicago", _("United States"));
+    addCity("Stanley", _("Stanley"), "Atlantic/Stanley", _("Falkland Islands"));
+    addCity("Stockholm", _("Stockholm"), "Europe/Stockholm", _("Sweden"));
+    addCity("Suva", _("Suva"), "Pacific/Fiji", _("Fiji"));
+    addCity("Sydney", _("Sydney"), "Australia/Sydney", _("Australia"));
+
+    addCity("Taipei", _("Taipei"), "Asia/Taipei", _("Taiwan"));
+    addCity("Tallinn", _("Tallinn"), "Europe/Tallinn", _("Estonia"));
+    addCity("Tehran", _("Tehran"), "Asia/Tehran", _("Iran"));
+    addCity("Tokyo", _("Tokyo"), "Asia/Tokyo", _("Japan"));
+    addCity("Toronto", _("Toronto"), "America/Toronto", _("Canada"));
+    addCity("Tripoli", _("Tripoli"), "Africa/Tripoli", _("Libya"));
+    addCity("Tunis", _("Tunis"), "Africa/Tunis", _("Tunisia"));
+
+    addCity("Ulan Bator", _("Ulan Bator"), "Asia/Ulan_Bator", _("Mongolia"));
+    addCity("UTC", _("UTC"), "UTC", _("UTC"));
+
+    addCity("Vancouver", _("Vancouver"), "America/Vancouver", _("Canada"));
+    addCity("Vatican City", _("Vatican City"), "Europe/Vatican", _("Vatican City"));
+    addCity("Vevay", _("Vevay"), "America/Indiana/Vevay", _("United States"));
+    addCity("Vienna", _("Vienna"), "Europe/Vienna", _("Austria"));
+    addCity("Vilnius", _("Vilnius"), "Europe/Vilnius", _("Lithuania"));
+    addCity("Vincennes", _("Vincennes"), "America/Indiana/Vincennes", _("France"));
+
+    addCity("Warsaw", _("Warsaw"), "Europe/Warsaw", _("Poland"));
+    addCity("Washington D.C.", _("Washington D.C."), "America/New_York", _("United States"));
+    addCity("Winamac", _("Winamac"), "America/Indiana/Winamac", _("United States"));
+    addCity("Winnipeg", _("Winnipeg"), "America/Winnipeg", _("Canada"));
+    addCity("Wrocław", _("Wrocław"), "Europe/Warsaw", _("Poland"));
+
+    addCity("Zagreb", _("Zagreb"), "Europe/Zagreb", _("Croatia"));
+    addCity("Zürich", _("Zürich"), "Europe/Zurich", _("Switzerland"));
 
     // Let QML know model is reusable again
     endResetModel();
 }
+
+TimeZoneModel::CityData StaticTimeZoneModel::getTranslatedCityData(const QString &cityId)
+{
+   for (QList<TimeZoneModel::CityData>::const_iterator tz_iter = m_citiesData.begin(); tz_iter != m_citiesData.end(); ++tz_iter)
+   {
+       if (QString::compare(tz_iter->cityId, cityId) == 0)
+       {
+           return *tz_iter;
+       }       
+   }
+
+   TimeZoneModel::CityData emptyCityData;
+   emptyCityData.cityId = "";
+   emptyCityData.cityName = "";
+   emptyCityData.countryName = "";
+   return emptyCityData;
+}
+
 
=== modified file 'backend/modules/Timezone/statictimezonemodel.h'
--- backend/modules/Timezone/statictimezonemodel.h	2015-02-27 12:14:50 +0000
+++ backend/modules/Timezone/statictimezonemodel.h	2015-08-16 20:56:40 +0000
@@ -31,12 +31,15 @@
 public:
     StaticTimeZoneModel(QObject *parent = 0);
 
+    // Function to get translated translated city and country name
+    TimeZoneModel::CityData getTranslatedCityData(const QString &cityId);
+
 private:
     // Function to define the default city list
     void loadDefaultCityList();
 
     // Function to append city list item into m_timeZones object
-    void addCity(const QString &city, const QString &timezone, const QString &country);
+    void addCity(const QString &cityId, const QString &cityName, const QString &timezone, const QString &countryName);
 };
 
 #endif // STATICTIMEZONEMODEL_H
 
=== modified file 'backend/modules/Timezone/timezonemodel.cpp'
--- backend/modules/Timezone/timezonemodel.cpp	2014-09-02 14:31:44 +0000
+++ backend/modules/Timezone/timezonemodel.cpp	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -46,7 +46,7 @@
     */
     Q_UNUSED(parent)
 
-    return m_timeZones.count();
+    return m_citiesData.count();
 }
 
 /*
@@ -68,16 +68,18 @@
     */
 
     switch (role) {
+    case RoleCityId:
+        return m_citiesData.at(row).cityId;
     case RoleCityName:
-        return m_timeZones.at(row).cityName;
+        return m_citiesData.at(row).cityName;
     case RoleCountryName:
-        return m_timeZones.at(row).country;
+        return m_citiesData.at(row).countryName;
     case RoleTimeZoneId:
-        return m_timeZones.at(row).timeZone.id();
+        return m_citiesData.at(row).timeZone.id();
     }
 
     QDateTime currentDateTime = QDateTime::currentDateTime();
-    QDateTime worldCityTime(currentDateTime.toTimeZone(m_timeZones.at(row).timeZone));
+    QDateTime worldCityTime(currentDateTime.toTimeZone(m_citiesData.at(row).timeZone));
 
     switch (role) {
     case RoleTimeString:
@@ -104,8 +106,9 @@
 QHash<int, QByteArray> TimeZoneModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
-    roles.insert(RoleCityName, "city");
-    roles.insert(RoleCountryName, "country");
+    roles.insert(RoleCityId, "cityId");
+    roles.insert(RoleCityName, "cityName");
+    roles.insert(RoleCountryName, "countryName");
     roles.insert(RoleTimeZoneId, "timezoneID");
     roles.insert(RoleTimeString, "localTime");
     roles.insert(RoleTimeTo, "timeTo");
@@ -119,11 +122,13 @@
 
 void TimeZoneModel::setUpdateInterval(int updateInterval)
 {
-    if (m_updateTimer.interval() != updateInterval) {
+    if (m_updateTimer.interval() != updateInterval)
+    {
         m_updateTimer.setInterval(updateInterval);
         emit updateIntervalChanged();
 
-        if (m_updateTimer.interval() > 0) {
+        if (m_updateTimer.interval() > 0)
+        {
             m_updateTimer.start();
         }
         else {
@@ -143,7 +148,7 @@
     */
 
     QModelIndex startIndex = index(0);
-    QModelIndex endIndex = index(m_timeZones.count() - 1);
+    QModelIndex endIndex = index(m_citiesData.count() - 1);
     QVector<int> roles;
     roles << RoleTimeString << RoleTimeTo;
     emit dataChanged(startIndex, endIndex, roles);
@@ -151,7 +156,8 @@
 
 void TimeZoneModel::setStatus(TimeZoneModel::Status status)
 {
-    if(m_status == status) {
+    if(m_status == status)
+    {
         return;
     }
 
 
=== modified file 'backend/modules/Timezone/timezonemodel.h'
--- backend/modules/Timezone/timezonemodel.h	2014-09-02 14:31:44 +0000
+++ backend/modules/Timezone/timezonemodel.h	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -49,6 +49,7 @@
 
 public:
     enum Roles {
+        RoleCityId,
         RoleCityName,
         RoleCountryName,
         RoleTimeZoneId,
@@ -113,14 +114,15 @@
 
 protected:
     // Create a simple container class to hold our information
-    struct TimeZone{
+    struct CityData {
+        QString cityId;
         QString cityName;
-        QString country;
+        QString countryName;
         QTimeZone timeZone;
     };
 
     // Keep a list of TimeZone objects, holding all our timeZones.
-    QList<TimeZone> m_timeZones;
+    QList<CityData> m_citiesData;
 
     // Private property to keep track of the status of the timezonemodel
     Status m_status;
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-08-14 13:39:38 +0000
+++ debian/changelog	2015-08-16 20:56:40 +0000
@@ -2,9 +2,12 @@
 
   [Bartosz Kosiorek]
   * Disable automatic translation and update README.translations
+  * Silent warning which is displayed during clock run
   * Change "Silence after" to "Alarm stops afer" according to UX design
   * Fix default alarm time issue (LP: #1484926)
-  
+  * Translate city and country names after language switch (LP: #1477492)
+  * Fix issue when unable to add city/country with apostrophes (LP: #1473074)  
+
   [Nekhelesh Ramananthan]
   * Increase the height of times in the alarm screen (LP: #1365428)
   * Fixed the confusing behavior of the confirmation button (LP: #1408015)
@@ -13,9 +16,9 @@
   * Changed default alarm sound (LP: #1354370)
 
   [Victor Thompson]
-  * Show all README files in QtCreator
+  * Show all README files in QtCreator 
 
- -- Bartosz Kosiorek <[e-mail]>  Fri, 24 Jul 2015 18:05:38 +0200
+ -- Bartosz Kosiorek <[e-mail]>  Thu, 13 Aug 2015 00:03:45 +0200
 
 ubuntu-clock-app (3.4) vivid; urgency=medium
 
 
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-08-11 20:39:12 +0000
+++ po/com.ubuntu.clock.pot	2015-08-16 20:56:40 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 22:38+0200\n"
+"POT-Creation-Date: 2015-08-16 22:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,12 +18,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
+#: ../app/alarm/AlarmLabel.qml:33 ../app/alarm/AlarmLabel.qml:71
 #: ../app/alarm/EditAlarmPage.qml:290
 msgid "Label"
 msgstr ""
 
-#: ../app/alarm/AlarmList.qml:49 ../app/alarm/AlarmPage.qml:99
+#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:99
 #: ../app/worldclock/UserWorldCityList.qml:101
 msgid "Delete"
 msgstr ""
@@ -46,7 +46,7 @@
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:37
+#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:59
 msgid "Select All"
 msgstr ""
 
@@ -58,7 +58,7 @@
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:33 ../app/alarm/EditAlarmPage.qml:280
+#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:280
 msgid "Repeat"
 msgstr ""
 
@@ -233,1745 +233,1745 @@
 msgid "Please check your network connection and try again"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:47
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
 msgid "Abidjan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:47
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
 msgid "Ivory Coast"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
 msgid "Accra"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
 msgid "Ghana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
 msgid "Addis Ababa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
 msgid "Ethiopia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
 msgid "Adelaide"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:106
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:320
 msgid "Australia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
 msgid "Albuquerque"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:86
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:58
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:69
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:87
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:91
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:116
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:132
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:170
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:171
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:174
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:179
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:209
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:210
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:231
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:249
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:252
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:256
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:270
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:277
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:282
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:289
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:290
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:292
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:293
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:294
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:334
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
 #: ../backend/modules/Timezone/statictimezonemodel.cpp:341
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
 msgid "United States"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
 msgid "Algiers"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
 msgid "Algeria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
 msgid "Almaty"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
 msgid "Kazakhstan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
 msgid "Amman"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
 msgid "Jordan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
 msgid "Amsterdam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
 msgid "Netherlands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
 msgid "Anadyr"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
 msgid "Russia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:58
 msgid "Anchorage"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:58
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:59
 msgid "Andorra"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:59
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
 msgid "Ankara"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:59
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:177
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:178
 msgid "Turkey"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
 msgid "Ann Arbor"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
 msgid "Antananarivo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
 msgid "Madagascar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
 msgid "Aqtau"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:64
 msgid "Aruba"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:64
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
 msgid "Asunción"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:64
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
 msgid "Paraguay"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
 msgid "Athens"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
 msgid "Greece"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
 msgid "Atlanta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
 msgid "Auckland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
 msgid "New Zealand"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:69
 msgid "Austin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:70
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
 msgid "Baghdad"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:70
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
 msgid "Iraq"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:72
 msgid "Bahrain"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:72
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
 msgid "Baku"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:72
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
 msgid "Azerbaijan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
 msgid "Baltimore"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
 msgid "Bangalore"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:157
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:158
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:173
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
 msgid "India"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
 msgid "Bangkok"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
 msgid "Thailand"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:77
 msgid "Barbados"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:77
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
 msgid "Barcelona"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:77
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
 msgid "Spain"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
 msgid "Beijing"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:155
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
 msgid "China"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
 msgid "Beirut"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
 msgid "Lebanon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
 msgid "Belfast"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
 msgid "United Kingdom"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
 msgid "Belgrade"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
 msgid "Serbia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:83
 msgid "Belize"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:83
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
 msgid "Belo Horizonte"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:83
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:145
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
 msgid "Brazil"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
 msgid "Berlin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
 msgid "Germany"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:86
 msgid "Bermuda"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:86
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:87
 msgid "Beulah"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:87
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
 msgid "Black Rock City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
 msgid "Blantyre"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
 msgid "Malawi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
 msgid "Bogotá"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:255
 msgid "Colombia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:91
 msgid "Boston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:91
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
 msgid "Boulder"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
 msgid "Brasília"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
 msgid "Bratislava"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
 msgid "Slovakia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
 msgid "Brazzaville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
 msgid "Republic of the Congo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
 msgid "Brisbane"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
 msgid "Brussels"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
 msgid "Belgium"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
 msgid "Bucharest"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
 msgid "Romania"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
 msgid "Budapest"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
 msgid "Hungary"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:100
 msgid "Buenos Aires"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:100
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
 msgid "Argentina"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:101
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
 msgid "Cairo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:101
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
 msgid "Egypt"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
 msgid "Calcutta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
 msgid "Calgary"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:332
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:142
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:333
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
 msgid "Canada"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
 msgid "Cambridge"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:106
 msgid "Canary"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:106
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
 msgid "Canberra"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
 msgid "Cancún"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:236
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
 msgid "Mexico"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
 msgid "Cape Town"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:183
 msgid "South Africa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
 msgid "Caracas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
 msgid "Venezuela"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
 msgid "Casablanca"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
 msgid "Morocco"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
 msgid "Cayman Palms"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
 msgid "Cayman Islands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
 msgid "Chicago"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
 msgid "Chihuahua"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
 msgid "Chişinău"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
 msgid "Moldova"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:116
 msgid "Cincinnati"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:116
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
 msgid "Cleveland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
 msgid "Colombo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
 msgid "Sri Lanka"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
 msgid "Columbus"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
 msgid "Conakry"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
 msgid "Guinea"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
 msgid "Copenhagen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
 msgid "Denmark"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:122
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
 msgid "Costa Rica"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:122
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:123
 msgid "Curaçao"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:122
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:123
 msgid "Curacao"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:124
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
 msgid "Dakar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:124
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
 msgid "Senegal"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
 msgid "Dallas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
 msgid "Damascus"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
 msgid "Syria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
 msgid "Dar es Salaam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
 msgid "Tanzania"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
 msgid "Darwin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
 msgid "Dawson Creek"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
 msgid "Delhi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:132
 msgid "Denver"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:132
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
 msgid "Detroit"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
 msgid "Dhaka"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
 msgid "Bangladesh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:135
 msgid "Djibouti"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:135
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
 msgid "Doha"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:135
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
 msgid "Qatar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:137
 msgid "Dominica"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:137
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
 msgid "Dubai"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:137
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
 msgid "United Arab Emirates"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:139
 msgid "Dublin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:139
 msgid "Ireland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:140
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
 msgid "Easter Island"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:140
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
 msgid "Chile"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:142
 msgid "Edmonton"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:142
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:298
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:143
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
 msgid "El Salvador"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:144
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:145
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
 msgid "Fiji"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:145
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
 msgid "Fortaleza"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
 msgid "Frankfurt"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:148
 msgid "Freetown"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:148
 msgid "Sierra Leone"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:149
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
 msgid "Gaborone"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:149
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
 msgid "Botswana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
 msgid "Gaza"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
 msgid "Palestine"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:152
 msgid "Gibraltar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:152
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
 msgid "Grand Turk"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:152
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
 msgid "Turks and Caicos Islands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:154
 msgid "Grenada"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:154
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:155
 msgid "Guam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:155
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
 msgid "Guangzhou"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:157
 msgid "Guatemala"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:157
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:158
 msgid "Gurgaon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:158
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:159
 msgid "Guyana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:160
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
 msgid "Haifa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:160
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
 msgid "Israel"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
 msgid "Halifax"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
 msgid "Hamburg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
 msgid "Hanoi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
 msgid "Vietnam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
 msgid "Harare"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
 msgid "Zimbabwe"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
 msgid "Havana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
 msgid "Cuba"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
 msgid "Hebron"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
 msgid "Helsinki"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:261
 msgid "Finland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
 msgid "Ho Chi Minh City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:170
 msgid "Hong Kong"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:170
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:171
 msgid "Honolulu"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:171
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
 msgid "Houston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:173
 msgid "Hyderabad"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:174
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
 msgid "Indianapolis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
 msgid "Islamabad"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
 msgid "Pakistan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:177
 msgid "Isle of Man"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:177
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:178
 msgid "Istanbul"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:179
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
 msgid "Jacksonville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
 msgid "Jakarta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
 msgid "Indonesia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
 msgid "Jerusalem"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:183
 msgid "Johannesburg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:184
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
 msgid "Kabul"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:184
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
 msgid "Afghanistan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
 msgid "Kampala"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
 msgid "Uganda"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
 msgid "Karachi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
 msgid "Khartoum"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
 msgid "Sudan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
 msgid "Kiev"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:310
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:200
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
 msgid "Ukraine"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
 msgid "Kigali"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
 msgid "Rwanda"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
 msgid "Kingston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
 msgid "Kinshasa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
 msgid "Democratic Republic of the Congo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
 msgid "Kiritimati"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
 msgid "Kiribati"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
 msgid "Kirkland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
 msgid "Knox"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
 msgid "Knoxville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
 msgid "Kraków"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:339
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:344
 msgid "Poland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
 msgid "Kuala Lumpur"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
 msgid "Malaysia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
 msgid "Kuwait City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
 msgid "Kuwait"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:200
 msgid "Kyiv"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:201
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
 msgid "Lagos"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:201
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
 msgid "Nigeria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
 msgid "Lahore"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
 msgid "Las Vegas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
 msgid "Lima"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
 msgid "Peru"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
 msgid "Lisbon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
 msgid "Portugal"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
 msgid "London"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
 msgid "Longyearbyen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
 msgid "Svalbard and Jan Mayen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:209
 msgid "Los Angeles"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:209
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:210
 msgid "Louisville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:210
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:211
 msgid "Luxembourg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:212
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
 msgid "Macau"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:212
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
 msgid "Macao"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
 msgid "Madison"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
 msgid "Madrid"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:216
 msgid "Maldives"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:216
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:217
 msgid "Malta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:217
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
 msgid "Managua"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:217
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
 msgid "Nicaragua"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
 msgid "Manchester"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
 msgid "Manila"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
 msgid "Philippines"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
 msgid "Marengo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
 msgid "Martinique"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
 msgid "Maseru"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
 msgid "Lesotho"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
 msgid "Melbourne"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
 msgid "Memphis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
 msgid "Mendoza"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
 msgid "Metlakatla"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
 msgid "Mexico City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
 msgid "Miami"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
 msgid "Milan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:288
 msgid "Italy"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:231
 msgid "Milwaukee"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:231
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
 msgid "Minneapolis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
 msgid "Minsk"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
 msgid "Belarus"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
 msgid "Mogadishu"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
 msgid "Somalia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
 msgid "Monrovia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
 msgid "Liberia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:236
 msgid "Monaco"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:236
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
 msgid "Monterrey"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
 msgid "Montevideo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
 msgid "Uruguay"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
 msgid "Montreal"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
 msgid "Moscow"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
 msgid "Mountain View"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
 msgid "Mumbai"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
 msgid "Munich"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:244
 msgid "Muscat"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:244
 msgid "Oman"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:245
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
 msgid "Nairobi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:245
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
 msgid "Kenya"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
 msgid "Nashville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
 msgid "Nassau"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
 msgid "Bahamas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:249
 msgid "New Orleans"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:249
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
 msgid "New Salem"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
 msgid "New South Wales"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:252
 msgid "New York"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:252
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
 msgid "Newfoundland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
 msgid "Nouméa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
 msgid "New Caledonia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:255
 msgid "Nuestra Señora de La Paz"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:256
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
 msgid "Oklahoma City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
 msgid "Osaka"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
 msgid "Japan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
 msgid "Oslo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
 msgid "Norway"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
 msgid "Ottawa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:261
 msgid "Oulu"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:262
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
 msgid "Panamá"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:262
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
 msgid "Panama"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
 msgid "Paramaribo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
 msgid "Suriname"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
 msgid "Paris"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:338
 msgid "France"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
 msgid "Perth"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
 msgid "Petersburg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
 msgid "Philadelphia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
 msgid "Phnom Penh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
 msgid "Cambodia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:270
 msgid "Phoenix"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:270
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
 msgid "Pittsburgh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
 msgid "Port of Spain"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
 msgid "Trinidad and Tobago"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
 msgid "Port au Prince"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
 msgid "Haiti"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
 msgid "Portland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
 msgid "Prague"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
 msgid "Czech"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:276
 msgid "Pyongyang"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:276
 msgid "North Korea"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:277
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
 msgid "Queensland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:279
 msgid "Quito"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:279
 msgid "Ecuador"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:280
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
 msgid "Rangoon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:280
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
 msgid "Myanmar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:282
 msgid "Reno"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:282
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
 msgid "Reston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
 msgid "Reykjavík"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
 msgid "Iceland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
 msgid "Riga"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
 msgid "Latvia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
 msgid "Rio de Janeiro"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
 msgid "Riyadh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
 msgid "Saudi Arabia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:288
 msgid "Rome"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:289
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:290
 msgid "Sacramento"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:290
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
 msgid "Salt Lake City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:292
 msgid "Samoa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:292
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:293
 msgid "San Antonio"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:293
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:294
 msgid "San Diego"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:294
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
 msgid "San Francisco"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
 msgid "San José"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
 msgid "San Juan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
 msgid "Puerto Rico"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:298
 msgid "San Marino"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:298
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
 msgid "San Salvador"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
 msgid "Sanaa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
 msgid "Yemen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
 msgid "Santiago"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
 msgid "Santo Domingo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
 msgid "Dominican Republic"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
 msgid "São Paulo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
 msgid "São Tomé"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
 msgid "São Tomé and Príncipe"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
 msgid "Sarajevo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
 msgid "Saskatchewan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
 msgid "Seattle"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
 msgid "Seoul"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
 msgid "South Korea"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
 msgid "Shanghai"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:310
 msgid "Singapore"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:310
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
 msgid "Simferopol"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
 msgid "Skopje"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
 msgid "Macedonia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
 msgid "Sofia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
 msgid "Bulgaria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
 msgid "St.Johns"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
 msgid "St.Kitts"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
 msgid "Saint Kitts and Nevis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
 msgid "St.Louis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
 msgid "Stanley"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
 msgid "Falkland Islands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
 msgid "Stockholm"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
 msgid "Sweden"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
 msgid "Suva"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:320
 msgid "Sydney"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:321
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
 msgid "Taipei"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:321
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
 msgid "Taiwan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
 msgid "Tallinn"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
 msgid "Estonia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
 msgid "Tehran"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
 msgid "Iran"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
 msgid "Tokyo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
 msgid "Toronto"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
 msgid "Tripoli"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
 msgid "Libya"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:328
 msgid "Tunis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:328
 msgid "Tunisia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:329
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
 msgid "Ulan Bator"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:329
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
 msgid "Mongolia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:331
 msgid "UTC"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:332
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:333
 msgid "Vancouver"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:333
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:334
 msgid "Vatican City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:334
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
 msgid "Vevay"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
 msgid "Vienna"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
 msgid "Austria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
 msgid "Vilnius"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
 msgid "Lithuania"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:338
 msgid "Vincennes"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:339
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
 msgid "Warsaw"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:341
 msgid "Washington D.C."
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:341
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
 msgid "Winamac"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
 msgid "Winnipeg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:344
 msgid "Wrocław"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:345
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
 msgid "Zagreb"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:345
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
 msgid "Croatia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:347
 msgid "Zürich"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
+#: ../backend/modules/Timezone/statictimezonemodel.cpp:347
 msgid "Switzerland"
 msgstr ""
 
 
=== modified file 'tests/autopilot/ubuntu_clock_app/CMakePluginParser.py'
--- tests/autopilot/ubuntu_clock_app/CMakePluginParser.py	2015-06-18 20:43:14 +0000
+++ tests/autopilot/ubuntu_clock_app/CMakePluginParser.py	2015-08-16 20:56:40 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 
=== modified file 'tests/autopilot/ubuntu_clock_app/fixture_setup.py'
--- tests/autopilot/ubuntu_clock_app/fixture_setup.py	2014-11-27 12:27:48 +0000
+++ tests/autopilot/ubuntu_clock_app/fixture_setup.py	2015-08-16 20:56:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Canonical Ltd
+# Copyright (C) 2014-2015 Canonical Ltd
 #
 # This file is part of Ubuntu Clock App
 #
 
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2015-06-18 22:50:14 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2015-08-16 20:56:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Canonical Ltd
+# Copyright (C) 2014-2015 Canonical Ltd
 #
 # This file is part of Ubuntu Clock App
 #
 
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2015-06-17 21:03:43 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2015-08-16 20:56:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Canonical Ltd
+# Copyright (C) 2014-2015 Canonical Ltd
 #
 # This file is part of Ubuntu Clock App
 #
 
=== modified file 'tests/unit/ClockTestCase.qml'
--- tests/unit/ClockTestCase.qml	2015-05-27 16:03:23 +0000
+++ tests/unit/ClockTestCase.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
 
=== modified file 'tests/unit/MockClockApp.qml'
--- tests/unit/MockClockApp.qml	2015-06-04 21:46:37 +0000
+++ tests/unit/MockClockApp.qml	2015-08-16 20:56:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *