Ubuntu Calendar App

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

  1. refresh-translations
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 125
Merged at revision: 123
Proposed branch: lp:~dpm/ubuntu-calendar-app/refresh-translations
Merge into: lp:ubuntu-calendar-app
Diff against target: 229 lines (+70/-46)
7 files modified
EventBubble.qml (+2/-0)
NewEvent.qml (+1/-1)
README (+0/-20)
README.translations (+20/-0)
calendar-app.qmlproject (+11/-0)
po/calendar-app.pot (+29/-25)
po/po.pro (+7/-0)
To merge this branch: bzr merge lp:~dpm/ubuntu-calendar-app/refresh-translations
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Olivier Tilloy (community) Approve
Review via email: mp+187705@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good, thanks David.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
38 var timeFormat = i18n.tr("hh:mm");38 var timeFormat = i18n.tr("hh:mm");
39 var startTime = event.startTime.toLocaleTimeString(Qt.locale(), timeFormat)39 var startTime = event.startTime.toLocaleTimeString(Qt.locale(), timeFormat)
40 var endTime = event.endTime.toLocaleTimeString(Qt.locale(), timeFormat)40 var endTime = event.endTime.toLocaleTimeString(Qt.locale(), timeFormat)
41 // TRANSLATORS: the first argument (%1) refers to a start time for an event,
42 // while the second one (%2) refers to the end time
41 var timeString = i18n.tr("%1 - %2").arg(startTime).arg(endTime)43 var timeString = i18n.tr("%1 - %2").arg(startTime).arg(endTime)
4244
43 timeLabel.text = ""45 timeLabel.text = ""
4446
=== 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 @@
168 title: i18n.tr("Error")168 title: i18n.tr("Error")
169 text: ""169 text: ""
170 Button {170 Button {
171 text: i18n.tr("Ok")171 text: i18n.tr("OK")
172 onClicked: PopupUtils.close(errorPopupDialog)172 onClicked: PopupUtils.close(errorPopupDialog)
173 }173 }
174 }174 }
175175
=== modified file 'README'
--- README 2013-06-17 17:30:33 +0000
+++ README 2013-09-26 09:52:21 +0000
@@ -7,23 +7,3 @@
7$ qmlscene calendar.qml7$ qmlscene calendar.qml
88
9To test the application on the device check out the "testrun.sh" script.9To test the application on the device check out the "testrun.sh" script.
10
11# Updating translations
12
13Translations for the Calendar app happen in [Launchpad Translations][] and
14are automatically committed daily on the trunk branch in the po/ folder.
15
16They are then built and installed as part of the package build, so that
17developers don't really need to worry about them.
18
19However, there is one task that needs to be taken care of: exposing new
20translatable messages to translators. So whenever you add new translatable
21messages in the code, make sure to follow these steps:
22
23 1. Change directory to the po/ folder: `cd po`
24 2. Update the translations template: `qmake && make pot`
25 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
26
27And that's it, Launchpad should take care of all the rest
28
29 [Launchpad Translations]: https://translations.launchpad.net/ubuntu-calendar-app
3010
=== 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 @@
1# Updating translations
2
3Translations for the Calendar app happen in [Launchpad Translations][] and
4are automatically committed daily on the trunk branch in the po/ folder.
5
6They are then built and installed as part of the package build, so that
7developers don't really need to worry about them.
8
9However, there is one task that needs to be taken care of: exposing new
10translatable messages to translators. So whenever you add new translatable
11messages in the code, make sure to follow these steps:
12
13 1. Change directory to the po/ folder: `cd po`
14 2. Update the translations template: `qmake && make pot`
15 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
16 4. Push the branch and send a merge proposal as usual
17
18And that's it, once the branch lands Launchpad should take care of all the rest!
19
20 [Launchpad Translations]: https://translations.launchpad.net/ubuntu-calendar-app
021
=== 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 @@
15 ImageFiles {15 ImageFiles {
16 directory: "."16 directory: "."
17 }17 }
18 /* Shows the README files in the project view */
19 Files {
20 filter: "README*"
21 }
22 /* Shows the translation files and the .pro file used to generate the .pot template */
23 Files {
24 filter: "*.po*"
25 }
26 Files {
27 filter: "*.pro"
28 }
18 /* List of plugin directories passed to QML runtime */29 /* List of plugin directories passed to QML runtime */
19 importPaths: [ "." ,"/usr/lib/i386-linux-gnu/qt5/qml/", "/usr/lib/x86_64-linux-gnu/qt5/qml" ]30 importPaths: [ "." ,"/usr/lib/i386-linux-gnu/qt5/qml/", "/usr/lib/x86_64-linux-gnu/qt5/qml" ]
20}31}
2132
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: calendar-app\n"9"Project-Id-Version: calendar-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-08-30 10:23+0200\n"11"POT-Creation-Date: 2013-09-26 07:05+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"
@@ -19,24 +19,26 @@
1919
20#. TRANSLATORS: this is a time formatting string,20#. TRANSLATORS: this is a time formatting string,
21#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions21#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
22#: ../DayView.qml:29 ../TimeLineBackground.qml:22 ../TimeLineView.qml:10322#: ../EventBubble.qml:38
23#: ../WeekView.qml:2723msgid "hh:mm"
24msgid "HH"24msgstr ""
25msgstr ""25
2626#. TRANSLATORS: the first argument (%1) refers to a start time for an event,
27#: ../DiaryView.qml:4327#. while the second one (%2) refers to the end time
28msgid "(+) New Event"28#: ../EventBubble.qml:43
29msgstr ""29#, qt-format
3030msgid "%1 - %2"
31#: ../EventDetails.qml:6931msgstr ""
32
33#: ../EventDetails.qml:70
32msgid "Add invite"34msgid "Add invite"
33msgstr ""35msgstr ""
3436
35#: ../EventDetails.qml:7537#: ../EventDetails.qml:79
36msgid "Edit"38msgid "Edit"
37msgstr ""39msgstr ""
3840
39#: ../EventDetails.qml:15041#: ../EventDetails.qml:153
40msgid "People"42msgid "People"
41msgstr ""43msgstr ""
4244
@@ -68,8 +70,8 @@
68msgid "Error"70msgid "Error"
69msgstr ""71msgstr ""
7072
71#: ../NewEvent.qml:17173#: ../NewEvent.qml:171 ../TimePicker.qml:82
72msgid "Ok"74msgid "OK"
73msgstr ""75msgstr ""
7476
75#: ../NewEvent.qml:17777#: ../NewEvent.qml:177
@@ -80,6 +82,12 @@
80msgid "End time can't be before start time"82msgid "End time can't be before start time"
81msgstr ""83msgstr ""
8284
85#. TRANSLATORS: this is a time formatting string,
86#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
87#: ../TimeLineBackground.qml:18
88msgid "hh ap"
89msgstr ""
90
83#: ../TimePicker.qml:2391#: ../TimePicker.qml:23
84msgid "Time"92msgid "Time"
85msgstr ""93msgstr ""
@@ -96,31 +104,27 @@
96msgid "Cancel"104msgid "Cancel"
97msgstr ""105msgstr ""
98106
99#: ../TimePicker.qml:82107#: ../calendar.qml:56
100msgid "OK"
101msgstr ""
102
103#: ../calendar.qml:52
104msgid "New Event"108msgid "New Event"
105msgstr ""109msgstr ""
106110
107#: ../calendar.qml:60111#: ../calendar.qml:64
108msgid "Today"112msgid "Today"
109msgstr ""113msgstr ""
110114
111#: ../calendar.qml:72115#: ../calendar.qml:75
112msgid "Year"116msgid "Year"
113msgstr ""117msgstr ""
114118
115#: ../calendar.qml:93119#: ../calendar.qml:95
116msgid "Month"120msgid "Month"
117msgstr ""121msgstr ""
118122
119#: ../calendar.qml:116123#: ../calendar.qml:108
120msgid "Week"124msgid "Week"
121msgstr ""125msgstr ""
122126
123#: ../calendar.qml:132127#: ../calendar.qml:124
124msgid "Day"128msgid "Day"
125msgstr ""129msgstr ""
126130
127131
=== 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 @@
1## This .pro file is used to create a Makefile with the necessary rules
2## to create an initial translations template and to update it whenever
3## there are new translatable strings in the project that are ready to be
4## exposed to translators
5##
6## See the ../README.translations file for more information
7
1TEMPLATE = subdirs8TEMPLATE = subdirs
29
3PROJECTNAME = $$system(basename ../*.qmlproject)10PROJECTNAME = $$system(basename ../*.qmlproject)

Subscribers

People subscribed via source and target branches

to status/vote changes: