Ubuntu Clock App

Merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-prague into lp:ubuntu-clock-app

  1. ubuntu-clock-prague
  2. Merge into trunk
Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 379
Merged at revision: 379
Proposed branch: lp:~gang65/ubuntu-clock-app/ubuntu-clock-prague
Merge into: lp:ubuntu-clock-app
Diff against target: 46 lines (+4/-3)
3 files modified
backend/modules/WorldClock/statictimezonemodel.cpp (+1/-1)
debian/changelog (+1/-0)
po/com.ubuntu.clock.pot (+2/-2)
To merge this branch: bzr merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-prague
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Review via email: mp+270654@code.launchpad.net

Commit message

Fix Czech Republic country name (LP: #1494004)

Description of the change

Fix Czech Republic country name (LP: #1494004)

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

LGTM!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:379
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/835/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/180

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'backend/modules/WorldClock/statictimezonemodel.cpp'
2--- backend/modules/WorldClock/statictimezonemodel.cpp 2015-08-25 16:11:38 +0000
3+++ backend/modules/WorldClock/statictimezonemodel.cpp 2015-09-10 11:11:51 +0000
4@@ -272,7 +272,7 @@
5 addCity("Port of Spain", _("Port of Spain"), "America/Port_of_Spain", _("Trinidad and Tobago"));
6 addCity("Port au Prince", _("Port au Prince"), "America/Port-au-Prince", _("Haiti"));
7 addCity("Portland", _("Portland"), "America/Los_Angeles", _("United States"));
8- addCity("Prague", _("Prague"), "Europe/Prague", _("Czech"));
9+ addCity("Prague", _("Prague"), "Europe/Prague", _("Czech Republic"));
10 addCity("Pyongyang", _("Pyongyang"), "Asia/Pyongyang", _("North Korea"));
11
12 addCity("Queensland", _("Queensland"), "Australia/Brisbane", _("United States"));
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-09-04 22:21:34 +0000
16+++ debian/changelog 2015-09-10 11:11:51 +0000
17@@ -10,6 +10,7 @@
18 [ Bartosz Kosiorek ]
19 * Fix wrong time after changing timezone, when stopwatch is running (LP: #1491024)
20 * Reduce size of images (with tinypng.com) to decrease click image size (LP: #1492057)
21+ * Fix Czech Republic country name (LP: #1494004)
22
23 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 02 Sep 2015 15:16:29 +0200
24
25
26=== modified file 'po/com.ubuntu.clock.pot'
27--- po/com.ubuntu.clock.pot 2015-09-03 21:11:12 +0000
28+++ po/com.ubuntu.clock.pot 2015-09-10 11:11:51 +0000
29@@ -8,7 +8,7 @@
30 msgstr ""
31 "Project-Id-Version: \n"
32 "Report-Msgid-Bugs-To: \n"
33-"POT-Creation-Date: 2015-09-03 23:10+0200\n"
34+"POT-Creation-Date: 2015-09-10 13:06+0200\n"
35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 "Language-Team: LANGUAGE <LL@li.org>\n"
38@@ -1655,7 +1655,7 @@
39 msgstr ""
40
41 #: ../backend/modules/WorldClock/statictimezonemodel.cpp:275
42-msgid "Czech"
43+msgid "Czech Republic"
44 msgstr ""
45
46 #: ../backend/modules/WorldClock/statictimezonemodel.cpp:276

Subscribers

People subscribed via source and target branches