Merge lp:~nik90/ubuntu-clock-app/fix-duplicate-translation-strings into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Fixes duplicate translations strings and also removed "UTC" string marked for translation which was also incorrrect.

Fix duplicate translations strings and also removed "UTC" string marked for translation which was also incorrrect.

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

PASSED: Continuous integration, rev:129
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/13/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/13

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, nice work!

However, I'd keep "UTC" as a translatable string. Other than that, looks good to go to me.

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/fix-duplicate-translation-strings]

130. By Nekhelesh Ramananthan on 2013-07-08

reverted UTC translation string removal

[David Planella (dpm)]

review: Approve

=== modified file 'clock/EasterEgg.qml'
--- clock/EasterEgg.qml	2013-07-01 11:14:39 +0000
+++ clock/EasterEgg.qml	2013-07-08 17:43:26 +0000
@@ -97,7 +97,7 @@
             anchors.horizontalCenter: parent.horizontalCenter
             color: Constants.brightWhite;
             fontSize: "x-large";
-            text: i18n.tr("loading")
+            text: i18n.tr("Loading")
         }
         
         Rectangle {
@@ -114,7 +114,7 @@
             horizontalAlignment: Text.AlignHCenter
             color: Constants.brightWhite;
             fontSize: "x-large";
-            text: i18n.tr("loading")
+            text: i18n.tr("Loading")
         }
         
         Label {

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-06-21 23:36:03 +0000
+++ clock/WorldClock.qml	2013-07-08 17:43:26 +0000
@@ -139,7 +139,7 @@
 
         delegate: ListItem.Standard {
             Label {
-                text: searchCityModel.status == XmlListModel.Ready ? city + ", " + country : i18n.tr("Loading...");
+                text: searchCityModel.status == XmlListModel.Ready ? city + ", " + country : i18n.tr("Loading");
                 anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
                 fontSize: "large"
             }

=== modified file 'po/ubuntu-clock-app.pot'
--- po/ubuntu-clock-app.pot	2013-07-07 19:24:47 +0000
+++ po/ubuntu-clock-app.pot	2013-07-08 17:43:26 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-clock-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-07 21:18+0200\n"
+"POT-Creation-Date: 2013-07-08 19:24+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,20 +17,24 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../common/SwipeDelete.qml:44
-#: ../common/SwipeDelete.qml:50
-#: ../timer/TimerPage.qml:304
-#: ../alarm/BackgroundAlarm.qml:45
-msgid "Delete"
-msgstr ""
-
-#: ../clock/WorldClock.qml:79
-#: ../clock/WorldClock.qml:101
-msgid "Search"
-msgstr ""
-
-#: ../clock/WorldClock.qml:142
-msgid "Loading..."
+#: ../stopwatch/StopwatchPage.qml:124
+msgid "Reset"
+msgstr ""
+
+#: ../stopwatch/StopwatchPage.qml:142
+msgid "Lap"
+msgstr ""
+
+#: ../stopwatch/StopwatchPage.qml:165
+msgid "Laps"
+msgstr ""
+
+#: ../stopwatch/StopwatchPage.qml:173
+msgid "Current"
+msgstr ""
+
+#: ../stopwatch/StopwatchPage.qml:187
+msgid "Recorded laps"
 msgstr ""
 
 #: ../clock/EasterEgg.qml:92
@@ -39,13 +43,42 @@
 
 #: ../clock/EasterEgg.qml:100
 #: ../clock/EasterEgg.qml:117
-msgid "loading"
+#: ../clock/WorldClock.qml:142
+msgid "Loading"
 msgstr ""
 
 #: ../clock/EasterEgg.qml:126
 msgid "Sunset"
 msgstr ""
 
+#: ../ubuntu-clock-app.qml:112
+msgid "Clock"
+msgstr ""
+
+#: ../ubuntu-clock-app.qml:124
+msgid "Alarm"
+msgstr ""
+
+#: ../ubuntu-clock-app.qml:140
+msgid "Timer"
+msgstr ""
+
+#: ../ubuntu-clock-app.qml:150
+msgid "Stopwatch"
+msgstr ""
+
+#: ../alarm/BackgroundAlarm.qml:45
+#: ../timer/TimerPage.qml:304
+#: ../common/SwipeDelete.qml:44
+#: ../common/SwipeDelete.qml:50
+msgid "Delete"
+msgstr ""
+
+#: ../alarm/BackgroundAlarm.qml:51
+#: ../alarm/AlarmPage.qml:765
+msgid "Edit"
+msgstr ""
+
 #: ../clock/ClockPage.qml:158
 msgid "Current Location"
 msgstr ""
@@ -79,29 +112,9 @@
 msgid "Add Preset"
 msgstr ""
 
-#: ../stopwatch/StopwatchPage.qml:124
-msgid "Reset"
-msgstr ""
-
-#: ../stopwatch/StopwatchPage.qml:142
-msgid "Lap"
-msgstr ""
-
-#: ../stopwatch/StopwatchPage.qml:165
-msgid "Laps"
-msgstr ""
-
-#: ../stopwatch/StopwatchPage.qml:173
-msgid "Current"
-msgstr ""
-
-#: ../stopwatch/StopwatchPage.qml:187
-msgid "Recorded laps"
-msgstr ""
-
-#: ../alarm/BackgroundAlarm.qml:51
-#: ../alarm/AlarmPage.qml:765
-msgid "Edit"
+#: ../clock/WorldClock.qml:79
+#: ../clock/WorldClock.qml:101
+msgid "Search"
 msgstr ""
 
 #: ../alarm/AlarmPage.qml:440
@@ -159,15 +172,3 @@
 #: ../alarm/AlarmPage.qml:747
 msgid "Add Alarm"
 msgstr ""
-
-#: ../ubuntu-clock-app.qml:112
-msgid "Clock"
-msgstr ""
-
-#: ../ubuntu-clock-app.qml:134
-msgid "Timer"
-msgstr ""
-
-#: ../ubuntu-clock-app.qml:144
-msgid "Stopwatch"
-msgstr ""