Merge lp:~nik90/ubuntu-clock-app/replace-alarmsound-checkbox into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

- Replaces alarm sound page checkboxes with tick icons instead to match system-settings app
- Added section headers to separate custom and default alarm sounds

- Replaces alarm sound page checkboxes with tick icons instead to match system-settings app
- Added section headers to separate custom and default alarm sounds

The use of tick-marks allowed me to move the QML FolderListModel from the EditAlarmPage.qml to AlarmSound.page. This means we shave of the loading times of the EditAlarmPage.qml a bit.

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

PASSED: Continuous integration, rev:369
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/817/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/162

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Comments:

1. Please update the pot file for the new strings.
2. Could we indent the alarm sound delegate text? This might help to make the section headings more obvious? This is just an opinion, however.
3. As part of this MP could you make it so the when the user selects the original alarm sound in the AlarmSound page that the saveAction is still enabled? It's weird if you play a few and get back to the original and you can't save it. IMO it should always be enabled.
4. I wonder if it'd be useful to put a small play/pause toggle next to the tick box. This would make it more apparent that tapping the item again will stop the alarm playback.

Only the first issue needs to be fixed.

review: Needs Fixing

[Victor Thompson (vthompson)]

Additional comment:

Consider changing "Default sounds" and "Custom sounds" to "Default alarms" and "Custom alarms". Or maybe "Custom alarm sounds", etc? My prefered Android alarm clock uses "alarm sound" as the term.

[Victor Thompson (vthompson)]

If you do change the headings per that last comment--you may also want to change "Add custom sound" and "Add sound from" to match.

Also, maybe "Custom Alarm Sounds" should be "Custom alarm sounds" (note capitalization).

[Nekhelesh Ramananthan (nik90)]

> Comments:
>
> 1. Please update the pot file for the new strings.

Will do once we agree on the wording of the headers to be used.

> 2. Could we indent the alarm sound delegate text? This might help to make the
> section headings more obvious? This is just an opinion, however.

I agree that the section headings need to be more obvious and I am a bit conflicted on how to proceed. If I indent the alarm sound delegate text, it breaks consistency with section headers shown by the address-book-app and the world city page in the clock app. Right now, the page looks very busy with so many listitem dividers. I will try out a couple different variations and see which one maintains consistency, clean loook etc.

> 3. As part of this MP could you make it so the when the user selects the
> original alarm sound in the AlarmSound page that the saveAction is still
> enabled? It's weird if you play a few and get back to the original and you
> can't save it. IMO it should always be enabled.

Hmm I can see how it gets annoying after you makes changes and then revert back to the original sound. At the moment, the save button is enabled *only* when you change the value to something new. We follow this pattern everywhere now. I suppose I can change that to enabling the save button if *any* change is done regardless of whether that changes defaults to the old/new value. I will have to do this in 3 different places and also fix the unit tests. A separate MP is a better idea.

> 4. I wonder if it'd be useful to put a small play/pause toggle next to the
> tick box. This would make it more apparent that tapping the item again will
> stop the alarm playback.
>

Hmm good idea. I will add this.

[Nekhelesh Ramananthan (nik90)]

As for the naming, the page title where we show "add sound from" can accommodate only up to 3 strings beyond which it ellipses due to lack of space (especially when translated).

I like to use "Default alarm sounds" and "Custom alarm sounds".

So the button would also need to be changed to "Add custom alarm sound". While the page title stays "add sound from" due to space constraints.

Does this sound good?

[Bartosz Kosiorek (gang65)]

- In my opinion "Add custom sound" button should be on inside "Custom Sounds" list, as it is belongs it it.
- In my opinion "Custom Sounds" and "Default Sounds" should be always visible
- After that "Add custom sound" could be renamed to just "Add sound" as this button is already in "Custom Sounds"

Use cases:
- When there is no custom sounds, the header "Custom Sounds" will be displayed, and "Add sound" will be there
- When there is custom sounds, the header "Custom Sounds" will be displayed, and "Add sound" will be on top of the list. Next it will be custom alarms sounds.

If you want I could create some mockup for you.

review: Needs Information

[Bartosz Kosiorek (gang65)]

One more comment:
- After adding new Custom Sound it will be great to show simple add animation, as it is already done for "Stopwatch -> Lap". It will visualize what was changed in the list.

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

@Victor Where we should use capital letters an where not: I mean "Custom Sounds" vs "Custom sounds" ?

[Bartosz Kosiorek (gang65)]

Some small coding style remarks.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

Okay, I fixed almost all of the feedback/issues pointed out except for the following,

> 1. - After adding new Custom Sound it will be great to show simple add animation, as it is already done for "Stopwatch -> Lap". It will visualize what was changed in the list.

This is not easy to do since we use Repeater+Column which doesn't provide us with onDisplaced signal to animate the addition/deletion of sounds.

> 2. Could we indent the alarm sound delegate text? This might help to make the
> section headings more obvious? This is just an opinion, however.

Indentation will break the consistency. So I would rather keep it this way by making the section headers text semibold.

> 3. As part of this MP could you make it so the when the user selects the
> original alarm sound in the AlarmSound page that the saveAction is still
> enabled? It's weird if you play a few and get back to the original and you
> can't save it. IMO it should always be enabled.

As mentioned earlier, this deserves its own MP since it affects 3 other files. Let's do it in one go.

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

PASSED: Continuous integration, rev:372
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/818/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/163

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

NOTE: Please do not merge this MP before we push out the clock-app 3.5 store update since this MP will update the pot file and change strings that I won't be able to bisect from the release. QA tested and approved rev 361. I will merge upcoming spanish and chinese translation which requires the .pot file not be updated.

review: Needs Fixing

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

FAILED: Continuous integration, rev:373
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/819/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/164/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:374
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/821/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/166

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

It is working perfectly for me.

Everything is fine according to checklist.
Thanks.

review: Approve

[Nekhelesh Ramananthan (nik90)]

MP ready to be merged now that v3.5 has been released.

review: Abstain

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

PASSED: Continuous integration, rev:377
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/826/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/171

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2015-08-26 23:35:50 +0000
+++ app/alarm/AlarmSound.qml	2015-09-03 21:11:26 +0000
@@ -21,6 +21,8 @@
 import QtMultimedia 5.0
 import Ubuntu.Content 1.1
 import Ubuntu.Components 1.2
+import QtQuick.Layouts 1.1
+import Qt.labs.folderlistmodel 2.1
 
 Page {
     id: _alarmSoundPage
@@ -39,12 +41,6 @@
     // Property to store the alarm object
     property var alarm
 
-    // Property to set the alarm sound model in the edit alarm page
-    property var defaultSoundModel
-
-    // Property to set the custom alarm sound model in the edit alarm page
-    property var customSoundModel
-
     /*
      Properties to store the previously set alarm sound values to detect
      if the user changed the alarm sound or not
@@ -83,6 +79,19 @@
         }
     }
 
+    FolderListModel {
+        id: defaultSoundModel
+        showDirs: false
+        nameFilters: [ "*.ogg", "*.mp3" ]
+        folder: "/usr/share/sounds/ubuntu/ringtones"
+    }
+
+    FolderListModel {
+        id: customSoundModel
+        showDirs: false
+        folder: alarmSoundHelper.customAlarmSoundDirectory
+    }
+
     ContentTransferHint {
         anchors.fill: parent
         activeTransfer: _alarmSoundPage.activeTransfer
@@ -117,9 +126,9 @@
         for (var i=0; i<customSoundModel.count; i++) {
             if (soundUrl === customSoundModel.get(i, "fileURL")) {
                 alarmSound.subText = customSoundModel.get(i, "fileBaseName")
-                alarm.sound = soundUrl
-                previewAlarmSound.source = soundUrl
+                alarm.sound = soundUrl                
                 _customAlarmSounds.itemAt(i).isChecked = true
+                previewAlarmSound.controlPlayback(soundUrl)
                 return
             }
         }
@@ -162,7 +171,8 @@
         anchors.fill: parent
         contentHeight: defaultSoundModel.count * units.gu(7) +
                        customSoundModel.count * units.gu(7) +
-                       customSoundListItem.height
+                       customSoundListItem.height +
+                       2 * customSoundsHeader.implicitHeight + units.gu(4)
 
         Column {
             id: _alarmSoundColumn
@@ -170,11 +180,25 @@
             anchors.fill: parent
 
             ListItem {
+                height: customSoundsHeader.implicitHeight + units.gu(2)
+                Label {
+                    id: customSoundsHeader
+                    text: i18n.tr("Custom alarm sounds")
+                    font.weight: Font.DemiBold
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
+                }
+            }
+
+            ListItem {
                 id: customSoundListItem
                 height: units.gu(7)
                 Button {
                     id: customSoundButton
-                    text: i18n.tr("Add custom sound")
+                    text: i18n.tr("Add sound")
                     width: parent.width / 1.1
                     anchors.centerIn: parent
                     onClicked: {
@@ -191,10 +215,13 @@
 
                 ListItem {
                     id: _customAlarmSoundDelegate
+                    objectName: "customAlarmSoundDelegate" + index
 
-                    property alias isChecked: _customSoundStatus.checked
+                    property bool isChecked: alarmSound.subText === _customSoundName.text ? true
+                                                                                          : false
 
                     height: units.gu(7)
+                    color: isChecked ? Theme.palette.selected.background : "Transparent"
 
                     leadingActions: ListItemActions {
                         actions: [
@@ -219,9 +246,9 @@
                                             for (var i=0; i<defaultSoundModel.count; i++) {
                                                 if (defaultSoundModel.get(i, "fileBaseName") === alarmSound.subText) {
                                                     alarm.sound = defaultSoundModel.get(i, "fileURL")
-                                                    oldAlarmSoundUrl = alarm.sound
-                                                    previewAlarmSound.source = defaultSoundModel.get(i, "fileURL")
+                                                    oldAlarmSoundUrl = alarm.sound                                                    
                                                     _alarmSounds.itemAt(i).isChecked = true
+                                                    previewAlarmSound.controlPlayback(defaultSoundModel.get(i, "fileURL"))
                                                 }
                                             }
                                         }
@@ -229,7 +256,7 @@
                                         else {
                                             alarmSound.subText = oldAlarmSoundName
                                             alarm.sound = oldAlarmSoundUrl
-                                            previewAlarmSound.source = alarm.sound
+                                            previewAlarmSound.controlPlayback(alarm.sound)
 
                                             for (var j=0; j<defaultSoundModel.count; j++) {
                                                 if (defaultSoundModel.get(j, "fileBaseName") === alarmSound.subText) {
@@ -251,70 +278,84 @@
                         ]
                     }
 
-                    Label {
-                        id: _customSoundName
-                        objectName: "customSoundName" + index
+                    RowLayout {
+                        spacing: units.gu(2)
 
                         anchors {
-                            left: parent.left
+                            fill: parent
                             leftMargin: units.gu(2)
-                            right: _customSoundStatus.left
                             rightMargin: units.gu(2)
-                            verticalCenter: parent.verticalCenter
-                        }
-
-                        elide: Text.ElideRight
-                        color: UbuntuColors.midAubergine
-                        fontSize: "medium"
-                        text: fileBaseName
+                        }
+
+                        Label {
+                            id: _customSoundName
+                            objectName: "customSoundName" + index
+
+                            anchors.verticalCenter: parent.verticalCenter
+                            Layout.fillWidth: true
+
+                            elide: Text.ElideRight
+                            color: UbuntuColors.midAubergine
+                            fontSize: "medium"
+                            text: fileBaseName
+                        }
+
+                        Icon {
+                            width: units.gu(2)
+                            height: width
+                            name: "media-playback-pause"
+                            visible: _customAlarmSoundDelegate.isChecked &&
+                                     previewAlarmSound.playbackState === Audio.PlayingState
+                        }
+
+                        Icon {
+                            id: tickIcon
+                            width: units.gu(2)
+                            height: width
+                            name: "tick"
+                            visible: _customAlarmSoundDelegate.isChecked
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
                     }
 
-                    CheckBox {
-                        id: _customSoundStatus
-                        objectName: "customSoundStatus" + index
-
-                        anchors {
-                            right: parent.right
-                            rightMargin: units.gu(2)
-                            verticalCenter: parent.verticalCenter
-                        }
-
-                        checked: alarmSound.subText === _customSoundName.text ? true
-                                                                              : false
-                        onCheckedChanged: {
-                            if (checked) {
-                                previewAlarmSound.controlPlayback(fileURL)
-                                alarmSound.subText = _customSoundName.text
-                                alarm.sound = fileURL
-
-                                // Ensures only one alarm sound is selected
-                                for(var i=0; i<customSoundModel.count; i++) {
-                                    if(_customAlarmSounds.itemAt(i).isChecked &&
-                                            i !== index) {
-                                        _customAlarmSounds.itemAt(i).isChecked = false
-                                    }
-                                }
-
-                                // Ensures only one alarm customSoundModelsound is selected
-                                for(i=0; i<defaultSoundModel.count; i++) {
-                                    _alarmSounds.itemAt(i).isChecked = false
+                    onIsCheckedChanged: {
+                        if (isChecked) {
+                            alarmSound.subText = _customSoundName.text
+                            alarm.sound = fileURL
+
+                            // Ensures only one custom alarm sound is selected
+                            for(var i=0; i<customSoundModel.count; i++) {
+                                if(_customAlarmSounds.itemAt(i).isChecked && i !== index) {
+                                    _customAlarmSounds.itemAt(i).isChecked = false
                                 }
                             }
-                        }
 
-                        onClicked: {
-                            if (!checked) {
-                                checked = true
+                            // Uncheck all the default alarm sounds
+                            for(i=0; i<defaultSoundModel.count; i++) {
+                                _alarmSounds.itemAt(i).isChecked = false
                             }
                         }
                     }
 
                     onClicked: {
-                        if (!_customSoundStatus.checked) {
-                            _customSoundStatus.checked = true
-                        } else {
-                            previewAlarmSound.controlPlayback(fileURL)
+                        if (!_customAlarmSoundDelegate.isChecked) {
+                            _customAlarmSoundDelegate.isChecked = true
                         }
+                        previewAlarmSound.controlPlayback(fileURL)
+                    }
+                }
+            }
+
+            ListItem {
+                height: defaultSoundsHeader.implicitHeight + units.gu(2)
+                Label {
+                    id: defaultSoundsHeader
+                    text: i18n.tr("Default alarm sounds")
+                    font.weight: Font.DemiBold
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
                     }
                 }
             }
@@ -327,72 +368,77 @@
 
                 ListItem {
                     id: _alarmSoundDelegate
+                    objectName: "alarmSoundDelegate" + index
 
-                    property alias isChecked: _soundStatus.checked
+                    property bool isChecked: alarmSound.subText === _soundName.text ? true
+                                                                                    : false
 
                     height: units.gu(7)
+                    color: isChecked ? Theme.palette.selected.background : "Transparent"
 
-                    Label {
-                        id: _soundName
-                        objectName: "soundName" + index
+                    RowLayout {
+                        spacing: units.gu(2)
 
                         anchors {
-                            left: parent.left
+                            fill: parent
                             leftMargin: units.gu(2)
-                            verticalCenter: parent.verticalCenter
-                        }
-
-                        color: UbuntuColors.midAubergine
-                        fontSize: "medium"
-                        text: fileBaseName
-                    }
-
-                    CheckBox {
-                        id: _soundStatus
-                        objectName: "soundStatus" + index
-
-                        anchors {
-                            right: parent.right
                             rightMargin: units.gu(2)
-                            verticalCenter: parent.verticalCenter
-                        }
-
-                        checked: alarmSound.subText === _soundName.text ? true
-                                                                        : false
-                        onCheckedChanged: {
-                            if (checked) {
-                                previewAlarmSound.controlPlayback(fileURL)
-                                alarmSound.subText = _soundName.text
-                                alarm.sound = fileURL
-
-                                // Ensures only one alarm sound is selected
-                                for(var i=0; i<defaultSoundModel.count; i++) {
-                                    if(_alarmSounds.itemAt(i).isChecked &&
-                                            i !== index) {
-                                        _alarmSounds.itemAt(i).isChecked = false
-                                    }
-                                }
-
-                                // Ensures only one alarm sound is selected
-                                for(i=0; i<customSoundModel.count; i++) {
-                                    _customAlarmSounds.itemAt(i).isChecked = false
+                        }
+
+                        Label {
+                            id: _soundName
+                            objectName: "soundName" + index
+
+                            anchors.verticalCenter: parent.verticalCenter
+                            Layout.fillWidth: true
+
+                            color: UbuntuColors.midAubergine
+                            fontSize: "medium"
+                            text: fileBaseName
+                        }
+
+                        Icon {
+                            width: units.gu(2)
+                            height: width
+                            name: "media-playback-pause"
+                            visible: _alarmSoundDelegate.isChecked &&
+                                     previewAlarmSound.playbackState === Audio.PlayingState
+                        }
+
+                        Icon {
+                            width: units.gu(2)
+                            height: width
+                            name: "tick"
+                            visible: _alarmSoundDelegate.isChecked
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    onIsCheckedChanged: {
+                        if (isChecked) {
+                            alarmSound.subText = _soundName.text
+                            alarm.sound = fileURL
+
+                            // Ensures only one alarm sound is selected
+                            for(var i=0; i<defaultSoundModel.count; i++) {
+                                if(_alarmSounds.itemAt(i).isChecked &&
+                                        i !== index) {
+                                    _alarmSounds.itemAt(i).isChecked = false
                                 }
                             }
-                        }
 
-                        onClicked: {
-                            if (!checked) {
-                                checked = true
+                            // Uncheck all the custom alarm sounds
+                            for(i=0; i<customSoundModel.count; i++) {
+                                _customAlarmSounds.itemAt(i).isChecked = false
                             }
                         }
                     }
 
                     onClicked: {
-                        if (!_soundStatus.checked) {
-                            _soundStatus.checked = true
-                        } else {
-                            previewAlarmSound.controlPlayback(fileURL)
+                        if (!_alarmSoundDelegate.isChecked) {
+                            _alarmSoundDelegate.isChecked = true
                         }
+                        previewAlarmSound.controlPlayback(fileURL)
                     }
                 }
             }

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2015-08-26 23:35:50 +0000
+++ app/alarm/EditAlarmPage.qml	2015-09-03 21:11:26 +0000
@@ -20,7 +20,6 @@
 import WorldClock 1.0
 import Alarm 1.0
 import Ubuntu.Components 1.2
-import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components.Pickers 1.0
 import "../components"
 
@@ -215,19 +214,6 @@
         }
     }
 
-    FolderListModel {
-        id: defaultSoundModel
-        showDirs: false
-        nameFilters: [ "*.ogg", "*.mp3" ]
-        folder: "/usr/share/sounds/ubuntu/ringtones"
-    }
-
-    FolderListModel {
-        id: customSoundModel
-        showDirs: false
-        folder: alarmSoundHelper.customAlarmSoundDirectory
-    }
-
     AlarmSound {
         id: alarmSoundHelper
     }
@@ -310,9 +296,7 @@
             text: i18n.tr("Sound")
             onClicked: pageStack.push(Qt.resolvedUrl("AlarmSound.qml"), {
                                           "alarmSound": _alarmSound,
-                                          "alarm": _alarm,
-                                          "defaultSoundModel": defaultSoundModel,
-                                          "customSoundModel": customSoundModel
+                                          "alarm": _alarm
                                       })
         }
     }

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-02 13:20:18 +0000
+++ debian/changelog	2015-09-03 21:11:26 +0000
@@ -2,6 +2,8 @@
 
   [ Nekhelesh Ramananthan ]
   * Bumped version to 3.6
+  * Replaced checkboxes in alarm sound page with tick-marks (LP: #1487717)
+  * Added sections headers to separate custom and default alarm sounds (LP: #1487735)
   * Removed ListItemWithActions upstream component and also fixed the user
     world city list count never decreasing to 0. (LP: #1368393)
 

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-08-21 16:08:25 +0000
+++ po/com.ubuntu.clock.pot	2015-09-03 21:11:26 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 18:07+0200\n"
+"POT-Creation-Date: 2015-09-03 23:10+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"
@@ -23,46 +23,46 @@
 msgstr ""
 
 #: ../app/alarm/AlarmLabel.qml:33 ../app/alarm/AlarmLabel.qml:71
-#: ../app/alarm/EditAlarmPage.qml:331
+#: ../app/alarm/EditAlarmPage.qml:283
 msgid "Label"
 msgstr ""
 
-#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:99
-#: ../app/worldclock/UserWorldCityList.qml:102
+#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:101
+#: ../app/worldclock/UserWorldCityList.qml:69
 msgid "Delete"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:25
+#: ../app/alarm/AlarmPage.qml:27
 msgid "Alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:39 ../app/alarm/AlarmPage.qml:64
+#: ../app/alarm/AlarmPage.qml:41 ../app/alarm/AlarmPage.qml:66
 #: ../app/worldclock/WorldCityList.qml:79
 msgid "Back"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:49 ../app/alarm/EditAlarmPage.qml:44
-#: ../app/alarm/EditAlarmPage.qml:199
+#: ../app/alarm/AlarmPage.qml:51 ../app/alarm/EditAlarmPage.qml:41
+#: ../app/alarm/EditAlarmPage.qml:185
 msgid "Alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:74
+#: ../app/alarm/AlarmPage.qml:76
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:59
+#: ../app/alarm/AlarmPage.qml:78 ../app/alarm/AlarmRepeat.qml:59
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:139
+#: ../app/alarm/AlarmPage.qml:141
 msgid "No saved alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:140
+#: ../app/alarm/AlarmPage.qml:142
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:321
+#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:273
 msgid "Repeat"
 msgstr ""
 
@@ -104,12 +104,20 @@
 msgid "Change time and date"
 msgstr ""
 
-#: ../app/alarm/AlarmSound.qml:29 ../app/alarm/EditAlarmPage.qml:344
+#: ../app/alarm/AlarmSound.qml:31 ../app/alarm/EditAlarmPage.qml:296
 msgid "Sound"
 msgstr ""
 
-#: ../app/alarm/AlarmSound.qml:139
-msgid "Add custom sound"
+#: ../app/alarm/AlarmSound.qml:186
+msgid "Custom alarm sounds"
+msgstr ""
+
+#: ../app/alarm/AlarmSound.qml:201
+msgid "Add sound"
+msgstr ""
+
+#: ../app/alarm/AlarmSound.qml:353
+msgid "Default alarm sounds"
 msgstr ""
 
 #: ../app/alarm/AlarmUtils.qml:31
@@ -152,15 +160,15 @@
 msgid "in %1m"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:37
+#: ../app/alarm/EditAlarmPage.qml:34
 msgid "New alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:37
+#: ../app/alarm/EditAlarmPage.qml:34
 msgid "Edit alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:366
+#: ../app/alarm/EditAlarmPage.qml:316
 msgid "Delete alarm"
 msgstr ""
 
@@ -175,31 +183,31 @@
 
 #. TRANSLATORS: This refers to the stopwatch lap and is shown as a header where space is limited. Constrain
 #. translation length to a few characters.
-#: ../app/stopwatch/LapListView.qml:45 ../app/stopwatch/StopwatchPage.qml:120
+#: ../app/stopwatch/LapListView.qml:46 ../app/stopwatch/StopwatchPage.qml:131
 msgid "Lap"
 msgstr ""
 
-#: ../app/stopwatch/LapListView.qml:55
+#: ../app/stopwatch/LapListView.qml:56
 msgid "Lap Time"
 msgstr ""
 
-#: ../app/stopwatch/LapListView.qml:63
+#: ../app/stopwatch/LapListView.qml:64
 msgid "Total Time"
 msgstr ""
 
-#: ../app/stopwatch/StopwatchPage.qml:103
+#: ../app/stopwatch/StopwatchPage.qml:114
 msgid "Stop"
 msgstr ""
 
-#: ../app/stopwatch/StopwatchPage.qml:103
+#: ../app/stopwatch/StopwatchPage.qml:114
 msgid "Start"
 msgstr ""
 
-#: ../app/stopwatch/StopwatchPage.qml:103
+#: ../app/stopwatch/StopwatchPage.qml:114
 msgid "Resume"
 msgstr ""
 
-#: ../app/stopwatch/StopwatchPage.qml:120
+#: ../app/stopwatch/StopwatchPage.qml:131
 msgid "Clear"
 msgstr ""
 
@@ -214,37 +222,37 @@
 
 #. TRANSLATORS: this indicates if the time in a world clock
 #. is behind or ahead of the time at the current location
-#: ../app/worldclock/UserWorldCityDelegate.qml:146
+#: ../app/worldclock/UserWorldCityDelegate.qml:147
 msgid "behind"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:147
+#: ../app/worldclock/UserWorldCityDelegate.qml:148
 msgid "ahead"
 msgstr ""
 
 #. TRANSLATORS: the first argument is hour, followed by
 #. minute, and the translation for either 'behind' or
 #. 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:157
+#: ../app/worldclock/UserWorldCityDelegate.qml:158
 #, qt-format
 msgid "%1h %2m %3"
 msgstr ""
 
 #. TRANSLATORS: the first argument is hour, followed by the
 #. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:166
+#: ../app/worldclock/UserWorldCityDelegate.qml:167
 #, qt-format
 msgid "%1h %2"
 msgstr ""
 
 #. TRANSLATORS: the first argument is minute, followed by the
 #. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:174
+#: ../app/worldclock/UserWorldCityDelegate.qml:175
 #, qt-format
 msgid "%1m %2"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:180
+#: ../app/worldclock/UserWorldCityDelegate.qml:181
 msgid "Same time"
 msgstr ""
 
@@ -272,1745 +280,1745 @@
 msgid "Please check your network connection and try again"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:48
 msgid "Abidjan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:48
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:48
 msgid "Ivory Coast"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:49
 msgid "Accra"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:49
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:49
 msgid "Ghana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:50
 msgid "Addis Ababa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:50
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:50
 msgid "Ethiopia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:51
 msgid "Adelaide"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:51
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:106
-#: ../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
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:51
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:96
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:106
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:107
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:129
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:195
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:224
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:251
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:266
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:320
 msgid "Australia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:52
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:52
 msgid "Albuquerque"
 msgstr ""
 
-#: ../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:88
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:91
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:116
-#: ../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:133
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:171
-#: ../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: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:232
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:249
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:252
-#: ../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:271
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:282
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:290
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:293
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:294
-#: ../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
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:52
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:58
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:61
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:67
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:69
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:74
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:87
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:88
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:91
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:92
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:113
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:116
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:117
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:119
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:126
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:132
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:133
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:171
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:172
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:175
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:180
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:196
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:204
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:209
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:210
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:214
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:221
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:225
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:227
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:229
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:231
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:232
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:241
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:247
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:249
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:250
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:252
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:253
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:257
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:268
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:270
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:271
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:274
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:278
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:282
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:283
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:290
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:291
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:293
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:294
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:295
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:307
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:316
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:335
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:341
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:342
 msgid "United States"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:53
 msgid "Algiers"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:53
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:53
 msgid "Algeria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:54
 msgid "Almaty"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:54
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:54
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:63
 msgid "Kazakhstan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:55
 msgid "Amman"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:55
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:55
 msgid "Jordan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:56
 msgid "Amsterdam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:56
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:56
 msgid "Netherlands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:57
 msgid "Anadyr"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:57
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:57
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:240
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:267
 msgid "Russia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:58
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:58
 msgid "Anchorage"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:59
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:59
 msgid "Andorra"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:60
 msgid "Ankara"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:60
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:178
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:60
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:178
 msgid "Turkey"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:61
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:61
 msgid "Ann Arbor"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:62
 msgid "Antananarivo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:62
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:62
 msgid "Madagascar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:63
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:63
 msgid "Aqtau"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:64
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:64
 msgid "Aruba"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:65
 msgid "Asunción"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:65
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:65
 msgid "Paraguay"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:66
 msgid "Athens"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:66
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:66
 msgid "Greece"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:67
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:67
 msgid "Atlanta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:68
 msgid "Auckland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:68
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:68
 msgid "New Zealand"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:69
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:69
 msgid "Austin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:71
 msgid "Baghdad"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:71
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:71
 msgid "Iraq"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:72
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:72
 msgid "Bahrain"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:73
 msgid "Baku"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:73
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:73
 msgid "Azerbaijan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:74
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:74
 msgid "Baltimore"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:75
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:75
 msgid "Bangalore"
 msgstr ""
 
-#: ../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
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:75
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:103
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:131
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:158
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:173
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:242
 msgid "India"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:76
 msgid "Bangkok"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:76
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:76
 msgid "Thailand"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:77
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:77
 msgid "Barbados"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:78
 msgid "Barcelona"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:78
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:78
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:215
 msgid "Spain"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:79
 msgid "Beijing"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:79
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:79
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:156
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:309
 msgid "China"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:80
 msgid "Beirut"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:80
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:80
 msgid "Lebanon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:81
 msgid "Belfast"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:81
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:81
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:105
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:207
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:219
 msgid "United Kingdom"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:82
 msgid "Belgrade"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:82
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:82
 msgid "Serbia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:83
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:83
 msgid "Belize"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:84
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:84
 msgid "Belo Horizonte"
 msgstr ""
 
-#: ../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
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:84
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:93
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:146
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:286
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:303
 msgid "Brazil"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:85
 msgid "Berlin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:85
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:85
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:147
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:163
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:243
 msgid "Germany"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:86
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:86
 msgid "Bermuda"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:87
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:87
 msgid "Beulah"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:88
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:88
 msgid "Black Rock City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:89
 msgid "Blantyre"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:89
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:89
 msgid "Malawi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:90
 msgid "Bogotá"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:90
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:255
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:90
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:255
 msgid "Colombia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:91
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:91
 msgid "Boston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:92
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:92
 msgid "Boulder"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:93
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:93
 msgid "Brasília"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:94
 msgid "Bratislava"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:94
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:94
 msgid "Slovakia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:95
 msgid "Brazzaville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:95
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:95
 msgid "Republic of the Congo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:96
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:96
 msgid "Brisbane"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:97
 msgid "Brussels"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:97
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:97
 msgid "Belgium"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:98
 msgid "Bucharest"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:98
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:98
 msgid "Romania"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:99
 msgid "Budapest"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:99
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:99
 msgid "Hungary"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:100
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:100
 msgid "Buenos Aires"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:100
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:100
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:226
 msgid "Argentina"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:102
 msgid "Cairo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:102
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:102
 msgid "Egypt"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:103
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:103
 msgid "Calcutta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:104
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:104
 msgid "Calgary"
 msgstr ""
 
-#: ../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
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:104
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:130
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:142
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:162
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:191
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:194
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:222
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:239
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:260
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:306
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:314
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:326
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:333
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:343
 msgid "Canada"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:105
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:105
 msgid "Cambridge"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:106
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:106
 msgid "Canary"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:107
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:107
 msgid "Canberra"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:108
 msgid "Cancún"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:108
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:108
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:114
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:228
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:237
 msgid "Mexico"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:109
 msgid "Cape Town"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:109
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:183
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:109
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:183
 msgid "South Africa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:110
 msgid "Caracas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:110
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:110
 msgid "Venezuela"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:111
 msgid "Casablanca"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:111
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:111
 msgid "Morocco"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:112
 msgid "Cayman Palms"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:112
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:112
 msgid "Cayman Islands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:113
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:113
 msgid "Chicago"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:114
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:114
 msgid "Chihuahua"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:115
 msgid "Chişinău"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:115
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:115
 msgid "Moldova"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:116
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:116
 msgid "Cincinnati"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:117
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:117
 msgid "Cleveland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:118
 msgid "Colombo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:118
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:118
 msgid "Sri Lanka"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:119
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:119
 msgid "Columbus"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:120
 msgid "Conakry"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:120
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:120
 msgid "Guinea"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:121
 msgid "Copenhagen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:121
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:121
 msgid "Denmark"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:122
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:122
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:296
 msgid "Costa Rica"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:123
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:123
 msgid "Curaçao"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:123
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:123
 msgid "Curacao"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:125
 msgid "Dakar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:125
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:125
 msgid "Senegal"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:126
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:126
 msgid "Dallas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:127
 msgid "Damascus"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:127
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:127
 msgid "Syria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:128
 msgid "Dar es Salaam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:128
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:128
 msgid "Tanzania"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:129
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:129
 msgid "Darwin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:130
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:130
 msgid "Dawson Creek"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:131
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:131
 msgid "Delhi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:132
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:132
 msgid "Denver"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:133
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:133
 msgid "Detroit"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:134
 msgid "Dhaka"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:134
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:134
 msgid "Bangladesh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:135
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:135
 msgid "Djibouti"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:136
 msgid "Doha"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:136
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:136
 msgid "Qatar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:137
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:137
 msgid "Dominica"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:138
 msgid "Dubai"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:138
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:138
 msgid "United Arab Emirates"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:139
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:139
 msgid "Dublin"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:139
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:139
 msgid "Ireland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:141
 msgid "Easter Island"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:141
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:141
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:301
 msgid "Chile"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:142
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:142
 msgid "Edmonton"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:143
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:143
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:299
 msgid "El Salvador"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:145
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:145
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:319
 msgid "Fiji"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:146
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:146
 msgid "Fortaleza"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:147
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:147
 msgid "Frankfurt"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:148
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:148
 msgid "Freetown"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:148
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:148
 msgid "Sierra Leone"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:150
 msgid "Gaborone"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:150
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:150
 msgid "Botswana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:151
 msgid "Gaza"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:151
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:151
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:167
 msgid "Palestine"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:152
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:152
 msgid "Gibraltar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:153
 msgid "Grand Turk"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:153
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:153
 msgid "Turks and Caicos Islands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:154
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:154
 msgid "Grenada"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:155
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:155
 msgid "Guam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:156
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:156
 msgid "Guangzhou"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:157
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:157
 msgid "Guatemala"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:158
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:158
 msgid "Gurgaon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:159
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:159
 msgid "Guyana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:161
 msgid "Haifa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:161
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:161
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:182
 msgid "Israel"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:162
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:162
 msgid "Halifax"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:163
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:163
 msgid "Hamburg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:164
 msgid "Hanoi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:164
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:164
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:169
 msgid "Vietnam"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:165
 msgid "Harare"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:165
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:165
 msgid "Zimbabwe"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:166
 msgid "Havana"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:166
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:166
 msgid "Cuba"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:167
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:167
 msgid "Hebron"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:168
 msgid "Helsinki"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:168
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:261
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:168
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:261
 msgid "Finland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:169
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:169
 msgid "Ho Chi Minh City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:170
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:170
 msgid "Hong Kong"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:171
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:171
 msgid "Honolulu"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:172
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:172
 msgid "Houston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:173
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:173
 msgid "Hyderabad"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:175
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:175
 msgid "Indianapolis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:176
 msgid "Islamabad"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:176
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:176
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:187
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:203
 msgid "Pakistan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:177
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:177
 msgid "Isle of Man"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:178
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:178
 msgid "Istanbul"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:180
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:180
 msgid "Jacksonville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:181
 msgid "Jakarta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:181
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:181
 msgid "Indonesia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:182
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:182
 msgid "Jerusalem"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:183
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:183
 msgid "Johannesburg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:185
 msgid "Kabul"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:185
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:185
 msgid "Afghanistan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:186
 msgid "Kampala"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:186
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:186
 msgid "Uganda"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:187
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:187
 msgid "Karachi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:188
 msgid "Khartoum"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:188
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:188
 msgid "Sudan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:189
 msgid "Kiev"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:189
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:200
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:189
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:200
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:311
 msgid "Ukraine"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:190
 msgid "Kigali"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:190
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:190
 msgid "Rwanda"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:191
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:191
 msgid "Kingston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:192
 msgid "Kinshasa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:192
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:192
 msgid "Democratic Republic of the Congo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:193
 msgid "Kiritimati"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:193
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:193
 msgid "Kiribati"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:194
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:194
 msgid "Kirkland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:195
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:195
 msgid "Knox"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:196
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:196
 msgid "Knoxville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:197
 msgid "Kraków"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:197
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:344
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:197
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:340
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:344
 msgid "Poland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:198
 msgid "Kuala Lumpur"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:198
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:198
 msgid "Malaysia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:199
 msgid "Kuwait City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:199
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:199
 msgid "Kuwait"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:200
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:200
 msgid "Kyiv"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:202
 msgid "Lagos"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:202
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:202
 msgid "Nigeria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:203
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:203
 msgid "Lahore"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:204
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:204
 msgid "Las Vegas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:205
 msgid "Lima"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:205
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:205
 msgid "Peru"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:206
 msgid "Lisbon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:206
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:206
 msgid "Portugal"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:207
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:207
 msgid "London"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:208
 msgid "Longyearbyen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:208
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:208
 msgid "Svalbard and Jan Mayen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:209
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:209
 msgid "Los Angeles"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:210
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:210
 msgid "Louisville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:211
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:211
 msgid "Luxembourg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:213
 msgid "Macau"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:213
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:213
 msgid "Macao"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:214
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:214
 msgid "Madison"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:215
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:215
 msgid "Madrid"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:216
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:216
 msgid "Maldives"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:217
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:217
 msgid "Malta"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:218
 msgid "Managua"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:218
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:218
 msgid "Nicaragua"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:219
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:219
 msgid "Manchester"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:220
 msgid "Manila"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:220
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:220
 msgid "Philippines"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:221
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:221
 msgid "Marengo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:222
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:222
 msgid "Martinique"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:223
 msgid "Maseru"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:223
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:223
 msgid "Lesotho"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:224
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:224
 msgid "Melbourne"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:225
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:225
 msgid "Memphis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:226
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:226
 msgid "Mendoza"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:227
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:227
 msgid "Metlakatla"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:228
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:228
 msgid "Mexico City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:229
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:229
 msgid "Miami"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:230
 msgid "Milan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:230
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:288
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:230
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:288
 msgid "Italy"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:231
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:231
 msgid "Milwaukee"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:232
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:232
 msgid "Minneapolis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:233
 msgid "Minsk"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:233
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:233
 msgid "Belarus"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:234
 msgid "Mogadishu"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:234
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:234
 msgid "Somalia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:235
 msgid "Monrovia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:235
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:235
 msgid "Liberia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:236
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:236
 msgid "Monaco"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:237
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:237
 msgid "Monterrey"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:238
 msgid "Montevideo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:238
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:238
 msgid "Uruguay"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:239
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:239
 msgid "Montreal"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:240
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:240
 msgid "Moscow"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:241
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:241
 msgid "Mountain View"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:242
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:242
 msgid "Mumbai"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:243
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:243
 msgid "Munich"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:244
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:244
 msgid "Muscat"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:244
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:244
 msgid "Oman"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:246
 msgid "Nairobi"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:246
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:246
 msgid "Kenya"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:247
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:247
 msgid "Nashville"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:248
 msgid "Nassau"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:248
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:248
 msgid "Bahamas"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:249
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:249
 msgid "New Orleans"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:250
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:250
 msgid "New Salem"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:251
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:251
 msgid "New South Wales"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:252
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:252
 msgid "New York"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:253
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:253
 msgid "Newfoundland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:254
 msgid "Nouméa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:254
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:254
 msgid "New Caledonia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:255
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:255
 msgid "Nuestra Señora de La Paz"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:257
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:257
 msgid "Oklahoma City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:258
 msgid "Osaka"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:258
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:258
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:325
 msgid "Japan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:259
 msgid "Oslo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:259
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:259
 msgid "Norway"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:260
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:260
 msgid "Ottawa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:261
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:261
 msgid "Oulu"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:263
 msgid "Panamá"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:263
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:263
 msgid "Panama"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:264
 msgid "Paramaribo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:264
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:264
 msgid "Suriname"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:265
 msgid "Paris"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:265
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:338
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:265
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:338
 msgid "France"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:266
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:266
 msgid "Perth"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:267
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:267
 msgid "Petersburg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:268
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:268
 msgid "Philadelphia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:269
 msgid "Phnom Penh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:269
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:269
 msgid "Cambodia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:270
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:270
 msgid "Phoenix"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:271
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:271
 msgid "Pittsburgh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:272
 msgid "Port of Spain"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:272
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:272
 msgid "Trinidad and Tobago"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:273
 msgid "Port au Prince"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:273
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:273
 msgid "Haiti"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:274
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:274
 msgid "Portland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:275
 msgid "Prague"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:275
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:275
 msgid "Czech"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:276
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:276
 msgid "Pyongyang"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:276
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:276
 msgid "North Korea"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:278
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:278
 msgid "Queensland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:279
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:279
 msgid "Quito"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:279
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:279
 msgid "Ecuador"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:281
 msgid "Rangoon"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:281
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:281
 msgid "Myanmar"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:282
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:282
 msgid "Reno"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:283
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:283
 msgid "Reston"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:284
 msgid "Reykjavík"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:284
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:284
 msgid "Iceland"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:285
 msgid "Riga"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:285
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:285
 msgid "Latvia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:286
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:286
 msgid "Rio de Janeiro"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:287
 msgid "Riyadh"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:287
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:287
 msgid "Saudi Arabia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:288
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:288
 msgid "Rome"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:290
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:290
 msgid "Sacramento"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:291
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:291
 msgid "Salt Lake City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:292
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:292
 msgid "Samoa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:293
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:293
 msgid "San Antonio"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:294
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:294
 msgid "San Diego"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:295
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:295
 msgid "San Francisco"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:296
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:296
 msgid "San José"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:297
 msgid "San Juan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:297
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:297
 msgid "Puerto Rico"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:298
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:298
 msgid "San Marino"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:299
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:299
 msgid "San Salvador"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:300
 msgid "Sanaa"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:300
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:300
 msgid "Yemen"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:301
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:301
 msgid "Santiago"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:302
 msgid "Santo Domingo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:302
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:302
 msgid "Dominican Republic"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:303
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:303
 msgid "São Paulo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:304
 msgid "São Tomé"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:304
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:304
 msgid "São Tomé and Príncipe"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:305
 msgid "Sarajevo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:305
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:305
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:306
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:306
 msgid "Saskatchewan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:307
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:307
 msgid "Seattle"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:308
 msgid "Seoul"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:308
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:308
 msgid "South Korea"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:309
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:309
 msgid "Shanghai"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:310
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:310
 msgid "Singapore"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:311
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:311
 msgid "Simferopol"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:312
 msgid "Skopje"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:312
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:312
 msgid "Macedonia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:313
 msgid "Sofia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:313
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:313
 msgid "Bulgaria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:314
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:314
 msgid "St.Johns"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:315
 msgid "St.Kitts"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:315
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:315
 msgid "Saint Kitts and Nevis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:316
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:316
 msgid "St.Louis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:317
 msgid "Stanley"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:317
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:317
 msgid "Falkland Islands"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:318
 msgid "Stockholm"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:318
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:318
 msgid "Sweden"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:319
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:319
 msgid "Suva"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:320
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:320
 msgid "Sydney"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:322
 msgid "Taipei"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:322
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:322
 msgid "Taiwan"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:323
 msgid "Tallinn"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:323
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:323
 msgid "Estonia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:324
 msgid "Tehran"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:324
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:324
 msgid "Iran"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:325
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:325
 msgid "Tokyo"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:326
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:326
 msgid "Toronto"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:327
 msgid "Tripoli"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:327
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:327
 msgid "Libya"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:328
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:328
 msgid "Tunis"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:328
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:328
 msgid "Tunisia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:330
 msgid "Ulan Bator"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:330
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:330
 msgid "Mongolia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:331
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:331
 msgid "UTC"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:333
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:333
 msgid "Vancouver"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:334
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:334
 msgid "Vatican City"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:335
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:335
 msgid "Vevay"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:336
 msgid "Vienna"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:336
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:336
 msgid "Austria"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:337
 msgid "Vilnius"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:337
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:337
 msgid "Lithuania"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:338
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:338
 msgid "Vincennes"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:340
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:340
 msgid "Warsaw"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:341
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:341
 msgid "Washington D.C."
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:342
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:342
 msgid "Winamac"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:343
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:343
 msgid "Winnipeg"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:344
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:344
 msgid "Wrocław"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:346
 msgid "Zagreb"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:346
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:346
 msgid "Croatia"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:347
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:347
 msgid "Zürich"
 msgstr ""
 
-#: ../backend/modules/Timezone/statictimezonemodel.cpp:347
+#: ../backend/modules/WorldClock/statictimezonemodel.cpp:347
 msgid "Switzerland"
 msgstr ""
 

=== modified file 'tests/unit/tst_alarmSound.qml'
--- tests/unit/tst_alarmSound.qml	2015-08-21 14:14:21 +0000
+++ tests/unit/tst_alarmSound.qml	2015-09-03 21:11:26 +0000
@@ -34,18 +34,9 @@
         sound: "file:///usr/share/sounds/ubuntu/ringtones/Bliss.ogg"
     }
 
-    FolderListModel {
-        id: _defaultSoundModel
-
-        showDirs: false
-        nameFilters: [ "*.ogg", "*.mp3" ]
-        folder: "/usr/share/sounds/ubuntu/ringtones"
-    }
-
     AlarmSound {
         id: alarmSoundPage
         alarm: _alarm
-        defaultSoundModel: _defaultSoundModel
         alarmSound: { "subText": "Bliss" }
     }
 
@@ -68,15 +59,15 @@
             alarmSoundPage.alarmSound.subText = "Bliss"
             _alarm.sound = "file:///usr/share/sounds/ubuntu/ringtones/Bliss.ogg"
             for(var i=0; i<repeater.count; i++) {
-                var alarmSoundSwitch = findChild(alarmSoundPage, "soundStatus"+i)
-                var alarmSoundLabel = findChild(alarmSoundPage, "soundName"+i)
+                var alarmSoundListItem = findChild(alarmSoundPage, "alarmSoundDelegate" + i)
+                var alarmSoundLabel = findChild(alarmSoundPage, "soundName" + i)
 
                 if(alarmSoundPage.alarmSound.subText === alarmSoundLabel.text) {
-                    alarmSoundSwitch.checked = true
+                    alarmSoundListItem.isChecked = true
                 }
 
                 else {
-                    alarmSoundSwitch.checked = false
+                    alarmSoundListItem.isChecked = false
                 }
             }
         }
@@ -86,15 +77,15 @@
         */
         function test_defaultAlarmSoundIsChecked() {
             for(var i=0; i<repeater.count; i++) {
-                var alarmSoundSwitch = findChild(alarmSoundPage, "soundStatus"+i)
+                var alarmSoundListItem = findChild(alarmSoundPage, "alarmSoundDelegate"+i)
                 var alarmSoundLabel = findChild(alarmSoundPage, "soundName"+i)
 
                 if(alarmSoundPage.alarmSound.subText === alarmSoundLabel.text) {
-                    compare(alarmSoundSwitch.checked, true, "Default alarm sound is not checked by default")
+                    compare(alarmSoundListItem.isChecked, true, "Default alarm sound is not checked by default")
                 }
 
                 else {
-                    compare(alarmSoundSwitch.checked, false, "Switch for alarm sounds not default is enabled incorrectly")
+                    compare(alarmSoundListItem.isChecked, false, "Switch for alarm sounds not default is enabled incorrectly")
                 }
             }
         }
@@ -104,19 +95,19 @@
         */
         function test_onlyOneAlarmSoundIsSelected() {
             // Click on some random alarm sounds
-            var secondSwitch = findChild(alarmSoundPage, "soundStatus"+2)
+            var secondSwitch = findChild(alarmSoundPage, "alarmSoundDelegate" + 2)
             mouseClick(secondSwitch, centerOf(secondSwitch).x, centerOf(secondSwitch).y)
 
-            var fourthSwitch = findChild(alarmSoundPage, "soundStatus"+4)
+            var fourthSwitch = findChild(alarmSoundPage, "alarmSoundDelegate" + 4)
             mouseClick(fourthSwitch, centerOf(fourthSwitch).x, centerOf(fourthSwitch).y)
 
             // Check if only that alarm sound is check while the rest is disabled
             for(var i=0; i<repeater.count; i++) {
-                var alarmSoundSwitch = findChild(alarmSoundPage, "soundStatus"+i)
-                var alarmSoundLabel = findChild(alarmSoundPage, "soundName"+i)
+                var alarmSoundListItem = findChild(alarmSoundPage, "alarmSoundDelegate" + i)
+                var alarmSoundLabel = findChild(alarmSoundPage, "soundName" + i)
 
                 if(i !== 4) {
-                    compare(alarmSoundSwitch.checked, false, "More than one alarm sound selected")
+                    compare(alarmSoundListItem.isChecked, false, "More than one alarm sound selected")
                 }
             }
         }
@@ -128,11 +119,11 @@
         function test_soundListHasNoEmptySelection() {
 
             for(var i=0; i<repeater.count; i++) {
-                var alarmSoundSwitch = findChild(alarmSoundPage, "soundStatus"+i)
+                var alarmSoundListItem = findChild(alarmSoundPage, "alarmSoundDelegate" + i)
 
-                if(alarmSoundSwitch.checked) {
-                    mouseClick(alarmSoundSwitch, centerOf(alarmSoundSwitch).x, centerOf(alarmSoundSwitch.height).y)
-                    compare(alarmSoundSwitch.checked, true, "Clicking on the only selected alarm sound disabled it")
+                if(alarmSoundListItem.isChecked) {
+                    mouseClick(alarmSoundListItem, centerOf(alarmSoundListItem).x, centerOf(alarmSoundListItem.height).y)
+                    compare(alarmSoundListItem.isChecked, true, "Clicking on the only selected alarm sound disabled it")
                     break;
                 }
             }
@@ -146,14 +137,20 @@
             compare(saveButton.enabled, false, "save header button is not disabled despite no alarm sound change")
 
             // Change sound and check if save button is enabled
-            var fifthSwitch = findChild(alarmSoundPage, "soundStatus"+5)
+            var fifthSwitch = findChild(alarmSoundPage, "alarmSoundDelegate" + 5)
             mouseClick(fifthSwitch, centerOf(fifthSwitch).x, centerOf(fifthSwitch).y)
             compare(saveButton.enabled, true, "save header button is not enabled despite alarm sound change")
 
             // Set sound to old value and check if save button is disabled
-            var firstSwitch = findChild(alarmSoundPage, "soundStatus"+1)
-            mouseClick(firstSwitch, centerOf(firstSwitch).x, centerOf(firstSwitch).y)
-            compare(saveButton.enabled, false, "save header button is not disabled despite no alarm sound change")
+            for(var i=0; i<repeater.count; i++) {
+                var alarmSoundListItem = findChild(alarmSoundPage, "alarmSoundDelegate" + i)
+                var alarmSoundLabel = findChild(alarmSoundPage, "soundName" + i)
+
+                if(alarmSoundLabel.text === "Bliss") {
+                    mouseClick(alarmSoundListItem, centerOf(alarmSoundListItem).x, centerOf(alarmSoundListItem).y)
+                    compare(saveButton.enabled, false, "save header button is not disabled despite no alarm sound change")
+                }
+            }
         }
     }
 }