Ubuntu Calendar App

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

  1. pot-improvements
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Mihir Soni
Approved revision: 506
Merged at revision: 504
Proposed branch: lp:~dpm/ubuntu-calendar-app/pot-improvements
Merge into: lp:ubuntu-calendar-app
Diff against target: 339 lines (+78/-55)
8 files modified
.bzrignore (+2/-2)
AllDayEventComponent.qml (+3/-2)
EventRepetition.qml (+9/-2)
README.translations (+4/-7)
RecurrenceLabelDefines.qml (+3/-1)
RemindersModel.qml (+3/-0)
po/CMakeLists.txt (+2/-1)
po/com.ubuntu.calendar.pot (+52/-40)
To merge this branch: bzr merge lp:~dpm/ubuntu-calendar-app/pot-improvements
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+238655@code.launchpad.net

Commit message

Improvements to translatable strings and .pot build

Description of the change

- Improvements to translatable strings for consistence.
- Added translator comments.
- Updated translations template build rule to align to what other core apps do. It no longer is necessary to manually copy the .pot file
- Updated README.translations file accordingly.

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:506
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/927/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1029
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1029/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/485

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

review: Approve (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me.
Thanks David.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2014-06-06 22:12:02 +0000
+++ .bzrignore 2014-10-17 05:52:05 +0000
@@ -1,10 +1,10 @@
1*.qmlproject.user1*.user
2*.desktop.in2*.desktop.in
3*.desktop.in.in.h3*.desktop.in.in.h
4*.click
4debian/files5debian/files
5debian/app-template/6debian/app-template/
6debian/*.debhelper.log7debian/*.debhelper.log
7debian/*.substvars8debian/*.substvars
8.build9.build
9.excludes10.excludes
10CMakeLists.txt.user
1111
=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml 2014-10-15 17:45:35 +0000
+++ AllDayEventComponent.qml 2014-10-17 05:52:05 +0000
@@ -106,10 +106,11 @@
106 // on a given day. "Ev." is short form for "Events".106 // on a given day. "Ev." is short form for "Events".
107 // Please keep the translation of "Ev." to 3 characters only, as the week view107 // Please keep the translation of "Ev." to 3 characters only, as the week view
108 // where it's shown has limited space108 // where it's shown has limited space
109 text = i18n.tr("%1 Ev.").arg(events.length)109 text = i18n.tr("%1 ev.").arg(events.length)
110 } else {110 } else {
111 if( events.length > 1) {111 if( events.length > 1) {
112 text = i18n.tr("%1 All day event", "%1 All day events", events.length).arg(events.length)112 // TRANSLATORS: the argument refers to the number of all day events
113 text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)
113 } else {114 } else {
114 text = events[0].displayLabel;115 text = events[0].displayLabel;
115 }116 }
116117
=== modified file 'EventRepetition.qml'
--- EventRepetition.qml 2014-10-04 04:37:34 +0000
+++ EventRepetition.qml 2014-10-17 05:52:05 +0000
@@ -34,7 +34,11 @@
34 property var isEdit34 property var isEdit
3535
36 visible: false36 visible: false
37 title: i18n.tr("Repeats")37 // TRANSLATORS: this refers to how often a recurrent event repeats
38 // and it is shown as the header of the page to choose repetition
39 // and as the header of the list item that shows the repetition
40 // summary in the page that displays the event details
41 title: i18n.tr("Repeat")
3842
39 EventUtils{43 EventUtils{
40 id:eventUtils44 id:eventUtils
@@ -205,7 +209,10 @@
205 }209 }
206210
207 ListItem.Header{211 ListItem.Header{
208 text:i18n.tr("Recurrences")212 // TRANSLATORS: this refers to how often a recurrent event repeats
213 // and it is shown as the header of the option selector to choose
214 // its repetition
215 text:i18n.tr("Repeats")
209 visible: recurrenceOption.selectedIndex != 0216 visible: recurrenceOption.selectedIndex != 0
210 && limitOptions.selectedIndex == 1217 && limitOptions.selectedIndex == 1
211 }218 }
212219
=== modified file 'README.translations'
--- README.translations 2014-06-10 06:39:31 +0000
+++ README.translations 2014-10-17 05:52:05 +0000
@@ -10,14 +10,11 @@
10translatable messages to translators. So whenever you add new translatable10translatable messages to translators. So whenever you add new translatable
11messages in the code, make sure to follow these steps:11messages in the code, make sure to follow these steps:
1212
13 1. Run click-buddy retaining the build directory:13 1. Run click-buddy (or alternatively use cmake directly). E.g.:
14 `click-buddy --dir . --no-clean`14 `click-buddy --dir .`
15 2. Copy the .pot file from the <build dir> mentioned in the output to your15 2. Commit the generated .pot file:
16 original source:
17 `cp <build dir>/po/*.pot po/`
18 3. Commit the generated .pot file:
19 `bzr commit -m"Updated translation template"`16 `bzr commit -m"Updated translation template"`
20 4. Push the branch and send a merge proposal as usual17 3. Push the branch and send a merge proposal as usual
2118
22And that's it, once the branch lands Launchpad should take care of all the rest!19And that's it, once the branch lands Launchpad should take care of all the rest!
2320
2421
=== modified file 'RecurrenceLabelDefines.qml'
--- RecurrenceLabelDefines.qml 2014-10-04 04:37:34 +0000
+++ RecurrenceLabelDefines.qml 2014-10-17 05:52:05 +0000
@@ -23,7 +23,9 @@
23 property var recurrenceLabel:[i18n.tr("Once"),23 property var recurrenceLabel:[i18n.tr("Once"),
24 i18n.tr("Daily"),24 i18n.tr("Daily"),
25 i18n.tr("On Weekdays"),25 i18n.tr("On Weekdays"),
26 i18n.tr("On %1 , %2 , %3").arg(Qt.locale().dayName(Qt.Monday,Locale.NarrowFormat)).arg(Qt.locale().dayName(Qt.Wednesday,Locale.NarrowFormat)).arg(Qt.locale().dayName(Qt.Friday,Locale.NarrowFormat)),26 // TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday, Tuesday, Thursday"
27 i18n.tr("On %1, %2 ,%3").arg(Qt.locale().dayName(Qt.Monday,Locale.NarrowFormat)).arg(Qt.locale().dayName(Qt.Wednesday,Locale.NarrowFormat)).arg(Qt.locale().dayName(Qt.Friday,Locale.NarrowFormat)),
28 // TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
27 i18n.tr("On %1 and %2").arg(Qt.locale().dayName(Qt.Tuesday,Locale.NarrowFormat)).arg(Qt.locale().dayName(Qt.Thursday,Locale.NarrowFormat)),29 i18n.tr("On %1 and %2").arg(Qt.locale().dayName(Qt.Tuesday,Locale.NarrowFormat)).arg(Qt.locale().dayName(Qt.Thursday,Locale.NarrowFormat)),
28 i18n.tr("Weekly"),30 i18n.tr("Weekly"),
29 i18n.tr("Monthly"),31 i18n.tr("Monthly"),
3032
=== modified file 'RemindersModel.qml'
--- RemindersModel.qml 2014-10-10 17:49:49 +0000
+++ RemindersModel.qml 2014-10-17 05:52:05 +0000
@@ -24,6 +24,9 @@
2424
25 function initialise() {25 function initialise() {
26 reminderModel.append({ "label": i18n.tr("No Reminder"), "value": -1 })26 reminderModel.append({ "label": i18n.tr("No Reminder"), "value": -1 })
27 // TRANSLATORS: this refers to when a reminder should be shown as a notification
28 // in the indicators. "On Event" means that it will be shown right at the time
29 // the event starts, not any time before
27 reminderModel.append({ "label": i18n.tr("On Event"), "value": 0 })30 reminderModel.append({ "label": i18n.tr("On Event"), "value": 0 })
28 reminderModel.append({ "label": i18n.tr("5 minutes"), "value": 300 })31 reminderModel.append({ "label": i18n.tr("5 minutes"), "value": 300 })
29 reminderModel.append({ "label": i18n.tr("15 minutes"), "value": 900 })32 reminderModel.append({ "label": i18n.tr("15 minutes"), "value": 900 })
3033
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt 2014-06-06 22:00:13 +0000
+++ po/CMakeLists.txt 2014-10-17 05:52:05 +0000
@@ -17,7 +17,8 @@
17 --keyword=tr --keyword=tr:1,2 --keyword=N_17 --keyword=tr --keyword=tr:1,2 --keyword=N_
18 --package-name='${PROJECT}'18 --package-name='${PROJECT}'
19 --copyright-holder='Canonical Ltd.'19 --copyright-holder='Canonical Ltd.'
20 ${I18N_SRC_FILES})20 ${I18N_SRC_FILES}
21 COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
2122
22foreach(PO_FILE ${PO_FILES})23foreach(PO_FILE ${PO_FILES})
23 get_filename_component(LANG ${PO_FILE} NAME_WE)24 get_filename_component(LANG ${PO_FILE} NAME_WE)
2425
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2014-10-15 17:46:46 +0000
+++ po/com.ubuntu.calendar.pot 2014-10-17 05:52:05 +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-10-15 23:15+0530\n"11"POT-Creation-Date: 2014-10-17 07:46+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"
@@ -48,13 +48,14 @@
48#. where it's shown has limited space48#. where it's shown has limited space
49#: ../AllDayEventComponent.qml:10949#: ../AllDayEventComponent.qml:109
50#, qt-format50#, qt-format
51msgid "%1 Ev."51msgid "%1 ev."
52msgstr ""52msgstr ""
5353
54#: ../AllDayEventComponent.qml:11254#. TRANSLATORS: the argument refers to the number of all day events
55#: ../AllDayEventComponent.qml:113
55#, qt-format56#, qt-format
56msgid "%1 All day event"57msgid "%1 all day event"
57msgid_plural "%1 All day events"58msgid_plural "%1 all day events"
58msgstr[0] ""59msgstr[0] ""
59msgstr[1] ""60msgstr[1] ""
6061
@@ -117,7 +118,7 @@
117msgid "Delete this"118msgid "Delete this"
118msgstr ""119msgstr ""
119120
120#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:157121#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:159
121msgid "Delete"122msgid "Delete"
122msgstr ""123msgstr ""
123124
@@ -155,54 +156,60 @@
155msgid "Event Details"156msgid "Event Details"
156msgstr ""157msgstr ""
157158
158#: ../EventDetails.qml:65159#. TRANSLATORS: the first parameter refers to the name of event calendar.
160#: ../EventDetails.qml:66
159#, qt-format161#, qt-format
160msgid "%1 Calendar"162msgid "%1 Calendar"
161msgstr ""163msgstr ""
162164
163#: ../EventDetails.qml:103165#. TRANSLATORS: the first parameter refers to event location.
166#: ../EventDetails.qml:105
164#, qt-format167#, qt-format
165msgid "%1"168msgid "%1"
166msgstr ""169msgstr ""
167170
168#: ../EventDetails.qml:111171#. TRANSLATORS: the first parameter refers to number of all day events.
172#: ../EventDetails.qml:113
169#, qt-format173#, qt-format
170msgid "%1 (All Day)"174msgid "%1 (All Day)"
171msgstr ""175msgstr ""
172176
173#: ../EventDetails.qml:170177#: ../EventDetails.qml:172
174msgid "Edit"178msgid "Edit"
175msgstr ""179msgstr ""
176180
177#: ../EventDetails.qml:321 ../NewEvent.qml:535181#: ../EventDetails.qml:323 ../NewEvent.qml:535
178msgid "Guests"182msgid "Guests"
179msgstr ""183msgstr ""
180184
181#: ../EventDetails.qml:364 ../EventReminder.qml:35 ../NewEvent.qml:636185#: ../EventDetails.qml:366 ../EventReminder.qml:35 ../NewEvent.qml:636
182msgid "Reminder"186msgid "Reminder"
183msgstr ""187msgstr ""
184188
185#: ../EventRepetition.qml:37 ../NewEvent.qml:617189#. TRANSLATORS: this refers to how often a recurrent event repeats
186msgid "Repeats"190#. and it is shown as the header of the page to choose repetition
187msgstr ""191#. and as the header of the list item that shows the repetition
188192#. summary in the page that displays the event details
189#: ../EventRepetition.qml:124193#: ../EventRepetition.qml:41 ../EventRepetition.qml:128
190msgid "Repeat"194msgid "Repeat"
191msgstr ""195msgstr ""
192196
193#: ../EventRepetition.qml:143197#: ../EventRepetition.qml:147
194msgid "Repeats On:"198msgid "Repeats On:"
195msgstr ""199msgstr ""
196200
197#: ../EventRepetition.qml:188201#: ../EventRepetition.qml:192
198msgid "Recurring event ends"202msgid "Recurring event ends"
199msgstr ""203msgstr ""
200204
201#: ../EventRepetition.qml:208205#. TRANSLATORS: this refers to how often a recurrent event repeats
202msgid "Recurrences"206#. and it is shown as the header of the option selector to choose
207#. its repetition
208#: ../EventRepetition.qml:215 ../NewEvent.qml:617
209msgid "Repeats"
203msgstr ""210msgstr ""
204211
205#: ../EventRepetition.qml:233212#: ../EventRepetition.qml:240
206msgid "Date"213msgid "Date"
207msgstr ""214msgstr ""
208215
@@ -301,25 +308,27 @@
301msgid "On Weekdays"308msgid "On Weekdays"
302msgstr ""309msgstr ""
303310
304#: ../RecurrenceLabelDefines.qml:26311#. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday, Tuesday, Thursday"
305#, qt-format
306msgid "On %1 , %2 , %3"
307msgstr ""
308
309#: ../RecurrenceLabelDefines.qml:27312#: ../RecurrenceLabelDefines.qml:27
310#, qt-format313#, qt-format
314msgid "On %1, %2 ,%3"
315msgstr ""
316
317#. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
318#: ../RecurrenceLabelDefines.qml:29
319#, qt-format
311msgid "On %1 and %2"320msgid "On %1 and %2"
312msgstr ""321msgstr ""
313322
314#: ../RecurrenceLabelDefines.qml:28323#: ../RecurrenceLabelDefines.qml:30
315msgid "Weekly"324msgid "Weekly"
316msgstr ""325msgstr ""
317326
318#: ../RecurrenceLabelDefines.qml:29327#: ../RecurrenceLabelDefines.qml:31
319msgid "Monthly"328msgid "Monthly"
320msgstr ""329msgstr ""
321330
322#: ../RecurrenceLabelDefines.qml:30331#: ../RecurrenceLabelDefines.qml:32
323msgid "Yearly"332msgid "Yearly"
324msgstr ""333msgstr ""
325334
@@ -327,43 +336,46 @@
327msgid "No Reminder"336msgid "No Reminder"
328msgstr ""337msgstr ""
329338
330#: ../RemindersModel.qml:27339#. TRANSLATORS: this refers to when a reminder should be shown as a notification
340#. in the indicators. "On Event" means that it will be shown right at the time
341#. the event starts, not any time before
342#: ../RemindersModel.qml:30
331msgid "On Event"343msgid "On Event"
332msgstr ""344msgstr ""
333345
334#: ../RemindersModel.qml:28346#: ../RemindersModel.qml:31
335msgid "5 minutes"347msgid "5 minutes"
336msgstr ""348msgstr ""
337349
338#: ../RemindersModel.qml:29350#: ../RemindersModel.qml:32
339msgid "15 minutes"351msgid "15 minutes"
340msgstr ""352msgstr ""
341353
342#: ../RemindersModel.qml:30354#: ../RemindersModel.qml:33
343msgid "30 minutes"355msgid "30 minutes"
344msgstr ""356msgstr ""
345357
346#: ../RemindersModel.qml:31358#: ../RemindersModel.qml:34
347msgid "1 hour"359msgid "1 hour"
348msgstr ""360msgstr ""
349361
350#: ../RemindersModel.qml:32362#: ../RemindersModel.qml:35
351msgid "2 hours"363msgid "2 hours"
352msgstr ""364msgstr ""
353365
354#: ../RemindersModel.qml:33366#: ../RemindersModel.qml:36
355msgid "1 day"367msgid "1 day"
356msgstr ""368msgstr ""
357369
358#: ../RemindersModel.qml:34370#: ../RemindersModel.qml:37
359msgid "2 days"371msgid "2 days"
360msgstr ""372msgstr ""
361373
362#: ../RemindersModel.qml:35374#: ../RemindersModel.qml:38
363msgid "1 week"375msgid "1 week"
364msgstr ""376msgstr ""
365377
366#: ../RemindersModel.qml:36378#: ../RemindersModel.qml:39
367msgid "2 weeks"379msgid "2 weeks"
368msgstr ""380msgstr ""
369381

Subscribers

People subscribed via source and target branches

to status/vote changes: