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

[David Planella]

Improvements to translatable strings and .pot build

- 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.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks David.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-06-06 22:12:02 +0000
+++ .bzrignore	2014-10-17 05:52:05 +0000
@@ -1,10 +1,10 @@
-*.qmlproject.user
+*.user
 *.desktop.in
 *.desktop.in.in.h
+*.click
 debian/files
 debian/app-template/
 debian/*.debhelper.log
 debian/*.substvars
 .build
 .excludes
-CMakeLists.txt.user

=== 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 @@
                         // on a given day. "Ev." is short form for "Events".
                         // Please keep the translation of "Ev." to 3 characters only, as the week view
                         // where it's shown has limited space
-                        text =  i18n.tr("%1 Ev.").arg(events.length)
+                        text =  i18n.tr("%1 ev.").arg(events.length)
                     } else {
                         if( events.length > 1) {
-                           text = i18n.tr("%1 All day event", "%1 All day events", events.length).arg(events.length)
+                           // TRANSLATORS: the argument refers to the number of all day events
+                           text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)
                         } else {
                             text = events[0].displayLabel;
                         }

=== 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 @@
     property var isEdit
 
     visible: false
-    title: i18n.tr("Repeats")
+    // TRANSLATORS: this refers to how often a recurrent event repeats
+    // and it is shown as the header of the page to choose repetition
+    // and as the header of the list item that shows the repetition
+    // summary in the page that displays the event details
+    title: i18n.tr("Repeat")
 
     EventUtils{
         id:eventUtils
@@ -205,7 +209,10 @@
         }
 
         ListItem.Header{
-            text:i18n.tr("Recurrences")
+            // TRANSLATORS: this refers to how often a recurrent event repeats
+            // and it is shown as the header of the option selector to choose
+            // its repetition
+            text:i18n.tr("Repeats")
             visible: recurrenceOption.selectedIndex != 0
                      && limitOptions.selectedIndex == 1
         }

=== 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 @@
 translatable messages to translators. So whenever you add new translatable
 messages in the code, make sure to follow these steps:
 
- 1. Run click-buddy retaining the build directory:
-    `click-buddy --dir . --no-clean`
- 2. Copy the .pot file from the <build dir> mentioned in the output to your
-    original source:
-    `cp <build dir>/po/*.pot po/`
- 3. Commit the generated .pot file:
+ 1. Run click-buddy (or alternatively use cmake directly). E.g.:
+    `click-buddy --dir .`
+ 2. Commit the generated .pot file:
     `bzr commit -m"Updated translation template"`
- 4. Push the branch and send a merge proposal as usual
+ 3. Push the branch and send a merge proposal as usual
 
 And that's it, once the branch lands Launchpad should take care of all the rest!
 

=== 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 @@
     property var recurrenceLabel:[i18n.tr("Once"),
         i18n.tr("Daily"),
         i18n.tr("On Weekdays"),
-        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)),
+        // TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday, Tuesday, Thursday"
+        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)),
+        // TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
         i18n.tr("On %1 and %2").arg(Qt.locale().dayName(Qt.Tuesday,Locale.NarrowFormat)).arg(Qt.locale().dayName(Qt.Thursday,Locale.NarrowFormat)),
         i18n.tr("Weekly"),
         i18n.tr("Monthly"),

=== 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 @@
 
     function initialise() {
         reminderModel.append({ "label": i18n.tr("No Reminder"), "value": -1 })
+        // TRANSLATORS: this refers to when a reminder should be shown as a notification
+        // in the indicators. "On Event" means that it will be shown right at the time
+        // the event starts, not any time before
         reminderModel.append({ "label": i18n.tr("On Event"), "value": 0 })
         reminderModel.append({ "label": i18n.tr("5 minutes"), "value": 300 })
         reminderModel.append({ "label": i18n.tr("15 minutes"), "value": 900 })

=== 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 @@
         --keyword=tr --keyword=tr:1,2 --keyword=N_
         --package-name='${PROJECT}'
         --copyright-holder='Canonical Ltd.'
-        ${I18N_SRC_FILES})
+        ${I18N_SRC_FILES}
+    COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)

=== 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 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 23:15+0530\n"
+"POT-Creation-Date: 2014-10-17 07:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -48,13 +48,14 @@
 #. where it's shown has limited space
 #: ../AllDayEventComponent.qml:109
 #, qt-format
-msgid "%1 Ev."
+msgid "%1 ev."
 msgstr ""
 
-#: ../AllDayEventComponent.qml:112
+#. TRANSLATORS: the argument refers to the number of all day events
+#: ../AllDayEventComponent.qml:113
 #, qt-format
-msgid "%1 All day event"
-msgid_plural "%1 All day events"
+msgid "%1 all day event"
+msgid_plural "%1 all day events"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -117,7 +118,7 @@
 msgid "Delete this"
 msgstr ""
 
-#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:157
+#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:159
 msgid "Delete"
 msgstr ""
 
@@ -155,54 +156,60 @@
 msgid "Event Details"
 msgstr ""
 
-#: ../EventDetails.qml:65
+#. TRANSLATORS: the first parameter refers to the name of event calendar.
+#: ../EventDetails.qml:66
 #, qt-format
 msgid "%1 Calendar"
 msgstr ""
 
-#: ../EventDetails.qml:103
+#. TRANSLATORS: the first parameter refers to event location.
+#: ../EventDetails.qml:105
 #, qt-format
 msgid "%1"
 msgstr ""
 
-#: ../EventDetails.qml:111
+#. TRANSLATORS: the first parameter refers to number of all day events.
+#: ../EventDetails.qml:113
 #, qt-format
 msgid "%1 (All Day)"
 msgstr ""
 
-#: ../EventDetails.qml:170
+#: ../EventDetails.qml:172
 msgid "Edit"
 msgstr ""
 
-#: ../EventDetails.qml:321 ../NewEvent.qml:535
+#: ../EventDetails.qml:323 ../NewEvent.qml:535
 msgid "Guests"
 msgstr ""
 
-#: ../EventDetails.qml:364 ../EventReminder.qml:35 ../NewEvent.qml:636
+#: ../EventDetails.qml:366 ../EventReminder.qml:35 ../NewEvent.qml:636
 msgid "Reminder"
 msgstr ""
 
-#: ../EventRepetition.qml:37 ../NewEvent.qml:617
-msgid "Repeats"
-msgstr ""
-
-#: ../EventRepetition.qml:124
+#. TRANSLATORS: this refers to how often a recurrent event repeats
+#. and it is shown as the header of the page to choose repetition
+#. and as the header of the list item that shows the repetition
+#. summary in the page that displays the event details
+#: ../EventRepetition.qml:41 ../EventRepetition.qml:128
 msgid "Repeat"
 msgstr ""
 
-#: ../EventRepetition.qml:143
+#: ../EventRepetition.qml:147
 msgid "Repeats On:"
 msgstr ""
 
-#: ../EventRepetition.qml:188
+#: ../EventRepetition.qml:192
 msgid "Recurring event ends"
 msgstr ""
 
-#: ../EventRepetition.qml:208
-msgid "Recurrences"
+#. TRANSLATORS: this refers to how often a recurrent event repeats
+#. and it is shown as the header of the option selector to choose
+#. its repetition
+#: ../EventRepetition.qml:215 ../NewEvent.qml:617
+msgid "Repeats"
 msgstr ""
 
-#: ../EventRepetition.qml:233
+#: ../EventRepetition.qml:240
 msgid "Date"
 msgstr ""
 
@@ -301,25 +308,27 @@
 msgid "On Weekdays"
 msgstr ""
 
-#: ../RecurrenceLabelDefines.qml:26
-#, qt-format
-msgid "On %1 , %2 , %3"
-msgstr ""
-
+#. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday, Tuesday, Thursday"
 #: ../RecurrenceLabelDefines.qml:27
 #, qt-format
+msgid "On %1, %2 ,%3"
+msgstr ""
+
+#. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
+#: ../RecurrenceLabelDefines.qml:29
+#, qt-format
 msgid "On %1 and %2"
 msgstr ""
 
-#: ../RecurrenceLabelDefines.qml:28
+#: ../RecurrenceLabelDefines.qml:30
 msgid "Weekly"
 msgstr ""
 
-#: ../RecurrenceLabelDefines.qml:29
+#: ../RecurrenceLabelDefines.qml:31
 msgid "Monthly"
 msgstr ""
 
-#: ../RecurrenceLabelDefines.qml:30
+#: ../RecurrenceLabelDefines.qml:32
 msgid "Yearly"
 msgstr ""
 
@@ -327,43 +336,46 @@
 msgid "No Reminder"
 msgstr ""
 
-#: ../RemindersModel.qml:27
+#. TRANSLATORS: this refers to when a reminder should be shown as a notification
+#. in the indicators. "On Event" means that it will be shown right at the time
+#. the event starts, not any time before
+#: ../RemindersModel.qml:30
 msgid "On Event"
 msgstr ""
 
-#: ../RemindersModel.qml:28
+#: ../RemindersModel.qml:31
 msgid "5 minutes"
 msgstr ""
 
-#: ../RemindersModel.qml:29
+#: ../RemindersModel.qml:32
 msgid "15 minutes"
 msgstr ""
 
-#: ../RemindersModel.qml:30
+#: ../RemindersModel.qml:33
 msgid "30 minutes"
 msgstr ""
 
-#: ../RemindersModel.qml:31
+#: ../RemindersModel.qml:34
 msgid "1 hour"
 msgstr ""
 
-#: ../RemindersModel.qml:32
+#: ../RemindersModel.qml:35
 msgid "2 hours"
 msgstr ""
 
-#: ../RemindersModel.qml:33
+#: ../RemindersModel.qml:36
 msgid "1 day"
 msgstr ""
 
-#: ../RemindersModel.qml:34
+#: ../RemindersModel.qml:37
 msgid "2 days"
 msgstr ""
 
-#: ../RemindersModel.qml:35
+#: ../RemindersModel.qml:38
 msgid "1 week"
 msgstr ""
 
-#: ../RemindersModel.qml:36
+#: ../RemindersModel.qml:39
 msgid "2 weeks"
 msgstr ""