Ubuntu Clock App

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

  1. addi18ntr
  2. Merge into trunk
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
1=== modified file 'app/clock/ClockPage.qml'
2--- app/clock/ClockPage.qml 2014-09-19 11:30:40 +0000
3+++ app/clock/ClockPage.qml 2014-09-25 09:42:22 +0000
4@@ -131,7 +131,7 @@
5 Label {
6 id: location
7 objectName: "location"
8- text: "Location"
9+ text: i18n.tr("Location")
10 fontSize: "medium"
11 anchors.verticalCenter: locationIcon.verticalCenter
12 color: UbuntuColors.midAubergine
13
14=== modified file 'po/com.ubuntu.clock.pot'
15--- po/com.ubuntu.clock.pot 2014-09-20 10:47:21 +0000
16+++ po/com.ubuntu.clock.pot 2014-09-25 09:42:22 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: \n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2014-09-20 02:34-0700\n"
22+"POT-Creation-Date: 2014-09-25 11:41+0200\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -32,7 +32,7 @@
27 msgid "in %1m"
28 msgstr ""
29
30-#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:52
31+#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
32 #: ../app/alarm/EditAlarmPage.qml:299
33 msgid "Label"
34 msgstr ""
35@@ -83,8 +83,8 @@
36 #: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
37 #: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
38 #: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
39-#: ../app/alarm/AlarmSettingsPage.qml:135
40-#: ../app/alarm/AlarmSettingsPage.qml:198
41+#: ../app/alarm/AlarmSettingsPage.qml:139
42+#: ../app/alarm/AlarmSettingsPage.qml:206
43 #, qt-format
44 msgid "%1 minutes"
45 msgstr ""
46@@ -93,19 +93,19 @@
47 msgid "Alarm volume"
48 msgstr ""
49
50-#: ../app/alarm/AlarmSettingsPage.qml:134
51+#: ../app/alarm/AlarmSettingsPage.qml:138
52 msgid "Silence after"
53 msgstr ""
54
55-#: ../app/alarm/AlarmSettingsPage.qml:197
56+#: ../app/alarm/AlarmSettingsPage.qml:205
57 msgid "Snooze for"
58 msgstr ""
59
60-#: ../app/alarm/AlarmSettingsPage.qml:241
61+#: ../app/alarm/AlarmSettingsPage.qml:249
62 msgid "Vibration"
63 msgstr ""
64
65-#: ../app/alarm/AlarmSettingsPage.qml:270
66+#: ../app/alarm/AlarmSettingsPage.qml:278
67 msgid "Change time and date"
68 msgstr ""
69
70@@ -141,6 +141,10 @@
71 msgid "Delete alarm"
72 msgstr ""
73
74+#: ../app/clock/ClockPage.qml:134
75+msgid "Location"
76+msgstr ""
77+
78 #: ../app/worldclock/AddWorldCityButton.qml:30
79 msgid "Add"
80 msgstr ""
81@@ -190,23 +194,23 @@
82 msgid "Select a city"
83 msgstr ""
84
85-#: ../app/worldclock/WorldCityList.qml:78
86+#: ../app/worldclock/WorldCityList.qml:79
87 msgid "Search..."
88 msgstr ""
89
90-#: ../app/worldclock/WorldCityList.qml:155
91+#: ../app/worldclock/WorldCityList.qml:156
92 msgid "Searching for a city"
93 msgstr ""
94
95-#: ../app/worldclock/WorldCityList.qml:160
96+#: ../app/worldclock/WorldCityList.qml:161
97 msgid "No City Found"
98 msgstr ""
99
100-#: ../app/worldclock/WorldCityList.qml:166
101+#: ../app/worldclock/WorldCityList.qml:167
102 msgid "Unable to connect."
103 msgstr ""
104
105-#: ../app/worldclock/WorldCityList.qml:167
106+#: ../app/worldclock/WorldCityList.qml:168
107 msgid "Please check your network connection and try again"
108 msgstr ""
109

Subscribers

People subscribed via source and target branches