Merge lp:~nik90/ubuntu-clock-app/update-potfile-aug26 into lp:ubuntu-clock-app

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 69
Merged at revision: 68
Proposed branch: lp:~nik90/ubuntu-clock-app/update-potfile-aug26
Merge into: lp:ubuntu-clock-app
Diff against target: 395 lines (+188/-187)
3 files modified
debian/changelog (+1/-0)
po/com.ubuntu.clock.devel.pot (+0/-187)
po/com.ubuntu.clock.pot (+187/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/update-potfile-aug26
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+232226@code.launchpad.net

Commit message

Updated pot file name

Description of the change

Updated pot file name

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-26 11:20:26 +0000
3+++ debian/changelog 2014-08-26 14:08:45 +0000
4@@ -18,6 +18,7 @@
5 incorrectly (LP: #1360677)
6 * Updated QtQuick library imports to v2.3
7 * Switched bzr branch to lp:ubuntu-clock-app
8+ * Updated pot file name
9
10 [Zsombor Egri]
11 * Fixed alarm status toggle being reverted immediately (LP: #1272337)
12
13=== removed file 'po/com.ubuntu.clock.devel.pot'
14--- po/com.ubuntu.clock.devel.pot 2014-08-18 14:16:12 +0000
15+++ po/com.ubuntu.clock.devel.pot 1970-01-01 00:00:00 +0000
16@@ -1,187 +0,0 @@
17-# SOME DESCRIPTIVE TITLE.
18-# Copyright (C) YEAR Canonical Ltd.
19-# This file is distributed under the same license as the PACKAGE package.
20-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
21-#
22-#, fuzzy
23-msgid ""
24-msgstr ""
25-"Project-Id-Version: \n"
26-"Report-Msgid-Bugs-To: \n"
27-"POT-Creation-Date: 2014-08-18 16:15+0200\n"
28-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
29-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
30-"Language-Team: LANGUAGE <LL@li.org>\n"
31-"Language: \n"
32-"MIME-Version: 1.0\n"
33-"Content-Type: text/plain; charset=CHARSET\n"
34-"Content-Transfer-Encoding: 8bit\n"
35-
36-#: ../app/alarm/AlarmLabel.qml:27 ../app/alarm/AlarmLabel.qml:43
37-#: ../app/alarm/EditAlarmPage.qml:268
38-msgid "Label"
39-msgstr ""
40-
41-#: ../app/alarm/AlarmList.qml:81 ../app/alarm/AlarmPage.qml:78
42-#: ../app/worldclock/UserWorldCityList.qml:103
43-msgid "Delete"
44-msgstr ""
45-
46-#: ../app/alarm/AlarmPage.qml:26
47-msgid "Alarms"
48-msgstr ""
49-
50-#: ../app/alarm/AlarmPage.qml:42 ../app/alarm/EditAlarmPage.qml:54
51-msgid "Alarm"
52-msgstr ""
53-
54-#: ../app/alarm/AlarmPage.qml:55
55-msgid "Cancel selection"
56-msgstr ""
57-
58-#: ../app/alarm/AlarmPage.qml:64
59-msgid "Select All"
60-msgstr ""
61-
62-#: ../app/alarm/AlarmRepeat.qml:28 ../app/alarm/EditAlarmPage.qml:258
63-msgid "Repeat"
64-msgstr ""
65-
66-#: ../app/alarm/AlarmSettingsPage.qml:29
67-msgid "Settings"
68-msgstr ""
69-
70-#: ../app/alarm/AlarmSettingsPage.qml:70 ../app/alarm/AlarmSettingsPage.qml:71
71-#: ../app/alarm/AlarmSettingsPage.qml:72 ../app/alarm/AlarmSettingsPage.qml:73
72-#: ../app/alarm/AlarmSettingsPage.qml:136
73-#, qt-format
74-msgid "%1 minutes"
75-msgstr ""
76-
77-#: ../app/alarm/AlarmSettingsPage.qml:93
78-msgid "Alarm volume"
79-msgstr ""
80-
81-#: ../app/alarm/AlarmSettingsPage.qml:135
82-msgid "Silence after"
83-msgstr ""
84-
85-#: ../app/alarm/AlarmSettingsPage.qml:177
86-msgid "Vibration"
87-msgstr ""
88-
89-#: ../app/alarm/AlarmSettingsPage.qml:206
90-msgid "Change time and date"
91-msgstr ""
92-
93-#: ../app/alarm/AlarmSound.qml:26 ../app/alarm/EditAlarmPage.qml:281
94-msgid "Sound"
95-msgstr ""
96-
97-#: ../app/alarm/AlarmUtils.qml:33
98-msgid "Weekdays"
99-msgstr ""
100-
101-#: ../app/alarm/AlarmUtils.qml:37
102-msgid "Weekends"
103-msgstr ""
104-
105-#: ../app/alarm/AlarmUtils.qml:41
106-msgid "Daily"
107-msgstr ""
108-
109-#: ../app/alarm/EditAlarmPage.qml:40
110-msgid "New alarm"
111-msgstr ""
112-
113-#: ../app/alarm/EditAlarmPage.qml:40
114-msgid "Edit alarm"
115-msgstr ""
116-
117-#: ../app/alarm/EditAlarmPage.qml:305
118-msgid "Delete alarm"
119-msgstr ""
120-
121-#: ../app/clock/ClockPage.qml:64
122-msgid "Add"
123-msgstr ""
124-
125-#: ../app/clock/ClockPage.qml:65 ../app/worldclock/WorldCityList.qml:52
126-msgid "City"
127-msgstr ""
128-
129-#: ../app/ubuntu-clock-app.qml:103
130-msgid "Next Alarm in .."
131-msgstr ""
132-
133-#: ../app/worldclock/UserWorldCityDelegate.qml:139
134-msgid "Today"
135-msgstr ""
136-
137-#: ../app/worldclock/UserWorldCityDelegate.qml:143
138-msgid "Tomorrow"
139-msgstr ""
140-
141-#: ../app/worldclock/UserWorldCityDelegate.qml:147
142-msgid "Yesterday"
143-msgstr ""
144-
145-#. TRANSLATORS: this indicates if the time in a world clock
146-#. is behind or ahead of the time at the current location
147-#: ../app/worldclock/UserWorldCityDelegate.qml:152
148-msgid "behind"
149-msgstr ""
150-
151-#: ../app/worldclock/UserWorldCityDelegate.qml:153
152-msgid "ahead"
153-msgstr ""
154-
155-#. TRANSLATORS: the first argument is a day, followed by hour, minute and the
156-#. translation for either 'behind' or 'ahead'
157-#: ../app/worldclock/UserWorldCityDelegate.qml:162
158-#, qt-format
159-msgid ""
160-"%1\n"
161-"%2 h %3 m %4"
162-msgstr ""
163-
164-#. TRANSLATORS: the first argument is a day, followed by hour and the
165-#. translation for either 'behind' or 'ahead'
166-#: ../app/worldclock/UserWorldCityDelegate.qml:172
167-#, qt-format
168-msgid ""
169-"%1\n"
170-"%2 h %3"
171-msgstr ""
172-
173-#: ../app/worldclock/UserWorldCityDelegate.qml:188
174-msgid "No Time Difference"
175-msgstr ""
176-
177-#: ../app/worldclock/WorldCityList.qml:40
178-msgid "Select a city"
179-msgstr ""
180-
181-#: ../app/worldclock/WorldCityList.qml:66
182-msgid "Back"
183-msgstr ""
184-
185-#: ../app/worldclock/WorldCityList.qml:78
186-msgid "Search..."
187-msgstr ""
188-
189-#: ../app/worldclock/WorldCityList.qml:155
190-msgid "Searching for a city"
191-msgstr ""
192-
193-#: ../app/worldclock/WorldCityList.qml:160
194-msgid "No City Found"
195-msgstr ""
196-
197-#: ../app/worldclock/WorldCityList.qml:166
198-msgid "Unable to connect."
199-msgstr ""
200-
201-#: ../app/worldclock/WorldCityList.qml:167
202-msgid "Please check your network connection and try again"
203-msgstr ""
204
205=== added file 'po/com.ubuntu.clock.pot'
206--- po/com.ubuntu.clock.pot 1970-01-01 00:00:00 +0000
207+++ po/com.ubuntu.clock.pot 2014-08-26 14:08:45 +0000
208@@ -0,0 +1,187 @@
209+# SOME DESCRIPTIVE TITLE.
210+# Copyright (C) YEAR Canonical Ltd.
211+# This file is distributed under the same license as the PACKAGE package.
212+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
213+#
214+#, fuzzy
215+msgid ""
216+msgstr ""
217+"Project-Id-Version: \n"
218+"Report-Msgid-Bugs-To: \n"
219+"POT-Creation-Date: 2014-08-26 16:06+0200\n"
220+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
221+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
222+"Language-Team: LANGUAGE <LL@li.org>\n"
223+"Language: \n"
224+"MIME-Version: 1.0\n"
225+"Content-Type: text/plain; charset=CHARSET\n"
226+"Content-Transfer-Encoding: 8bit\n"
227+
228+#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:52
229+#: ../app/alarm/EditAlarmPage.qml:268
230+msgid "Label"
231+msgstr ""
232+
233+#: ../app/alarm/AlarmList.qml:81 ../app/alarm/AlarmPage.qml:78
234+#: ../app/worldclock/UserWorldCityList.qml:103
235+msgid "Delete"
236+msgstr ""
237+
238+#: ../app/alarm/AlarmPage.qml:26
239+msgid "Alarms"
240+msgstr ""
241+
242+#: ../app/alarm/AlarmPage.qml:42 ../app/alarm/EditAlarmPage.qml:54
243+msgid "Alarm"
244+msgstr ""
245+
246+#: ../app/alarm/AlarmPage.qml:55
247+msgid "Cancel selection"
248+msgstr ""
249+
250+#: ../app/alarm/AlarmPage.qml:64
251+msgid "Select All"
252+msgstr ""
253+
254+#: ../app/alarm/AlarmRepeat.qml:28 ../app/alarm/EditAlarmPage.qml:258
255+msgid "Repeat"
256+msgstr ""
257+
258+#: ../app/alarm/AlarmSettingsPage.qml:29
259+msgid "Settings"
260+msgstr ""
261+
262+#: ../app/alarm/AlarmSettingsPage.qml:70 ../app/alarm/AlarmSettingsPage.qml:71
263+#: ../app/alarm/AlarmSettingsPage.qml:72 ../app/alarm/AlarmSettingsPage.qml:73
264+#: ../app/alarm/AlarmSettingsPage.qml:136
265+#, qt-format
266+msgid "%1 minutes"
267+msgstr ""
268+
269+#: ../app/alarm/AlarmSettingsPage.qml:93
270+msgid "Alarm volume"
271+msgstr ""
272+
273+#: ../app/alarm/AlarmSettingsPage.qml:135
274+msgid "Silence after"
275+msgstr ""
276+
277+#: ../app/alarm/AlarmSettingsPage.qml:177
278+msgid "Vibration"
279+msgstr ""
280+
281+#: ../app/alarm/AlarmSettingsPage.qml:206
282+msgid "Change time and date"
283+msgstr ""
284+
285+#: ../app/alarm/AlarmSound.qml:27 ../app/alarm/EditAlarmPage.qml:281
286+msgid "Sound"
287+msgstr ""
288+
289+#: ../app/alarm/AlarmUtils.qml:33
290+msgid "Weekdays"
291+msgstr ""
292+
293+#: ../app/alarm/AlarmUtils.qml:37
294+msgid "Weekends"
295+msgstr ""
296+
297+#: ../app/alarm/AlarmUtils.qml:41
298+msgid "Daily"
299+msgstr ""
300+
301+#: ../app/alarm/EditAlarmPage.qml:40
302+msgid "New alarm"
303+msgstr ""
304+
305+#: ../app/alarm/EditAlarmPage.qml:40
306+msgid "Edit alarm"
307+msgstr ""
308+
309+#: ../app/alarm/EditAlarmPage.qml:305
310+msgid "Delete alarm"
311+msgstr ""
312+
313+#: ../app/clock/ClockPage.qml:64
314+msgid "Add"
315+msgstr ""
316+
317+#: ../app/clock/ClockPage.qml:65 ../app/worldclock/WorldCityList.qml:52
318+msgid "City"
319+msgstr ""
320+
321+#: ../app/ubuntu-clock-app.qml:103
322+msgid "Next Alarm in .."
323+msgstr ""
324+
325+#: ../app/worldclock/UserWorldCityDelegate.qml:139
326+msgid "Today"
327+msgstr ""
328+
329+#: ../app/worldclock/UserWorldCityDelegate.qml:143
330+msgid "Tomorrow"
331+msgstr ""
332+
333+#: ../app/worldclock/UserWorldCityDelegate.qml:147
334+msgid "Yesterday"
335+msgstr ""
336+
337+#. TRANSLATORS: this indicates if the time in a world clock
338+#. is behind or ahead of the time at the current location
339+#: ../app/worldclock/UserWorldCityDelegate.qml:152
340+msgid "behind"
341+msgstr ""
342+
343+#: ../app/worldclock/UserWorldCityDelegate.qml:153
344+msgid "ahead"
345+msgstr ""
346+
347+#. TRANSLATORS: the first argument is a day, followed by hour, minute and the
348+#. translation for either 'behind' or 'ahead'
349+#: ../app/worldclock/UserWorldCityDelegate.qml:162
350+#, qt-format
351+msgid ""
352+"%1\n"
353+"%2 h %3 m %4"
354+msgstr ""
355+
356+#. TRANSLATORS: the first argument is a day, followed by hour and the
357+#. translation for either 'behind' or 'ahead'
358+#: ../app/worldclock/UserWorldCityDelegate.qml:172
359+#, qt-format
360+msgid ""
361+"%1\n"
362+"%2 h %3"
363+msgstr ""
364+
365+#: ../app/worldclock/UserWorldCityDelegate.qml:188
366+msgid "No Time Difference"
367+msgstr ""
368+
369+#: ../app/worldclock/WorldCityList.qml:40
370+msgid "Select a city"
371+msgstr ""
372+
373+#: ../app/worldclock/WorldCityList.qml:66
374+msgid "Back"
375+msgstr ""
376+
377+#: ../app/worldclock/WorldCityList.qml:78
378+msgid "Search..."
379+msgstr ""
380+
381+#: ../app/worldclock/WorldCityList.qml:155
382+msgid "Searching for a city"
383+msgstr ""
384+
385+#: ../app/worldclock/WorldCityList.qml:160
386+msgid "No City Found"
387+msgstr ""
388+
389+#: ../app/worldclock/WorldCityList.qml:166
390+msgid "Unable to connect."
391+msgstr ""
392+
393+#: ../app/worldclock/WorldCityList.qml:167
394+msgid "Please check your network connection and try again"
395+msgstr ""

Subscribers

People subscribed via source and target branches