Ubuntu Weather App

Merge lp:~dpm/ubuntu-weather-app/refresh-translations into lp:ubuntu-weather-app/obsolete.trunk

  1. refresh-translations
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Martin Borho
Approved revision: 126
Merged at revision: 124
Proposed branch: lp:~dpm/ubuntu-weather-app/refresh-translations
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 320 lines (+187/-39)
7 files modified
.bzrignore (+1/-0)
README.translations (+36/-0)
components/LocationManagerSheet.qml (+3/-1)
components/WeatherTemperatureComponent.qml (+4/-2)
po/po.pro (+8/-1)
po/ubuntu-weather-app.pot (+124/-35)
ubuntu-weather-app.qmlproject (+11/-0)
To merge this branch: bzr merge lp:~dpm/ubuntu-weather-app/refresh-translations
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Martin Borho Approve
Review via email: mp+187704@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
Martin Borho (martin-borho) wrote :

Looks good to me, thanks!

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 '.bzrignore'
--- .bzrignore 2013-05-28 12:26:03 +0000
+++ .bzrignore 2013-09-26 09:52:06 +0000
@@ -5,3 +5,4 @@
5debian/*.debhelper.log5debian/*.debhelper.log
6debian/*.substvars6debian/*.substvars
7po/Makefile7po/Makefile
8.build
89
=== added file 'README.translations'
--- README.translations 1970-01-01 00:00:00 +0000
+++ README.translations 2013-09-26 09:52:06 +0000
@@ -0,0 +1,36 @@
1# Updating translations
2
3Translations for the Weather 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# Behind the scenes
21
22Behind the scenes, whenever the po/*.pot file (also known as translations template)
23is committed to trunk Launchpad reads it and updates the translatable strings
24exposed in the web UI. This will enable translators to work on the new strings.
25The translations template contains all translatable strings that have been
26extracted from the source code files.
27
28Launchpad will then store translations in its database and will commit them daily
29in the form of textual po/*.po files to trunk. The PO files are also usually
30referred to as the translations files. You'll find a translation file for each
31language the app has got at least a translated message available for.
32
33Translations for core apps follow the standard [gettext format].
34
35 [Launchpad Translations]: https://translations.launchpad.net/ubuntu-weather-app
36 [gettext format]: https://www.gnu.org/software/gettext/
037
=== modified file 'components/LocationManagerSheet.qml'
--- components/LocationManagerSheet.qml 2013-09-21 18:00:39 +0000
+++ components/LocationManagerSheet.qml 2013-09-26 09:52:06 +0000
@@ -129,7 +129,9 @@
129 objectName: "currentLocationItem"129 objectName: "currentLocationItem"
130 id: lookupItemAddButton130 id: lookupItemAddButton
131 anchors.verticalCenter: parent.verticalCenter131 anchors.verticalCenter: parent.verticalCenter
132 text: i18n.tr("add")132 // TRANSLATORS: this is the button to add a location (city) that has been
133 // detected to be the current position
134 text: i18n.tr("Add")
133 MouseArea {135 MouseArea {
134 anchors.fill: parent136 anchors.fill: parent
135 onClicked: {137 onClicked: {
136138
=== modified file 'components/WeatherTemperatureComponent.qml'
--- components/WeatherTemperatureComponent.qml 2013-09-14 11:46:25 +0000
+++ components/WeatherTemperatureComponent.qml 2013-09-26 09:52:06 +0000
@@ -80,7 +80,8 @@
8080
81 Text {81 Text {
82 id: max82 id: max
83 text: i18n.tr("H: ")+tempComponent.maxTemp83 // TRANSLATORS: this refers to the High (max) temperature forecasted for a day
84 text: i18n.tr("H:") + " " + tempComponent.maxTemp
84 color: Theme.palette.normal.baseText85 color: Theme.palette.normal.baseText
85 style: Text.Raised86 style: Text.Raised
86 font.bold: false87 font.bold: false
@@ -99,7 +100,8 @@
99100
100 Text {101 Text {
101 id: min102 id: min
102 text: i18n.tr("L: ")+tempComponent.minTemp103 // TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
104 text: i18n.tr("L:") + " " + tempComponent.minTemp
103 color: Theme.palette.normal.baseText105 color: Theme.palette.normal.baseText
104 style: Text.Raised106 style: Text.Raised
105 font.bold: false107 font.bold: false
106108
=== modified file 'po/po.pro'
--- po/po.pro 2013-06-12 13:55:03 +0000
+++ po/po.pro 2013-09-26 09:52:06 +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)
@@ -32,7 +39,7 @@
32QMAKE_EXTRA_TARGETS += potfile39QMAKE_EXTRA_TARGETS += potfile
3340
34## Do not use this rule directly. It's a dependency rule to41## Do not use this rule directly. It's a dependency rule to
35## generate an intermediate .h file to extract translatable42## generate an intermediate .js file to extract translatable
36## strings from the .desktop file43## strings from the .desktop file
37desktopfile.target = desktopfile44desktopfile.target = desktopfile
38desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}45desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}
3946
=== modified file 'po/ubuntu-weather-app.pot'
--- po/ubuntu-weather-app.pot 2013-06-12 13:55:03 +0000
+++ po/ubuntu-weather-app.pot 2013-09-26 09:52:06 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-weather-app\n"9"Project-Id-Version: ubuntu-weather-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-06-12 15:54+0200\n"11"POT-Creation-Date: 2013-09-26 07:22+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"
@@ -17,49 +17,138 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../components/AddLocationDialog.qml:1320#: ../components/AddLocationSheet.qml:30
21msgid "Add location"21#: ../components/LocationManagerSheet.qml:215
22msgstr ""22msgid "Add city"
2323msgstr ""
24#: ../components/AddLocationDialog.qml:1424
25msgid "Write a city name or pick it by your location"25#: ../components/AddLocationSheet.qml:77
26msgstr ""26msgid "No location was found for "
2727msgstr ""
28#: ../components/AddLocationDialog.qml:4328
29#: ../components/AddLocationSheet.qml:126
29msgid "Enter a city name"30msgid "Enter a city name"
30msgstr ""31msgstr ""
3132
32#: ../components/AddLocationDialog.qml:6333#: ../components/CurrentWeather.qml:136
33msgid "Use my own location"34msgid "Humidity"
34msgstr ""35msgstr ""
3536
36#: ../components/AddLocationDialog.qml:7537#: ../components/CurrentWeather.qml:152
37msgid "Cancel"38msgid "Wind speed"
38msgstr ""39msgstr ""
3940
40#: ../components/CurrentWeather.qml:5941#: ../components/CurrentWeather.qml:177
41msgid "Max."42msgid "Pressure"
42msgstr ""43msgstr ""
4344
44#: ../components/CurrentWeather.qml:9845#: ../components/CurrentWeather.qml:178
45#: ../components/DayWeatherComponent.qml:5046msgid "mbar"
46msgid "Min."47msgstr ""
47msgstr ""48
4849#: ../components/CurrentWeather.qml:192
49#: ../components/LocationTab.qml:64 ../components/LocationTabEmpty.qml:2050msgid "Precipitation"
51msgstr ""
52
53#: ../components/LastUpdatedComponent.qml:32
54msgid "Updated: "
55msgstr ""
56
57#: ../components/LastUpdatedComponent.qml:36
58msgid "Today, "
59msgstr ""
60
61#: ../components/LoadingSpinnerComponent.qml:44
62msgid "Loading..."
63msgstr ""
64
65#: ../components/LocationManagerSheet.qml:32
66msgid "Edit locations"
67msgstr ""
68
69#: ../components/LocationManagerSheet.qml:84
70msgid "Current location"
71msgstr ""
72
73#: ../components/LocationManagerSheet.qml:102
74msgid "Lookup location"
75msgstr ""
76
77#. TRANSLATORS: this is the button to add a location (city) that has been
78#. detected to be the current position
79#: ../components/LocationManagerSheet.qml:134
50msgid "Add"80msgid "Add"
51msgstr ""81msgstr ""
5282
53#: ../components/LocationTab.qml:7783#: ../components/LocationManagerSheet.qml:150
54msgid "Remove"84msgid "World"
55msgstr ""85msgstr ""
5686
57#: ../components/LocationTab.qml:8787#: ../components/LocationManagerSheet.qml:233
88msgid "Location already added."
89msgstr ""
90
91#: ../components/LocationManagerSheet.qml:235
92msgid "OK"
93msgstr ""
94
95#: ../components/LocationTab.qml:164
96msgid ""
97"No weather data available at the moment, please try to refresh later again!"
98msgstr ""
99
100#: ../components/LocationTab.qml:180
58msgid "Refresh"101msgid "Refresh"
59msgstr ""102msgstr ""
60103
61#: ../components/LocationTabEmpty.qml:8104#: ../components/LocationTab.qml:192
62msgid "No Locations"105msgid "Edit"
106msgstr ""
107
108#: ../components/LocationTab.qml:204 ../components/SettingsSheet.qml:27
109msgid "Settings"
110msgstr ""
111
112#: ../components/SettingsSheet.qml:36
113msgid "Temperature units"
114msgstr ""
115
116#: ../components/SettingsSheet.qml:37
117msgid "Celsius"
118msgstr ""
119
120#: ../components/SettingsSheet.qml:37
121msgid "Fahrenheit"
122msgstr ""
123
124#: ../components/SettingsSheet.qml:43
125msgid "Wind speed units"
126msgstr ""
127
128#: ../components/SettingsSheet.qml:44
129msgid "Kilometers per hour"
130msgstr ""
131
132#: ../components/SettingsSheet.qml:44
133msgid "Miles per hour"
134msgstr ""
135
136#: ../components/SplashComponent.qml:34
137msgid "Couldn't load weather data, please try later again!"
138msgstr ""
139
140#: ../components/SwipeDelete.qml:52 ../components/SwipeDelete.qml:60
141msgid "Delete"
142msgstr ""
143
144#. TRANSLATORS: this refers to the High (max) temperature forecasted for a day
145#: ../components/WeatherTemperatureComponent.qml:84
146msgid "H:"
147msgstr ""
148
149#. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
150#: ../components/WeatherTemperatureComponent.qml:104
151msgid "L:"
63msgstr ""152msgstr ""
64153
65#: ../.build/ubuntu-weather-app.desktop.js:1154#: ../.build/ubuntu-weather-app.desktop.js:1
66155
=== modified file 'ubuntu-weather-app.qmlproject'
--- ubuntu-weather-app.qmlproject 2013-04-24 14:21:46 +0000
+++ ubuntu-weather-app.qmlproject 2013-09-26 09:52:06 +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/x86_64-linux-gnu/qt5/qml" ]30 importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
20}31}

Subscribers

People subscribed via source and target branches