Ubuntu Calendar App

Merge lp:~mihirsoni/ubuntu-calendar-app/updatePotFiles into lp:ubuntu-calendar-app

  1. updatePotFiles
  2. Merge into trunk
Proposed by Mihir Soni
Status: Merged
Approved by: David Planella
Approved revision: 505
Merged at revision: 502
Proposed branch: lp:~mihirsoni/ubuntu-calendar-app/updatePotFiles
Merge into: lp:ubuntu-calendar-app
Diff against target: 394 lines (+119/-90)
3 files modified
AllDayEventComponent.qml (+1/-1)
com.ubuntu.calendar_calendar.desktop.in.in (+1/-1)
po/com.ubuntu.calendar.pot (+117/-88)
To merge this branch: bzr merge lp:~mihirsoni/ubuntu-calendar-app/updatePotFiles
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Needs Fixing
Review via email: mp+238479@code.launchpad.net

Commit message

Updated pot file.

Description of the change

Updated pot file.

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

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

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/923/rebuild

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Just a few comments on some trivial fixes. Thanks!

review: Needs Fixing
lp:~mihirsoni/ubuntu-calendar-app/updatePotFiles updated
502. By Mihir Soni

Removed _ from desktop in file for splash color

503. By Mihir Soni

Updated pot file

504. By Mihir Soni

Added plural in Alldayevent

505. By Mihir Soni

Updated pot

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

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

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/924/rebuild

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

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

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/925/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks, that looks mostly fine, it includes a change to the .desktop for the start screen which is probably unrelated to this changeset and should be taken out

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

oh, in fact you just made the color not-translatable, makes sense, thanks

review: Approve
Revision history for this message
David Planella (dpm) wrote :

LGTM, thanks! Please take care of the inline comments in a separate merge proposal.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AllDayEventComponent.qml'
2--- AllDayEventComponent.qml 2014-09-25 18:52:18 +0000
3+++ AllDayEventComponent.qml 2014-10-15 17:47:07 +0000
4@@ -109,7 +109,7 @@
5 text = i18n.tr("%1 Ev.").arg(events.length)
6 } else {
7 if( events.length > 1) {
8- text = i18n.tr("%1 All day events").arg(events.length)
9+ text = i18n.tr("%1 All day event", "%1 All day events", events.length).arg(events.length)
10 } else {
11 text = events[0].displayLabel;
12 }
13
14=== modified file 'com.ubuntu.calendar_calendar.desktop.in.in'
15--- com.ubuntu.calendar_calendar.desktop.in.in 2014-10-10 17:17:08 +0000
16+++ com.ubuntu.calendar_calendar.desktop.in.in 2014-10-15 17:47:07 +0000
17@@ -10,4 +10,4 @@
18 X-Ubuntu-Touch=true
19 X-Ubuntu-Default-Department-ID=accessories
20 X-Ubuntu-Splash-Show-Header=true
21-_X-Ubuntu-Splash-Color=#f5f5f5
22+X-Ubuntu-Splash-Color=#f5f5f5
23
24=== modified file 'po/com.ubuntu.calendar.pot'
25--- po/com.ubuntu.calendar.pot 2014-09-23 06:25:58 +0000
26+++ po/com.ubuntu.calendar.pot 2014-10-15 17:47:07 +0000
27@@ -8,7 +8,7 @@
28 msgstr ""
29 "Project-Id-Version: \n"
30 "Report-Msgid-Bugs-To: \n"
31-"POT-Creation-Date: 2014-09-23 08:25+0200\n"
32+"POT-Creation-Date: 2014-10-15 23:15+0530\n"
33 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
34 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
35 "Language-Team: LANGUAGE <LL@li.org>\n"
36@@ -46,12 +46,12 @@
37 #. on a given day. "Ev." is short form for "Events".
38 #. Please keep the translation of "Ev." to 3 characters only, as the week view
39 #. where it's shown has limited space
40-#: ../AllDayEventComponent.qml:115
41+#: ../AllDayEventComponent.qml:109
42 #, qt-format
43 msgid "%1 Ev."
44 msgstr ""
45
46-#: ../AllDayEventComponent.qml:118
47+#: ../AllDayEventComponent.qml:112
48 #, qt-format
49 msgid "%1 All day event"
50 msgid_plural "%1 All day events"
51@@ -70,8 +70,8 @@
52 msgid "Select Color"
53 msgstr ""
54
55-#: ../ColorPickerDialog.qml:53 ../DeleteConfirmationDialog.qml:59
56-#: ../EditEventConfirmationDialog.qml:52
57+#: ../ColorPickerDialog.qml:53 ../DeleteConfirmationDialog.qml:60
58+#: ../EditEventConfirmationDialog.qml:53
59 msgid "Cancel"
60 msgstr ""
61
62@@ -85,12 +85,9 @@
63
64 #. TRANSLATORS: this is a time formatting string,
65 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
66-#. It's used in the header of the day view
67-#. TRANSLATORS: this is a date formatting string,
68-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions
69-#. It's used to display the date in the event details view
70-#: ../DayView.qml:68 ../EventDetails.qml:128
71-msgid "MMMM dd, yyyy"
72+#. It's used in the header of the month and week views
73+#: ../DayView.qml:56 ../MonthView.qml:56 ../WeekView.qml:60
74+msgid "MMMM yyyy"
75 msgstr ""
76
77 #: ../DeleteConfirmationDialog.qml:31
78@@ -101,31 +98,48 @@
79 msgid "Delete Event"
80 msgstr ""
81
82-#: ../DeleteConfirmationDialog.qml:39
83+#. TRANSLATORS: argument (%1) refers to an event name.
84+#: ../DeleteConfirmationDialog.qml:36
85+#, qt-format
86+msgid "Delete only this event \"%1\", or all events in the series?"
87+msgstr ""
88+
89+#: ../DeleteConfirmationDialog.qml:37
90+#, qt-format
91+msgid "Are you sure you want to delete the event \"%1\"?"
92+msgstr ""
93+
94+#: ../DeleteConfirmationDialog.qml:40
95 msgid "Delete series"
96 msgstr ""
97
98-#: ../DeleteConfirmationDialog.qml:50
99+#: ../DeleteConfirmationDialog.qml:51
100 msgid "Delete this"
101 msgstr ""
102
103-#: ../DeleteConfirmationDialog.qml:50 ../EventDetails.qml:187
104+#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:157
105 msgid "Delete"
106 msgstr ""
107
108-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:273
109+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:277
110 msgid "Edit Event"
111 msgstr ""
112
113-#: ../EditEventConfirmationDialog.qml:34
114+#. TRANSLATORS: argument (%1) refers to an event name.
115+#: ../EditEventConfirmationDialog.qml:32
116+#, qt-format
117+msgid "Edit only this event \"%1\", or all events in the series?"
118+msgstr ""
119+
120+#: ../EditEventConfirmationDialog.qml:35
121 msgid "Edit series"
122 msgstr ""
123
124-#: ../EditEventConfirmationDialog.qml:43
125+#: ../EditEventConfirmationDialog.qml:44
126 msgid "Edit this"
127 msgstr ""
128
129-#: ../EventActions.qml:33 ../NewEvent.qml:273
130+#: ../EventActions.qml:33 ../NewEvent.qml:277
131 msgid "New Event"
132 msgstr ""
133
134@@ -137,74 +151,82 @@
135 msgid "Syncing"
136 msgstr ""
137
138-#: ../EventDetails.qml:44 ../NewEvent.qml:445
139+#: ../EventDetails.qml:42 ../NewEvent.qml:449
140 msgid "Event Details"
141 msgstr ""
142
143-#: ../EventDetails.qml:114
144-msgid "Not specified"
145-msgstr ""
146-
147-#: ../EventDetails.qml:202
148+#: ../EventDetails.qml:65
149+#, qt-format
150+msgid "%1 Calendar"
151+msgstr ""
152+
153+#: ../EventDetails.qml:103
154+#, qt-format
155+msgid "%1"
156+msgstr ""
157+
158+#: ../EventDetails.qml:111
159+#, qt-format
160+msgid "%1 (All Day)"
161+msgstr ""
162+
163+#: ../EventDetails.qml:170
164 msgid "Edit"
165 msgstr ""
166
167-#: ../EventDetails.qml:268 ../EventRepetition.qml:232
168-msgid "Date"
169-msgstr ""
170-
171-#: ../EventDetails.qml:273
172-msgid "Start"
173-msgstr ""
174-
175-#: ../EventDetails.qml:278
176-msgid "End"
177-msgstr ""
178-
179-#: ../EventDetails.qml:287 ../NewEvent.qml:430
180-msgid "All day event"
181-msgstr ""
182-
183-#: ../EventDetails.qml:336 ../NewEvent.qml:484
184-msgid "Location"
185-msgstr ""
186-
187-#: ../EventDetails.qml:362 ../NewEvent.qml:531
188+#: ../EventDetails.qml:321 ../NewEvent.qml:535
189 msgid "Guests"
190 msgstr ""
191
192-#: ../EventDetails.qml:400 ../EventRepetition.qml:36 ../NewEvent.qml:605
193+#: ../EventDetails.qml:364 ../EventReminder.qml:35 ../NewEvent.qml:636
194+msgid "Reminder"
195+msgstr ""
196+
197+#: ../EventRepetition.qml:37 ../NewEvent.qml:617
198 msgid "Repeats"
199 msgstr ""
200
201-#: ../EventDetails.qml:405 ../EventReminder.qml:35 ../NewEvent.qml:622
202-msgid "Reminder"
203-msgstr ""
204-
205-#: ../EventRepetition.qml:123
206+#: ../EventRepetition.qml:124
207 msgid "Repeat"
208 msgstr ""
209
210-#: ../EventRepetition.qml:142
211+#: ../EventRepetition.qml:143
212 msgid "Repeats On:"
213 msgstr ""
214
215-#: ../EventRepetition.qml:187
216+#: ../EventRepetition.qml:188
217 msgid "Recurring event ends"
218 msgstr ""
219
220-#: ../EventRepetition.qml:207
221+#: ../EventRepetition.qml:208
222 msgid "Recurrences"
223 msgstr ""
224
225-#: ../EventUtils.qml:99
226-#, qt-format
227-msgid "%1 ; %2 times "
228-msgstr ""
229-
230-#: ../EventUtils.qml:100
231-#, qt-format
232-msgid "%1 ; until %2"
233+#: ../EventRepetition.qml:233
234+msgid "Date"
235+msgstr ""
236+
237+#. TRANSLATORS: the argument refers to multiple recurrence of event with count .
238+#. E.g. "Daily; 5 times."
239+#: ../EventUtils.qml:75
240+#, qt-format
241+msgid "%1; %2 time"
242+msgid_plural "%1; %2 times"
243+msgstr[0] ""
244+msgstr[1] ""
245+
246+#. TRANSLATORS: the argument refers to recurrence until user selected date.
247+#. E.g. "Daily; until 12/12/2014."
248+#: ../EventUtils.qml:79
249+#, qt-format
250+msgid "%1; until %2"
251+msgstr ""
252+
253+#. TRANSLATORS: the argument refers to several different days of the week.
254+#. E.g. "Weekly on Mondays, Tuesdays"
255+#: ../EventUtils.qml:102
256+#, qt-format
257+msgid "Weekly on %1"
258 msgstr ""
259
260 #: ../LimitLabelDefines.qml:21
261@@ -219,50 +241,51 @@
262 msgid "After Date"
263 msgstr ""
264
265-#. TRANSLATORS: this is a time formatting string,
266-#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
267-#. It's used in the header of the month and week views
268-#: ../MonthView.qml:56 ../WeekView.qml:60
269-msgid "MMMM yyyy"
270-msgstr ""
271-
272 #: ../NewEvent.qml:59
273 msgid "Save"
274 msgstr ""
275
276-#: ../NewEvent.qml:161
277+#: ../NewEvent.qml:164
278 msgid "End time can't be before start time"
279 msgstr ""
280
281-#: ../NewEvent.qml:283
282+#: ../NewEvent.qml:287
283 msgid "Error"
284 msgstr ""
285
286-#: ../NewEvent.qml:285
287+#: ../NewEvent.qml:289
288 msgid "OK"
289 msgstr ""
290
291-#: ../NewEvent.qml:336
292+#: ../NewEvent.qml:340
293 msgid "From"
294 msgstr ""
295
296-#: ../NewEvent.qml:380
297+#: ../NewEvent.qml:384
298 msgid "To"
299 msgstr ""
300
301-#: ../NewEvent.qml:458
302+#: ../NewEvent.qml:434
303+msgid "All day event"
304+msgstr ""
305+
306+#: ../NewEvent.qml:462
307 msgid "Event Name"
308 msgstr ""
309
310-#: ../NewEvent.qml:471
311+#: ../NewEvent.qml:475
312 msgid "Description"
313 msgstr ""
314
315-#: ../NewEvent.qml:493 com.ubuntu.calendar_calendar.desktop.in.in.h:1
316+#: ../NewEvent.qml:488
317+msgid "Location"
318+msgstr ""
319+
320+#: ../NewEvent.qml:497 com.ubuntu.calendar_calendar.desktop.in.in.h:1
321 msgid "Calendar"
322 msgstr ""
323
324-#: ../NewEvent.qml:535
325+#: ../NewEvent.qml:539
326 msgid "Add Guest"
327 msgstr ""
328
329@@ -279,11 +302,13 @@
330 msgstr ""
331
332 #: ../RecurrenceLabelDefines.qml:26
333-msgid "On Monday, Wednesday and Friday"
334+#, qt-format
335+msgid "On %1 , %2 , %3"
336 msgstr ""
337
338 #: ../RecurrenceLabelDefines.qml:27
339-msgid "On Tuesday and Thursday"
340+#, qt-format
341+msgid "On %1 and %2"
342 msgstr ""
343
344 #: ../RecurrenceLabelDefines.qml:28
345@@ -303,38 +328,42 @@
346 msgstr ""
347
348 #: ../RemindersModel.qml:27
349+msgid "On Event"
350+msgstr ""
351+
352+#: ../RemindersModel.qml:28
353 msgid "5 minutes"
354 msgstr ""
355
356-#: ../RemindersModel.qml:28
357+#: ../RemindersModel.qml:29
358 msgid "15 minutes"
359 msgstr ""
360
361-#: ../RemindersModel.qml:29
362+#: ../RemindersModel.qml:30
363 msgid "30 minutes"
364 msgstr ""
365
366-#: ../RemindersModel.qml:30
367+#: ../RemindersModel.qml:31
368 msgid "1 hour"
369 msgstr ""
370
371-#: ../RemindersModel.qml:31
372+#: ../RemindersModel.qml:32
373 msgid "2 hours"
374 msgstr ""
375
376-#: ../RemindersModel.qml:32
377+#: ../RemindersModel.qml:33
378 msgid "1 day"
379 msgstr ""
380
381-#: ../RemindersModel.qml:33
382+#: ../RemindersModel.qml:34
383 msgid "2 days"
384 msgstr ""
385
386-#: ../RemindersModel.qml:34
387+#: ../RemindersModel.qml:35
388 msgid "1 week"
389 msgstr ""
390
391-#: ../RemindersModel.qml:35
392+#: ../RemindersModel.qml:36
393 msgid "2 weeks"
394 msgstr ""
395

Subscribers

People subscribed via source and target branches

to status/vote changes: