Merge lp:~aacid/ubuntu-clock-app/addi18ntr into lp:ubuntu-clock-app

Proposed by Albert Astals Cid
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 120
Merged at revision: 120
Proposed branch: lp:~aacid/ubuntu-clock-app/addi18ntr
Merge into: lp:ubuntu-clock-app
Diff against target: 108 lines (+18/-14)
2 files modified
app/clock/ClockPage.qml (+1/-1)
po/com.ubuntu.clock.pot (+17/-13)
To merge this branch: bzr merge lp:~aacid/ubuntu-clock-app/addi18ntr
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Ubuntu Clock Developers Pending
Review via email: mp+235923@code.launchpad.net

Commit message

Add i18n.tr

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

lgtm! Thnx for the MR.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2014-09-19 11:30:40 +0000
+++ app/clock/ClockPage.qml 2014-09-25 09:42:22 +0000
@@ -131,7 +131,7 @@
131 Label {131 Label {
132 id: location132 id: location
133 objectName: "location"133 objectName: "location"
134 text: "Location"134 text: i18n.tr("Location")
135 fontSize: "medium"135 fontSize: "medium"
136 anchors.verticalCenter: locationIcon.verticalCenter136 anchors.verticalCenter: locationIcon.verticalCenter
137 color: UbuntuColors.midAubergine137 color: UbuntuColors.midAubergine
138138
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2014-09-20 10:47:21 +0000
+++ po/com.ubuntu.clock.pot 2014-09-25 09:42:22 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-20 02:34-0700\n"11"POT-Creation-Date: 2014-09-25 11:41+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@
32msgid "in %1m"32msgid "in %1m"
33msgstr ""33msgstr ""
3434
35#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:5235#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
36#: ../app/alarm/EditAlarmPage.qml:29936#: ../app/alarm/EditAlarmPage.qml:299
37msgid "Label"37msgid "Label"
38msgstr ""38msgstr ""
@@ -83,8 +83,8 @@
83#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:5683#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
84#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:6684#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
85#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:6885#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
86#: ../app/alarm/AlarmSettingsPage.qml:13586#: ../app/alarm/AlarmSettingsPage.qml:139
87#: ../app/alarm/AlarmSettingsPage.qml:19887#: ../app/alarm/AlarmSettingsPage.qml:206
88#, qt-format88#, qt-format
89msgid "%1 minutes"89msgid "%1 minutes"
90msgstr ""90msgstr ""
@@ -93,19 +93,19 @@
93msgid "Alarm volume"93msgid "Alarm volume"
94msgstr ""94msgstr ""
9595
96#: ../app/alarm/AlarmSettingsPage.qml:13496#: ../app/alarm/AlarmSettingsPage.qml:138
97msgid "Silence after"97msgid "Silence after"
98msgstr ""98msgstr ""
9999
100#: ../app/alarm/AlarmSettingsPage.qml:197100#: ../app/alarm/AlarmSettingsPage.qml:205
101msgid "Snooze for"101msgid "Snooze for"
102msgstr ""102msgstr ""
103103
104#: ../app/alarm/AlarmSettingsPage.qml:241104#: ../app/alarm/AlarmSettingsPage.qml:249
105msgid "Vibration"105msgid "Vibration"
106msgstr ""106msgstr ""
107107
108#: ../app/alarm/AlarmSettingsPage.qml:270108#: ../app/alarm/AlarmSettingsPage.qml:278
109msgid "Change time and date"109msgid "Change time and date"
110msgstr ""110msgstr ""
111111
@@ -141,6 +141,10 @@
141msgid "Delete alarm"141msgid "Delete alarm"
142msgstr ""142msgstr ""
143143
144#: ../app/clock/ClockPage.qml:134
145msgid "Location"
146msgstr ""
147
144#: ../app/worldclock/AddWorldCityButton.qml:30148#: ../app/worldclock/AddWorldCityButton.qml:30
145msgid "Add"149msgid "Add"
146msgstr ""150msgstr ""
@@ -190,23 +194,23 @@
190msgid "Select a city"194msgid "Select a city"
191msgstr ""195msgstr ""
192196
193#: ../app/worldclock/WorldCityList.qml:78197#: ../app/worldclock/WorldCityList.qml:79
194msgid "Search..."198msgid "Search..."
195msgstr ""199msgstr ""
196200
197#: ../app/worldclock/WorldCityList.qml:155201#: ../app/worldclock/WorldCityList.qml:156
198msgid "Searching for a city"202msgid "Searching for a city"
199msgstr ""203msgstr ""
200204
201#: ../app/worldclock/WorldCityList.qml:160205#: ../app/worldclock/WorldCityList.qml:161
202msgid "No City Found"206msgid "No City Found"
203msgstr ""207msgstr ""
204208
205#: ../app/worldclock/WorldCityList.qml:166209#: ../app/worldclock/WorldCityList.qml:167
206msgid "Unable to connect."210msgid "Unable to connect."
207msgstr ""211msgstr ""
208212
209#: ../app/worldclock/WorldCityList.qml:167213#: ../app/worldclock/WorldCityList.qml:168
210msgid "Please check your network connection and try again"214msgid "Please check your network connection and try again"
211msgstr ""215msgstr ""
212216

Subscribers

People subscribed via source and target branches