Merge lp:~vthompson/ubuntu-weather-app/fix-1357642-2 into lp:ubuntu-weather-app/obsolete.trunk

[Victor Thompson]

Update 'chance' translation to workaround Launchpad issue

Update 'chance' translation to workaround Launchpad issue

[Martin Borho (martin-borho)]

Looks fine now, thanks!

review: Approve

[lp:~vthompson/ubuntu-weather-app/fix-1357642-2]

337. By Victor Thompson on 2014-08-16

update pot file

[Victor Thompson (vthompson)]

Sorry, Martin. I had to update the .pot file as well.

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

PASSED: Continuous integration, rev:337
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/233/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/53
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/233/rebuild

review: Approve (continuous-integration)

=== modified file 'components/CurrentWeatherDetail.qml'
--- components/CurrentWeatherDetail.qml	2014-08-12 02:39:00 +0000
+++ components/CurrentWeatherDetail.qml	2014-08-16 17:45:25 +0000
@@ -98,7 +98,7 @@
             Components.WeatherDetailComponent {
                 value: (currentWeather.propPrecip !== "") ? currentWeather.propPrecip: currentWeather.pressure
                 measure: (currentWeather.propPrecip !== "") ?  getPrecipLabel(): i18n.tr("Pressure")
-                unit: (currentWeather.propPrecip !== "") ? i18n.tr("% chance") : i18n.tr("mbar")
+                unit: (currentWeather.propPrecip !== "") ? "% " + i18n.tr("chance") : i18n.tr("mbar")
                 anchors.fill: parent
             }
         }

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2014-08-16 10:10:24 +0000
+++ po/com.ubuntu.weather.pot	2014-08-16 17:45:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-16 12:09+0200\n"
+"POT-Creation-Date: 2014-08-16 12:44-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -79,8 +79,7 @@
 msgstr ""
 
 #: ../components/CurrentWeatherDetail.qml:101
-#, c-format
-msgid "% chance"
+msgid "chance"
 msgstr ""
 
 #: ../components/CurrentWeatherDetail.qml:101
@@ -153,27 +152,27 @@
 msgid "Couldn't specify your current location, please try later again!"
 msgstr ""
 
-#: ../components/LocationTab.qml:183
-msgid "Forecast"
-msgstr ""
-
-#: ../components/LocationTab.qml:328
-msgid ""
-"No weather data available at the moment, please try to refresh later again!"
-msgstr ""
-
-#: ../components/LocationTab.qml:344
+#: ../components/LocationTab.qml:136
 msgid "Refresh"
 msgstr ""
 
-#: ../components/LocationTab.qml:357
+#: ../components/LocationTab.qml:147
 msgid "Edit"
 msgstr ""
 
-#: ../components/LocationTab.qml:369 ../components/SettingsSheet.qml:27
+#: ../components/LocationTab.qml:157 ../components/SettingsSheet.qml:27
 msgid "Settings"
 msgstr ""
 
+#: ../components/LocationTab.qml:218
+msgid "Forecast"
+msgstr ""
+
+#: ../components/LocationTab.qml:363
+msgid ""
+"No weather data available at the moment, please try to refresh later again!"
+msgstr ""
+
 #. TRANSLATORS: this is a date to which a time of the day will be appended
 #: ../components/ScrollingArea.qml:92
 msgid "dddd, dd MMMM"