ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #04865
[Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-prague into lp:ubuntu-clock-app
Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-prague into lp:ubuntu-clock-app.
Commit message:
Fix Czech Republic country name (LP: #1494004)
Requested reviews:
Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
Bug #1494004 in Ubuntu Clock App: "Country name for "Prague" is wrong"
https://bugs.launchpad.net/ubuntu-clock-app/+bug/1494004
For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-prague/+merge/270654
Fix Czech Republic country name (LP: #1494004)
--
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-prague into lp:ubuntu-clock-app.
=== modified file 'backend/modules/WorldClock/statictimezonemodel.cpp'
--- backend/modules/WorldClock/statictimezonemodel.cpp 2015-08-25 16:11:38 +0000
+++ backend/modules/WorldClock/statictimezonemodel.cpp 2015-09-10 11:11:51 +0000
@@ -272,7 +272,7 @@
addCity("Port of Spain", _("Port of Spain"), "America/Port_of_Spain", _("Trinidad and Tobago"));
addCity("Port au Prince", _("Port au Prince"), "America/Port-au-Prince", _("Haiti"));
addCity("Portland", _("Portland"), "America/Los_Angeles", _("United States"));
- addCity("Prague", _("Prague"), "Europe/Prague", _("Czech"));
+ addCity("Prague", _("Prague"), "Europe/Prague", _("Czech Republic"));
addCity("Pyongyang", _("Pyongyang"), "Asia/Pyongyang", _("North Korea"));
addCity("Queensland", _("Queensland"), "Australia/Brisbane", _("United States"));
=== modified file 'debian/changelog'
--- debian/changelog 2015-09-04 22:21:34 +0000
+++ debian/changelog 2015-09-10 11:11:51 +0000
@@ -10,6 +10,7 @@
[ Bartosz Kosiorek ]
* Fix wrong time after changing timezone, when stopwatch is running (LP: #1491024)
* Reduce size of images (with tinypng.com) to decrease click image size (LP: #1492057)
+ * Fix Czech Republic country name (LP: #1494004)
-- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx> Wed, 02 Sep 2015 15:16:29 +0200
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2015-09-03 21:11:12 +0000
+++ po/com.ubuntu.clock.pot 2015-09-10 11:11:51 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 23:10+0200\n"
+"POT-Creation-Date: 2015-09-10 13:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -1655,7 +1655,7 @@
msgstr ""
#: ../backend/modules/WorldClock/statictimezonemodel.cpp:275
-msgid "Czech"
+msgid "Czech Republic"
msgstr ""
#: ../backend/modules/WorldClock/statictimezonemodel.cpp:276
Follow ups