Ubuntu Calendar App

Merge lp:~dpm/ubuntu-calendar-app/update-pot into lp:ubuntu-calendar-app

  1. update-pot
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Mihir Soni
Approved revision: 470
Merged at revision: 471
Proposed branch: lp:~dpm/ubuntu-calendar-app/update-pot
Merge into: lp:ubuntu-calendar-app
Diff against target: 434 lines (+98/-134)
1 file modified
po/com.ubuntu.calendar.pot (+98/-134)
To merge this branch: bzr merge lp:~dpm/ubuntu-calendar-app/update-pot
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Mihir Soni Approve
Review via email: mp+235565@code.launchpad.net

Commit message

Update the .pot file for translators in light of the recent changes in strings.

Description of the change

A trivial one: update the .pot file for translators in light of the recent changes in strings.

To post a comment you must log in.
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me.
Thanks david for MR.

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

PASSED: Continuous integration, rev:470
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/853/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/469
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/469/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/411

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/853/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 'po/com.ubuntu.calendar.pot'
2--- po/com.ubuntu.calendar.pot 2014-09-16 07:39:40 +0000
3+++ po/com.ubuntu.calendar.pot 2014-09-23 06:29:40 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-09-16 09:39+0200\n"
9+"POT-Creation-Date: 2014-09-23 08:25+0200\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -18,31 +18,26 @@
14 "Content-Transfer-Encoding: 8bit\n"
15 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
16
17-#: ../AgendaView.qml:72
18+#: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
19+#: ../WeekView.qml:42 ../YearView.qml:36
20+msgid "Today"
21+msgstr ""
22+
23+#: ../AgendaView.qml:90
24 msgid "No upcoming events"
25 msgstr ""
26
27-#: ../AgendaView.qml:75
28+#: ../AgendaView.qml:93
29 msgid "You have no calendars enabled"
30 msgstr ""
31
32-#: ../AgendaView.qml:85
33+#: ../AgendaView.qml:103
34 msgid "Enable calendars"
35 msgstr ""
36
37-#. TRANSLATORS: this is a time formatting string,
38-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions
39-#: ../AgendaView.qml:143 ../EventBubble.qml:90 ../EventDetails.qml:151
40-msgid "hh:mm"
41-msgstr ""
42-
43-#: ../AgendaView.qml:144
44-msgid "dddd , d MMMM"
45-msgstr ""
46-
47 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
48 #. while the second one (%2) refers to the end time
49-#: ../AgendaView.qml:151 ../EventBubble.qml:95
50+#: ../AgendaView.qml:165 ../EventBubble.qml:92
51 #, qt-format
52 msgid "%1 - %2"
53 msgstr ""
54@@ -58,10 +53,12 @@
55
56 #: ../AllDayEventComponent.qml:118
57 #, qt-format
58-msgid "%1 All day events"
59-msgstr ""
60+msgid "%1 All day event"
61+msgid_plural "%1 All day events"
62+msgstr[0] ""
63+msgstr[1] ""
64
65-#: ../CalendarChoicePopup.qml:32 ../calendar.qml:332
66+#: ../CalendarChoicePopup.qml:32 ../EventActions.qml:42
67 msgid "Calendars"
68 msgstr ""
69
70@@ -69,15 +66,11 @@
71 msgid "Back"
72 msgstr ""
73
74-#: ../CalendarChoicePopup.qml:44 ../NewEvent.qml:66
75-msgid "Save"
76-msgstr ""
77-
78 #: ../ColorPickerDialog.qml:24
79 msgid "Select Color"
80 msgstr ""
81
82-#: ../ColorPickerDialog.qml:54 ../DeleteConfirmationDialog.qml:59
83+#: ../ColorPickerDialog.qml:53 ../DeleteConfirmationDialog.qml:59
84 #: ../EditEventConfirmationDialog.qml:52
85 msgid "Cancel"
86 msgstr ""
87@@ -90,6 +83,16 @@
88 msgid "Search contact"
89 msgstr ""
90
91+#. TRANSLATORS: this is a time formatting string,
92+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
93+#. It's used in the header of the day view
94+#. TRANSLATORS: this is a date formatting string,
95+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions
96+#. It's used to display the date in the event details view
97+#: ../DayView.qml:68 ../EventDetails.qml:128
98+msgid "MMMM dd, yyyy"
99+msgstr ""
100+
101 #: ../DeleteConfirmationDialog.qml:31
102 msgid "Delete Recurring Event"
103 msgstr ""
104@@ -106,11 +109,11 @@
105 msgid "Delete this"
106 msgstr ""
107
108-#: ../DeleteConfirmationDialog.qml:50 ../EventDetails.qml:212
109+#: ../DeleteConfirmationDialog.qml:50 ../EventDetails.qml:187
110 msgid "Delete"
111 msgstr ""
112
113-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:282
114+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:273
115 msgid "Edit Event"
116 msgstr ""
117
118@@ -122,109 +125,75 @@
119 msgid "Edit this"
120 msgstr ""
121
122-#: ../EventDetails.qml:44 ../NewEvent.qml:453
123+#: ../EventActions.qml:33 ../NewEvent.qml:273
124+msgid "New Event"
125+msgstr ""
126+
127+#: ../EventActions.qml:53
128+msgid "Sync"
129+msgstr ""
130+
131+#: ../EventActions.qml:53
132+msgid "Syncing"
133+msgstr ""
134+
135+#: ../EventDetails.qml:44 ../NewEvent.qml:445
136 msgid "Event Details"
137 msgstr ""
138
139-#: ../EventDetails.qml:72 ../LimitLabelDefines.qml:21
140-msgid "Never"
141-msgstr ""
142-
143-#. TRANSLATORS: this is a date shown in the event details view,
144-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details
145-#: ../EventDetails.qml:76 ../EventUtils.qml:81
146-msgid "ddd MMMM d yyyy"
147-msgstr ""
148-
149-#: ../EventDetails.qml:79
150-#, qt-format
151-msgid "After %1 Occurrence"
152-msgid_plural "After %1 Occurrences"
153-msgstr[0] ""
154-msgstr[1] ""
155-
156-#: ../EventDetails.qml:80
157-#, qt-format
158-msgid "After Date %1"
159-msgstr ""
160-
161-#. TRANSLATORS: the argument is a day of the week or a list of days
162-#: ../EventDetails.qml:92
163-#, qt-format
164-msgid "Every %1"
165-msgstr ""
166-
167-#: ../EventDetails.qml:143
168+#: ../EventDetails.qml:114
169 msgid "Not specified"
170 msgstr ""
171
172-#. TRANSLATORS: this is a time & Date formatting string,
173-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details
174-#: ../EventDetails.qml:154
175-msgid "dd-MMM-yyyy"
176-msgstr ""
177-
178-#: ../EventDetails.qml:227
179+#: ../EventDetails.qml:202
180 msgid "Edit"
181 msgstr ""
182
183-#: ../EventDetails.qml:290 ../EventRepetition.qml:230
184+#: ../EventDetails.qml:268 ../EventRepetition.qml:232
185 msgid "Date"
186 msgstr ""
187
188-#: ../EventDetails.qml:295
189+#: ../EventDetails.qml:273
190 msgid "Start"
191 msgstr ""
192
193-#: ../EventDetails.qml:300
194+#: ../EventDetails.qml:278
195 msgid "End"
196 msgstr ""
197
198-#: ../EventDetails.qml:309
199-msgid "All Day event:"
200+#: ../EventDetails.qml:287 ../NewEvent.qml:430
201+msgid "All day event"
202 msgstr ""
203
204-#: ../EventDetails.qml:358 ../NewEvent.qml:492
205+#: ../EventDetails.qml:336 ../NewEvent.qml:484
206 msgid "Location"
207 msgstr ""
208
209-#: ../EventDetails.qml:384 ../NewEvent.qml:539
210+#: ../EventDetails.qml:362 ../NewEvent.qml:531
211 msgid "Guests"
212 msgstr ""
213
214-#: ../EventDetails.qml:422
215-msgid "This happens"
216-msgstr ""
217-
218-#: ../EventDetails.qml:427
219-msgid "Remind me"
220-msgstr ""
221-
222-#: ../EventDetails.qml:432
223-msgid "Repeats On"
224-msgstr ""
225-
226-#: ../EventDetails.qml:438
227-msgid "Repetition Ends"
228-msgstr ""
229-
230-#: ../EventReminder.qml:37 ../EventReminder.qml:71 ../NewEvent.qml:626
231+#: ../EventDetails.qml:400 ../EventRepetition.qml:36 ../NewEvent.qml:605
232+msgid "Repeats"
233+msgstr ""
234+
235+#: ../EventDetails.qml:405 ../EventReminder.qml:35 ../NewEvent.qml:622
236 msgid "Reminder"
237 msgstr ""
238
239-#: ../EventRepetition.qml:36 ../EventRepetition.qml:121
240+#: ../EventRepetition.qml:123
241 msgid "Repeat"
242 msgstr ""
243
244-#: ../EventRepetition.qml:140
245+#: ../EventRepetition.qml:142
246 msgid "Repeats On:"
247 msgstr ""
248
249-#: ../EventRepetition.qml:185
250+#: ../EventRepetition.qml:187
251 msgid "Recurring event ends"
252 msgstr ""
253
254-#: ../EventRepetition.qml:205
255+#: ../EventRepetition.qml:207
256 msgid "Recurrences"
257 msgstr ""
258
259@@ -239,6 +208,10 @@
260 msgstr ""
261
262 #: ../LimitLabelDefines.qml:21
263+msgid "Never"
264+msgstr ""
265+
266+#: ../LimitLabelDefines.qml:21
267 msgid "After X Occurrence"
268 msgstr ""
269
270@@ -246,50 +219,53 @@
271 msgid "After Date"
272 msgstr ""
273
274-#: ../NewEvent.qml:170
275+#. TRANSLATORS: this is a time formatting string,
276+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
277+#. It's used in the header of the month and week views
278+#: ../MonthView.qml:56 ../WeekView.qml:60
279+msgid "MMMM yyyy"
280+msgstr ""
281+
282+#: ../NewEvent.qml:59
283+msgid "Save"
284+msgstr ""
285+
286+#: ../NewEvent.qml:161
287 msgid "End time can't be before start time"
288 msgstr ""
289
290-#: ../NewEvent.qml:282 ../calendar.qml:323
291-msgid "New Event"
292-msgstr ""
293-
294-#: ../NewEvent.qml:292
295+#: ../NewEvent.qml:283
296 msgid "Error"
297 msgstr ""
298
299-#: ../NewEvent.qml:294
300+#: ../NewEvent.qml:285
301 msgid "OK"
302 msgstr ""
303
304-#: ../NewEvent.qml:345
305+#: ../NewEvent.qml:336
306 msgid "From"
307 msgstr ""
308
309-#: ../NewEvent.qml:388
310+#: ../NewEvent.qml:380
311 msgid "To"
312 msgstr ""
313
314-#: ../NewEvent.qml:466
315+#: ../NewEvent.qml:458
316 msgid "Event Name"
317 msgstr ""
318
319-#: ../NewEvent.qml:479
320+#: ../NewEvent.qml:471
321 msgid "Description"
322 msgstr ""
323
324-#: ../NewEvent.qml:501 com.ubuntu.calendar_calendar.desktop.in.in.h:1
325+#: ../NewEvent.qml:493 com.ubuntu.calendar_calendar.desktop.in.in.h:1
326 msgid "Calendar"
327 msgstr ""
328
329-#: ../NewEvent.qml:543
330+#: ../NewEvent.qml:535
331 msgid "Add Guest"
332 msgstr ""
333
334-#: ../NewEvent.qml:612
335-msgid "This Happens"
336-msgstr ""
337-
338 #: ../RecurrenceLabelDefines.qml:23
339 msgid "Once"
340 msgstr ""
341@@ -322,43 +298,43 @@
342 msgid "Yearly"
343 msgstr ""
344
345-#: ../ReminderLabelDefines.qml:21
346+#: ../RemindersModel.qml:26
347 msgid "No Reminder"
348 msgstr ""
349
350-#: ../ReminderLabelDefines.qml:22
351+#: ../RemindersModel.qml:27
352 msgid "5 minutes"
353 msgstr ""
354
355-#: ../ReminderLabelDefines.qml:23
356+#: ../RemindersModel.qml:28
357 msgid "15 minutes"
358 msgstr ""
359
360-#: ../ReminderLabelDefines.qml:24
361+#: ../RemindersModel.qml:29
362 msgid "30 minutes"
363 msgstr ""
364
365-#: ../ReminderLabelDefines.qml:25
366+#: ../RemindersModel.qml:30
367 msgid "1 hour"
368 msgstr ""
369
370-#: ../ReminderLabelDefines.qml:26
371+#: ../RemindersModel.qml:31
372 msgid "2 hours"
373 msgstr ""
374
375-#: ../ReminderLabelDefines.qml:27
376+#: ../RemindersModel.qml:32
377 msgid "1 day"
378 msgstr ""
379
380-#: ../ReminderLabelDefines.qml:28
381+#: ../RemindersModel.qml:33
382 msgid "2 days"
383 msgstr ""
384
385-#: ../ReminderLabelDefines.qml:29
386+#: ../RemindersModel.qml:34
387 msgid "1 week"
388 msgstr ""
389
390-#: ../ReminderLabelDefines.qml:30
391+#: ../RemindersModel.qml:35
392 msgid "2 weeks"
393 msgstr ""
394
395@@ -369,35 +345,23 @@
396 "about them"
397 msgstr ""
398
399-#: ../calendar.qml:304
400-msgid "Today"
401-msgstr ""
402-
403-#: ../calendar.qml:343
404-msgid "Sync"
405-msgstr ""
406-
407-#: ../calendar.qml:343
408-msgid "Syncing"
409-msgstr ""
410-
411-#: ../calendar.qml:376
412+#: ../calendar.qml:326
413 msgid "Year"
414 msgstr ""
415
416-#: ../calendar.qml:411
417+#: ../calendar.qml:360
418 msgid "Month"
419 msgstr ""
420
421-#: ../calendar.qml:440
422+#: ../calendar.qml:388
423 msgid "Week"
424 msgstr ""
425
426-#: ../calendar.qml:474
427+#: ../calendar.qml:421
428 msgid "Day"
429 msgstr ""
430
431-#: ../calendar.qml:503
432+#: ../calendar.qml:449
433 msgid "Agenda"
434 msgstr ""
435

Subscribers

People subscribed via source and target branches

to status/vote changes: