Merge lp:~nik90/ubuntu-clock-app/pot-file-oct10 into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Pot file update and online city search url version bump

Just a regular pot file update and a version bump to the online search url.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM

review: Approve

[David Planella (dpm)]

LGTM, thanks!

Just a quick comment: I'd suggest to make the version number a cmake variable, so that the code doesn't need to be updated on new releases. You could put the cmake variable in a .js.in file that gets automatically updated with the right version on build, and then the QML file reads the generated .js file.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-09-26 11:36:12 +0000
+++ app/worldclock/WorldCityList.qml	2014-10-10 10:57:33 +0000
@@ -104,7 +104,7 @@
                             var url = String("%1%2%3")
                             .arg("http://geoname-lookup.ubuntu.com/?query=")
                             .arg(searchField.text)
-                            .arg("&app=com.ubuntu.clock.devel&version=3.0")
+                            .arg("&app=com.ubuntu.clock&version=3.2.x")
                             console.log("Online URL: " + url)
                             jsonTimeZoneModel.source = Qt.resolvedUrl(url)
                         }

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-10-09 10:16:42 +0000
+++ po/com.ubuntu.clock.pot	2014-10-10 10:57:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-09 12:00+0200\n"
+"POT-Creation-Date: 2014-10-10 12:54+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"
@@ -17,61 +17,46 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../app/alarm/AlarmDelegate.qml:136
-#, qt-format
-msgid "in %1d %1h %2m"
-msgstr ""
-
-#: ../app/alarm/AlarmDelegate.qml:145
-#, qt-format
-msgid "in %1h %2m"
-msgstr ""
-
-#: ../app/alarm/AlarmDelegate.qml:153
-#, c-format, qt-format
-msgid "in %1m"
-msgstr ""
-
 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
-#: ../app/alarm/EditAlarmPage.qml:300
+#: ../app/alarm/EditAlarmPage.qml:299
 msgid "Label"
 msgstr ""
 
-#: ../app/alarm/AlarmList.qml:81 ../app/alarm/AlarmPage.qml:108
-#: ../app/worldclock/UserWorldCityList.qml:103
+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:110
+#: ../app/worldclock/UserWorldCityList.qml:101
 msgid "Delete"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:26 ../app/ubuntu-clock-app.qml:139
+#: ../app/alarm/AlarmPage.qml:28
 msgid "Alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:47
-#: ../app/alarm/EditAlarmPage.qml:174
+#: ../app/alarm/AlarmPage.qml:45 ../app/alarm/EditAlarmPage.qml:46
+#: ../app/alarm/EditAlarmPage.qml:173
 msgid "Alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:68
+#: ../app/alarm/AlarmPage.qml:60 ../app/worldclock/WorldCityList.qml:68
 msgid "Back"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:79
+#: ../app/alarm/AlarmPage.qml:81
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:81 ../app/alarm/AlarmRepeat.qml:35
+#: ../app/alarm/AlarmPage.qml:83 ../app/alarm/AlarmRepeat.qml:35
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:137
+#: ../app/alarm/AlarmPage.qml:140
 msgid "No saved alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:138
+#: ../app/alarm/AlarmPage.qml:141
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:290
+#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:289
 msgid "Repeat"
 msgstr ""
 
@@ -109,7 +94,7 @@
 msgid "Change time and date"
 msgstr ""
 
-#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:313
+#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:312
 msgid "Sound"
 msgstr ""
 
@@ -129,19 +114,47 @@
 msgid "Daily"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:40
+#: ../app/alarm/AlarmUtils.qml:55
+msgid "No active alarms"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:72
+#, qt-format
+msgid "Next Alarm %1"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:79
+msgid "Alarm Passed"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:88
+#, qt-format
+msgid "in %1d %2h %3m"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:97
+#, qt-format
+msgid "in %1h %2m"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:105
+#, c-format, qt-format
+msgid "in %1m"
+msgstr ""
+
+#: ../app/alarm/EditAlarmPage.qml:39
 msgid "New alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:40
+#: ../app/alarm/EditAlarmPage.qml:39
 msgid "Edit alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:337
+#: ../app/alarm/EditAlarmPage.qml:336
 msgid "Delete alarm"
 msgstr ""
 
-#: ../app/clock/ClockPage.qml:143
+#: ../app/clock/ClockPage.qml:150
 msgid "Location"
 msgstr ""