Merge lp:~dpm/ubuntu-calendar-app/refresh-translations into lp:ubuntu-calendar-app

[David Planella]

Updated translatable strings, a couple of small fixes to ease translations

Updated translatable strings, a couple of small fixes to ease translations

[Olivier Tilloy (osomon)]

Looks good, thanks David.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2013-09-05 13:07:06 +0000
+++ EventBubble.qml	2013-09-26 09:52:21 +0000
@@ -38,6 +38,8 @@
         var timeFormat = i18n.tr("hh:mm");
         var startTime = event.startTime.toLocaleTimeString(Qt.locale(), timeFormat)
         var endTime = event.endTime.toLocaleTimeString(Qt.locale(), timeFormat)
+        // TRANSLATORS: the first argument (%1) refers to a start time for an event,
+        // while the second one (%2) refers to the end time
         var timeString = i18n.tr("%1 - %2").arg(startTime).arg(endTime)
 
         timeLabel.text = ""

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2013-08-30 08:24:51 +0000
+++ NewEvent.qml	2013-09-26 09:52:21 +0000
@@ -168,7 +168,7 @@
                 title: i18n.tr("Error")
                 text: ""
                 Button {
-                    text: i18n.tr("Ok")
+                    text: i18n.tr("OK")
                     onClicked: PopupUtils.close(errorPopupDialog)
                 }
             }

=== modified file 'README'
--- README	2013-06-17 17:30:33 +0000
+++ README	2013-09-26 09:52:21 +0000
@@ -7,23 +7,3 @@
 $ qmlscene calendar.qml
 
 To test the application on the device check out the "testrun.sh" script.
-
-# Updating translations
-
-Translations for the Calendar app happen in [Launchpad Translations][] and
-are automatically committed daily on the trunk branch in the po/ folder.
-
-They are then built and installed as part of the package build, so that
-developers don't really need to worry about them.
-
-However, there is one task that needs to be taken care of: exposing new
-translatable messages to translators. So whenever you add new translatable
-messages in the code, make sure to follow these steps:
-
- 1. Change directory to the po/ folder: `cd po`
- 2. Update the translations template: `qmake && make pot`
- 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
-
-And that's it, Launchpad should take care of all the rest
-
- [Launchpad Translations]: https://translations.launchpad.net/ubuntu-calendar-app

=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2013-09-26 09:52:21 +0000
@@ -0,0 +1,20 @@
+# Updating translations
+
+Translations for the Calendar app happen in [Launchpad Translations][] and
+are automatically committed daily on the trunk branch in the po/ folder.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+translatable messages to translators. So whenever you add new translatable
+messages in the code, make sure to follow these steps:
+
+ 1. Change directory to the po/ folder: `cd po`
+ 2. Update the translations template: `qmake && make pot`
+ 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
+ 4. 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!
+
+ [Launchpad Translations]: https://translations.launchpad.net/ubuntu-calendar-app

=== modified file 'calendar-app.qmlproject'
--- calendar-app.qmlproject	2013-07-18 18:44:27 +0000
+++ calendar-app.qmlproject	2013-09-26 09:52:21 +0000
@@ -15,6 +15,17 @@
     ImageFiles {
         directory: "."
     }
+    /* Shows the README files in the project view */
+    Files {
+        filter: "README*"
+    }
+    /* Shows the translation files and the .pro file used to generate the .pot template */
+    Files {
+        filter: "*.po*"
+    }
+    Files {
+        filter: "*.pro"
+    }
     /* List of plugin directories passed to QML runtime */
     importPaths: [ "." ,"/usr/lib/i386-linux-gnu/qt5/qml/", "/usr/lib/x86_64-linux-gnu/qt5/qml" ]
 }

=== modified file 'po/calendar-app.pot'
--- po/calendar-app.pot	2013-08-30 08:25:04 +0000
+++ po/calendar-app.pot	2013-09-26 09:52:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: calendar-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-30 10:23+0200\n"
+"POT-Creation-Date: 2013-09-26 07:05+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"
@@ -19,24 +19,26 @@
 
 #. TRANSLATORS: this is a time formatting string,
 #. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-#: ../DayView.qml:29 ../TimeLineBackground.qml:22 ../TimeLineView.qml:103
-#: ../WeekView.qml:27
-msgid "HH"
-msgstr ""
-
-#: ../DiaryView.qml:43
-msgid "(+) New Event"
-msgstr ""
-
-#: ../EventDetails.qml:69
+#: ../EventBubble.qml:38
+msgid "hh:mm"
+msgstr ""
+
+#. TRANSLATORS: the first argument (%1) refers to a start time for an event,
+#. while the second one (%2) refers to the end time
+#: ../EventBubble.qml:43
+#, qt-format
+msgid "%1 - %2"
+msgstr ""
+
+#: ../EventDetails.qml:70
 msgid "Add invite"
 msgstr ""
 
-#: ../EventDetails.qml:75
+#: ../EventDetails.qml:79
 msgid "Edit"
 msgstr ""
 
-#: ../EventDetails.qml:150
+#: ../EventDetails.qml:153
 msgid "People"
 msgstr ""
 
@@ -68,8 +70,8 @@
 msgid "Error"
 msgstr ""
 
-#: ../NewEvent.qml:171
-msgid "Ok"
+#: ../NewEvent.qml:171 ../TimePicker.qml:82
+msgid "OK"
 msgstr ""
 
 #: ../NewEvent.qml:177
@@ -80,6 +82,12 @@
 msgid "End time can't be before start time"
 msgstr ""
 
+#. TRANSLATORS: this is a time formatting string,
+#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+#: ../TimeLineBackground.qml:18
+msgid "hh ap"
+msgstr ""
+
 #: ../TimePicker.qml:23
 msgid "Time"
 msgstr ""
@@ -96,31 +104,27 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../TimePicker.qml:82
-msgid "OK"
-msgstr ""
-
-#: ../calendar.qml:52
+#: ../calendar.qml:56
 msgid "New Event"
 msgstr ""
 
-#: ../calendar.qml:60
+#: ../calendar.qml:64
 msgid "Today"
 msgstr ""
 
-#: ../calendar.qml:72
+#: ../calendar.qml:75
 msgid "Year"
 msgstr ""
 
-#: ../calendar.qml:93
+#: ../calendar.qml:95
 msgid "Month"
 msgstr ""
 
-#: ../calendar.qml:116
+#: ../calendar.qml:108
 msgid "Week"
 msgstr ""
 
-#: ../calendar.qml:132
+#: ../calendar.qml:124
 msgid "Day"
 msgstr ""
 

=== modified file 'po/po.pro'
--- po/po.pro	2013-06-12 18:18:46 +0000
+++ po/po.pro	2013-09-26 09:52:21 +0000
@@ -1,3 +1,10 @@
+## This .pro file is used to create a Makefile with the necessary rules
+## to create an initial translations template and to update it whenever
+## there are new translatable strings in the project that are ready to be
+## exposed to translators
+##
+## See the ../README.translations file for more information
+
 TEMPLATE = subdirs
 
 PROJECTNAME = $$system(basename ../*.qmlproject)