Merge lp:~vthompson/ubuntu-clock-app/fix-1290492-clock into lp:ubuntu-clock-app/saucy

[Victor Thompson]

* Fix po.pro file for desktop filename change
* Update translation strings

* Fix po.pro file for desktop filename change
* Update translation strings

[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/336/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1683
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/336
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/336
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/254

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Can you merge trunk in this MP? I will then ask David to review and approve it.

[Nekhelesh Ramananthan (nik90)]

So how is the .pot file updated now? Do we need to do it manually or does this happen automatically? Do you mind quickly updating README.translations found in the root folder please?

[Victor Thompson (vthompson)]

The .pot file is generated in the same fashion as before, at the moment. This MR simply allows the translations to be updated. I have a MR [1] for the Weather app that changes how the .pot file gets built (automatically). Once Weather app has a nice pattern established, there is a bug [2] against the other core apps to follow suit [2].

I can merge trunk in a few hours.

[1] https://code.launchpad.net/~vthompson/ubuntu-weather-app/fix-1290492-weather/+merge/210326
[2] https://bugs.launchpad.net/music-app/+bug/1290814

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

PASSED: Continuous integration, rev:375
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/341/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1874
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/341
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/341
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/259

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

review: Approve (continuous-integration)

[David Planella (dpm)]

This needs to be ported to cmake, in the same way we did for Weather:

https://code.launchpad.net/~vthompson/ubuntu-weather-app/fix-1290492-weather/+merge/210326

review: Needs Fixing

[Victor Thompson (vthompson)]

While we could do that in this MR, the intent was to simply get translations working again. I filed lp:1290814 so each app wouldn't be blocked while we decided on how to proceed with the Weather app. Now of course the Weather app MR you point out has landed--so we aren't blocked. I'd still like to keep them separate, because I don't want to 1) block each remaining app while we do this and 2) I didn't necessarily want to sign myself up for doing this work in each app. :)

[David Planella (dpm)]

Sounds good to me!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/161/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1967/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/161
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/161
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/97

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/162/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1968/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/162
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/162
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/98

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Any idea why this is failing?

[Victor Thompson (vthompson)]

Looks like a Jenkins issue setting up the environment: http://paste.ubuntu.com/7203267/

[Francis Ginther (fginther)]

There was a broken package as a result of apt-get upgrade on the mediumtest server (happens once in a while when on the development release). I've fixed the broken package and have retriggered the build.

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

review: Approve (continuous-integration)

=== modified file 'po/po.pro'
--- po/po.pro	2013-09-27 10:31:40 +0000
+++ po/po.pro	2014-03-26 22:45:18 +0000
@@ -10,7 +10,7 @@
 PROJECTNAME = $$system(basename ../*.qmlproject)
 PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
 
-DESKTOPFILE = ../$${PROJECTNAME}.desktop
+DESKTOPFILE = ../com.ubuntu.clock_clock.desktop.in
 
 SOURCECODE = ../*.qml \
              ../alarm/*.qml \
@@ -22,7 +22,7 @@
              ../timer/*.qml
 
 BUILDDIR = ../.build
-DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
+DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.clock_clock.desktop.in
 
 message("")
 message(" Project Name: $$PROJECTNAME ")

=== modified file 'po/ubuntu-clock-app.pot'
--- po/ubuntu-clock-app.pot	2014-01-27 20:46:14 +0000
+++ po/ubuntu-clock-app.pot	2014-03-26 22:45:18 +0000
@@ -1,5 +1,5 @@
 # Clock App Translations
-# Copyright (C) 2013 Canonical Ltd. 
+# Copyright (C) 2014 Canonical Ltd. 
 # This file is distributed under the same license as the ubuntu-clock-app package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-clock-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-27 14:42-0600\n"
+"POT-Creation-Date: 2014-03-10 18:56-0500\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,223 +17,226 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../ubuntu-clock-app.qml:61 ../common/SettingsPage.qml:9
+#: ../ubuntu-clock-app.qml:84 ../common/SettingsPage.qml:28
 msgid "Settings"
 msgstr ""
 
 #. TRANSLATORS: this is a list of semicolon-separated keywords to be used to activate this action (Settings) in the HUD
-#: ../ubuntu-clock-app.qml:63
+#: ../ubuntu-clock-app.qml:86
 msgid "Settings;Setting;Configuration;"
 msgstr ""
 
-#: ../ubuntu-clock-app.qml:64
+#: ../ubuntu-clock-app.qml:87
 msgid "Application Settings"
 msgstr ""
 
-#: ../ubuntu-clock-app.qml:162 ../.build/ubuntu-clock-app.desktop.js:1
+#: ../ubuntu-clock-app.qml:167 ../.build/com.ubuntu.clock_clock.desktop.in:1
 msgid "Clock"
 msgstr ""
 
-#: ../ubuntu-clock-app.qml:182
+#: ../ubuntu-clock-app.qml:186
 msgid "Alarm"
 msgstr ""
 
-#: ../ubuntu-clock-app.qml:198
+#: ../ubuntu-clock-app.qml:209
 msgid "Timer"
 msgstr ""
 
-#: ../ubuntu-clock-app.qml:212
+#: ../ubuntu-clock-app.qml:226
 msgid "Stopwatch"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:52
+#: ../alarm/AddAlarmPage.qml:70
 msgid "Add Alarm"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:54
+#: ../alarm/AddAlarmPage.qml:75
 msgid "Edit Alarm"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:84
+#: ../alarm/AddAlarmPage.qml:96
 msgid "Please select a time in the future"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:86 ../alarm/AddAlarmPage.qml:172
+#: ../alarm/AddAlarmPage.qml:98 ../alarm/AddAlarmPage.qml:515
 msgid "Unable to set alarm"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:184
+#: ../alarm/AddAlarmPage.qml:528
 msgid "Alarm Name"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:200
+#: ../alarm/AddAlarmPage.qml:546
+msgid "Repeats"
+msgstr ""
+
+#: ../alarm/AddAlarmPage.qml:574
 msgid "Occurs"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:236
+#: ../alarm/AddAlarmPage.qml:617
 msgid "Occurrence"
 msgstr ""
 
-#: ../alarm/AddAlarmPage.qml:257
-msgid "Repeats"
-msgstr ""
-
-#: ../alarm/AddAlarmPage.qml:259
-msgid "One Time"
-msgstr ""
-
-#: ../alarm/AddAlarmPage.qml:259 ../alarm/AlarmPage.qml:93
-msgid "Daily"
-msgstr ""
-
-#: ../alarm/AddAlarmPage.qml:259
-msgid "Weekly"
-msgstr ""
-
-#: ../alarm/AddAlarmPage.qml:302 ../timer/TimerPage.qml:234
+#: ../alarm/AddAlarmPage.qml:648 ../timer/TimerPage.qml:392
 msgid "Save"
 msgstr ""
 
-#: ../alarm/AlarmFace.qml:52
+#: ../alarm/AlarmFace.qml:50
+msgid "Next Alarm"
+msgstr ""
+
+#: ../alarm/AlarmFace.qml:67 ../alarm/AlarmPage.qml:265
+msgid "Now"
+msgstr ""
+
+#: ../alarm/AlarmFace.qml:89
 msgid "Long press to setup an alarm"
 msgstr ""
 
-#: ../alarm/AlarmPage.qml:45
+#: ../alarm/AlarmList.qml:44
+msgid "Alarms"
+msgstr ""
+
+#: ../alarm/AlarmPage.qml:50
 msgid "Add alarm"
 msgstr ""
 
-#: ../alarm/AlarmPage.qml:46
+#: ../alarm/AlarmPage.qml:51
 msgid "Add a new alarm"
 msgstr ""
 
-#: ../alarm/AlarmPage.qml:47
+#: ../alarm/AlarmPage.qml:52
 msgid "Add;Alarm;Alert;New;Tone;Bell"
 msgstr ""
 
-#: ../alarm/AlarmPage.qml:88
+#: ../alarm/AlarmPage.qml:127
+msgid "Every weekday"
+msgstr ""
+
+#: ../alarm/AlarmPage.qml:130
+msgid "Daily"
+msgstr ""
+
+#: ../alarm/AlarmPage.qml:134
 msgid "Every "
 msgstr ""
 
-#: ../alarm/AlarmPage.qml:90
+#: ../alarm/AlarmPage.qml:136
 msgid "Once on "
 msgstr ""
 
-#: ../alarm/AlarmPage.qml:156
-msgid "Alarms"
-msgstr ""
-
-#: ../clock/ClockPage.qml:56 ../clock/WorldClock.qml:31
+#: ../alarm/AlarmPage.qml:259
+msgid "No Active Alarms"
+msgstr ""
+
+#: ../clock/ClockPage.qml:43
+msgid "Retrieving current location..."
+msgstr ""
+
+#: ../clock/ClockPage.qml:90 ../clock/WorldClock.qml:35
 msgid "Add City"
 msgstr ""
 
 #. TRANSLATORS: this is a list of semicolon-separated keywords to be used to activate this action (Add City) in the HUD
-#: ../clock/ClockPage.qml:58
+#: ../clock/ClockPage.qml:92
 msgid ""
 "Add;Timezone;Timezones;World;City;Cities;Town;Towns;Place;Places;Location;"
 "Locations;Time;Locale;Local;Current"
 msgstr ""
 
-#: ../clock/ClockPage.qml:93 ../clock/ClockPage.qml:100
+#: ../clock/ClockPage.qml:156 ../clock/ClockPage.qml:163
 msgid "Set current location name"
 msgstr ""
 
-#: ../clock/ClockPage.qml:183
-msgid "Current Location"
-msgstr ""
-
-#: ../clock/ClockPage.qml:195
-msgid "Retrieving current location..."
-msgstr ""
-
-#: ../clock/ClockPage.qml:214
-msgid "World"
-msgstr ""
-
-#: ../clock/EasterEgg.qml:87
+#: ../clock/EasterEgg.qml:89
 msgid "Sunrise"
 msgstr ""
 
-#: ../clock/EasterEgg.qml:95 ../clock/EasterEgg.qml:112
+#: ../clock/EasterEgg.qml:97 ../clock/EasterEgg.qml:114
 msgid "Loading"
 msgstr ""
 
-#: ../clock/EasterEgg.qml:121
+#: ../clock/EasterEgg.qml:123
 msgid "Sunset"
 msgstr ""
 
-#: ../clock/SearchBox.qml:42
+#: ../clock/SearchBox.qml:49
 msgid "Search"
 msgstr ""
 
-#: ../clock/WorldClock.qml:31
+#: ../clock/UserWorldClockList.qml:49
+msgid "World"
+msgstr ""
+
+#: ../clock/WorldClock.qml:35
 msgid "Edit Current Location"
 msgstr ""
 
-#: ../clock/WorldClock.qml:121
+#: ../clock/WorldClock.qml:125
 msgid ""
 "Unable to search online \n"
 "Please check your internet connection"
 msgstr ""
 
-#: ../clock/WorldClock.qml:121
+#: ../clock/WorldClock.qml:125
 msgid "No results found"
 msgstr ""
 
-#: ../stopwatch/LapList.qml:45
-msgid "Laps"
-msgstr ""
-
-#: ../stopwatch/LapList.qml:54
+#: ../stopwatch/LapList.qml:46
+msgid "Recorded laps"
+msgstr ""
+
+#: ../stopwatch/StopwatchFace.qml:107 ../stopwatch/StopwatchPage.qml:68
+#: ../stopwatch/StopwatchPage.qml:77
+msgid "Start"
+msgstr ""
+
+#: ../stopwatch/StopwatchPage.qml:56
+msgid "Stop"
+msgstr ""
+
+#: ../stopwatch/StopwatchPage.qml:266
 msgid "Current"
 msgstr ""
 
-#: ../stopwatch/LapList.qml:70
-msgid "Recorded laps"
-msgstr ""
-
-#: ../stopwatch/StopwatchPage.qml:104 ../timer/TimerPage.qml:202
-msgid "Reset"
-msgstr ""
-
-#: ../stopwatch/StopwatchPage.qml:121
-msgid "Lap"
-msgstr ""
-
-#: ../timer/PresetList.qml:52
+#: ../timer/PresetList.qml:65
 msgid "Presets"
 msgstr ""
 
-#. TRANSLATORS: This is a set of default timer presets for food preparations shown when the clock app is open for the first time.
-#. If there are no translations available, then the english strings would suffice.
-#: ../timer/PresetTimersModel.qml:79
+#: ../timer/TimerPage.qml:49
 msgid "Soft-boiled egg"
 msgstr ""
 
-#: ../timer/PresetTimersModel.qml:80
+#: ../timer/TimerPage.qml:56
 msgid "Aeropress coffee"
 msgstr ""
 
-#: ../timer/PresetTimersModel.qml:81
+#: ../timer/TimerPage.qml:63
 msgid "Al dente"
 msgstr ""
 
-#: ../timer/TimerPage.qml:41
+#: ../timer/TimerPage.qml:112
 msgid "Add Timer"
 msgstr ""
 
-#: ../timer/TimerPage.qml:42
+#: ../timer/TimerPage.qml:113
 msgid "Add a new timer"
 msgstr ""
 
 #. TRANSLATORS: this is a list of semicolon-separated keywords to be used to activate this action (Add Timer) in the HUD
-#: ../timer/TimerPage.qml:44
+#: ../timer/TimerPage.qml:115
 msgid "Add;Timer;Eggtimer;Preset;Ticker"
 msgstr ""
 
-#: ../timer/TimerPage.qml:190
+#: ../timer/TimerPage.qml:341
 msgid "Preset Name"
 msgstr ""
 
-#: ../timer/TimerPage.qml:258
+#: ../timer/TimerPage.qml:358
+msgid "Reset"
+msgstr ""
+
+#: ../timer/TimerPage.qml:416
 msgid "Cancel"
 msgstr ""