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

[David Planella]

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

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

[Martin Borho (martin-borho)]

Looks good to me, thanks!

review: Approve

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

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-05-28 12:26:03 +0000
+++ .bzrignore	2013-09-26 09:52:06 +0000
@@ -5,3 +5,4 @@
 debian/*.debhelper.log
 debian/*.substvars
 po/Makefile
+.build

=== 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 @@
+# Updating translations
+
+Translations for the Weather 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!
+
+# Behind the scenes
+
+Behind the scenes, whenever the po/*.pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual po/*.po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations for core apps follow the standard [gettext format].
+
+ [Launchpad Translations]: https://translations.launchpad.net/ubuntu-weather-app
+ [gettext format]: https://www.gnu.org/software/gettext/

=== 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 @@
                     objectName: "currentLocationItem"
                     id: lookupItemAddButton
                     anchors.verticalCenter: parent.verticalCenter
-                    text: i18n.tr("add")
+                    // TRANSLATORS: this is the button to add a location (city) that has been
+                    // detected to be the current position
+                    text: i18n.tr("Add")
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {

=== 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 @@
 
     Text {
         id: max
-        text: i18n.tr("H: ")+tempComponent.maxTemp
+        // TRANSLATORS: this refers to the High (max) temperature forecasted for a day
+        text: i18n.tr("H:") + " " + tempComponent.maxTemp
         color: Theme.palette.normal.baseText
         style: Text.Raised
         font.bold: false
@@ -99,7 +100,8 @@
 
     Text {
         id: min
-        text: i18n.tr("L: ")+tempComponent.minTemp
+        // TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
+        text: i18n.tr("L:") + " " + tempComponent.minTemp
         color: Theme.palette.normal.baseText
         style: Text.Raised
         font.bold: false

=== 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 @@
+## 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)
@@ -32,7 +39,7 @@
 QMAKE_EXTRA_TARGETS += potfile
 
 ## Do not use this rule directly. It's a dependency rule to
-## generate an intermediate .h file to extract translatable
+## generate an intermediate .js file to extract translatable
 ## strings from the .desktop file
 desktopfile.target = desktopfile
 desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}

=== 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 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-12 15:54+0200\n"
+"POT-Creation-Date: 2013-09-26 07:22+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"
@@ -17,49 +17,138 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../components/AddLocationDialog.qml:13
-msgid "Add location"
-msgstr ""
-
-#: ../components/AddLocationDialog.qml:14
-msgid "Write a city name or pick it by your location"
-msgstr ""
-
-#: ../components/AddLocationDialog.qml:43
+#: ../components/AddLocationSheet.qml:30
+#: ../components/LocationManagerSheet.qml:215
+msgid "Add city"
+msgstr ""
+
+#: ../components/AddLocationSheet.qml:77
+msgid "No location was found for "
+msgstr ""
+
+#: ../components/AddLocationSheet.qml:126
 msgid "Enter a city name"
 msgstr ""
 
-#: ../components/AddLocationDialog.qml:63
-msgid "Use my own location"
-msgstr ""
-
-#: ../components/AddLocationDialog.qml:75
-msgid "Cancel"
-msgstr ""
-
-#: ../components/CurrentWeather.qml:59
-msgid "Max."
-msgstr ""
-
-#: ../components/CurrentWeather.qml:98
-#: ../components/DayWeatherComponent.qml:50
-msgid "Min."
-msgstr ""
-
-#: ../components/LocationTab.qml:64 ../components/LocationTabEmpty.qml:20
+#: ../components/CurrentWeather.qml:136
+msgid "Humidity"
+msgstr ""
+
+#: ../components/CurrentWeather.qml:152
+msgid "Wind speed"
+msgstr ""
+
+#: ../components/CurrentWeather.qml:177
+msgid "Pressure"
+msgstr ""
+
+#: ../components/CurrentWeather.qml:178
+msgid "mbar"
+msgstr ""
+
+#: ../components/CurrentWeather.qml:192
+msgid "Precipitation"
+msgstr ""
+
+#: ../components/LastUpdatedComponent.qml:32
+msgid "Updated: "
+msgstr ""
+
+#: ../components/LastUpdatedComponent.qml:36
+msgid "Today, "
+msgstr ""
+
+#: ../components/LoadingSpinnerComponent.qml:44
+msgid "Loading..."
+msgstr ""
+
+#: ../components/LocationManagerSheet.qml:32
+msgid "Edit locations"
+msgstr ""
+
+#: ../components/LocationManagerSheet.qml:84
+msgid "Current location"
+msgstr ""
+
+#: ../components/LocationManagerSheet.qml:102
+msgid "Lookup location"
+msgstr ""
+
+#. TRANSLATORS: this is the button to add a location (city) that has been
+#. detected to be the current position
+#: ../components/LocationManagerSheet.qml:134
 msgid "Add"
 msgstr ""
 
-#: ../components/LocationTab.qml:77
-msgid "Remove"
-msgstr ""
-
-#: ../components/LocationTab.qml:87
+#: ../components/LocationManagerSheet.qml:150
+msgid "World"
+msgstr ""
+
+#: ../components/LocationManagerSheet.qml:233
+msgid "Location already added."
+msgstr ""
+
+#: ../components/LocationManagerSheet.qml:235
+msgid "OK"
+msgstr ""
+
+#: ../components/LocationTab.qml:164
+msgid ""
+"No weather data available at the moment, please try to refresh later again!"
+msgstr ""
+
+#: ../components/LocationTab.qml:180
 msgid "Refresh"
 msgstr ""
 
-#: ../components/LocationTabEmpty.qml:8
-msgid "No Locations"
+#: ../components/LocationTab.qml:192
+msgid "Edit"
+msgstr ""
+
+#: ../components/LocationTab.qml:204 ../components/SettingsSheet.qml:27
+msgid "Settings"
+msgstr ""
+
+#: ../components/SettingsSheet.qml:36
+msgid "Temperature units"
+msgstr ""
+
+#: ../components/SettingsSheet.qml:37
+msgid "Celsius"
+msgstr ""
+
+#: ../components/SettingsSheet.qml:37
+msgid "Fahrenheit"
+msgstr ""
+
+#: ../components/SettingsSheet.qml:43
+msgid "Wind speed units"
+msgstr ""
+
+#: ../components/SettingsSheet.qml:44
+msgid "Kilometers per hour"
+msgstr ""
+
+#: ../components/SettingsSheet.qml:44
+msgid "Miles per hour"
+msgstr ""
+
+#: ../components/SplashComponent.qml:34
+msgid "Couldn't load weather data, please try later again!"
+msgstr ""
+
+#: ../components/SwipeDelete.qml:52 ../components/SwipeDelete.qml:60
+msgid "Delete"
+msgstr ""
+
+#. TRANSLATORS: this refers to the High (max) temperature forecasted for a day
+#: ../components/WeatherTemperatureComponent.qml:84
+msgid "H:"
+msgstr ""
+
+#. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
+#: ../components/WeatherTemperatureComponent.qml:104
+msgid "L:"
 msgstr ""
 
 #: ../.build/ubuntu-weather-app.desktop.js:1

=== 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 @@
     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/x86_64-linux-gnu/qt5/qml" ]
 }