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

Proposed by Victor Thompson on 2014-08-16
Status: Merged
Approved by: Martin Borho on 2014-08-16
Approved revision: 337
Merged at revision: 336
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-1357642-2
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 75 lines (+15/-16)
2 files modified
components/CurrentWeatherDetail.qml (+1/-1)
po/com.ubuntu.weather.pot (+14/-15)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-1357642-2
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-08-16
Martin Borho 2014-08-16 Approve on 2014-08-16
Review via email: mp+231092@code.launchpad.net

Commit message

Update 'chance' translation to workaround Launchpad issue

Description of the change

Update 'chance' translation to workaround Launchpad issue

To post a comment you must log in.
Martin Borho (martin-borho) wrote :

Looks fine now, thanks!

review: Approve
337. By Victor Thompson on 2014-08-16

update pot file

Victor Thompson (vthompson) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
98 Components.WeatherDetailComponent {98 Components.WeatherDetailComponent {
99 value: (currentWeather.propPrecip !== "") ? currentWeather.propPrecip: currentWeather.pressure99 value: (currentWeather.propPrecip !== "") ? currentWeather.propPrecip: currentWeather.pressure
100 measure: (currentWeather.propPrecip !== "") ? getPrecipLabel(): i18n.tr("Pressure")100 measure: (currentWeather.propPrecip !== "") ? getPrecipLabel(): i18n.tr("Pressure")
101 unit: (currentWeather.propPrecip !== "") ? i18n.tr("% chance") : i18n.tr("mbar")101 unit: (currentWeather.propPrecip !== "") ? "% " + i18n.tr("chance") : i18n.tr("mbar")
102 anchors.fill: parent102 anchors.fill: parent
103 }103 }
104 }104 }
105105
=== 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 @@
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: 2014-08-16 12:09+0200\n"11"POT-Creation-Date: 2014-08-16 12:44-0500\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"
@@ -79,8 +79,7 @@
79msgstr ""79msgstr ""
8080
81#: ../components/CurrentWeatherDetail.qml:10181#: ../components/CurrentWeatherDetail.qml:101
82#, c-format82msgid "chance"
83msgid "% chance"
84msgstr ""83msgstr ""
8584
86#: ../components/CurrentWeatherDetail.qml:10185#: ../components/CurrentWeatherDetail.qml:101
@@ -153,27 +152,27 @@
153msgid "Couldn't specify your current location, please try later again!"152msgid "Couldn't specify your current location, please try later again!"
154msgstr ""153msgstr ""
155154
156#: ../components/LocationTab.qml:183155#: ../components/LocationTab.qml:136
157msgid "Forecast"
158msgstr ""
159
160#: ../components/LocationTab.qml:328
161msgid ""
162"No weather data available at the moment, please try to refresh later again!"
163msgstr ""
164
165#: ../components/LocationTab.qml:344
166msgid "Refresh"156msgid "Refresh"
167msgstr ""157msgstr ""
168158
169#: ../components/LocationTab.qml:357159#: ../components/LocationTab.qml:147
170msgid "Edit"160msgid "Edit"
171msgstr ""161msgstr ""
172162
173#: ../components/LocationTab.qml:369 ../components/SettingsSheet.qml:27163#: ../components/LocationTab.qml:157 ../components/SettingsSheet.qml:27
174msgid "Settings"164msgid "Settings"
175msgstr ""165msgstr ""
176166
167#: ../components/LocationTab.qml:218
168msgid "Forecast"
169msgstr ""
170
171#: ../components/LocationTab.qml:363
172msgid ""
173"No weather data available at the moment, please try to refresh later again!"
174msgstr ""
175
177#. TRANSLATORS: this is a date to which a time of the day will be appended176#. TRANSLATORS: this is a date to which a time of the day will be appended
178#: ../components/ScrollingArea.qml:92177#: ../components/ScrollingArea.qml:92
179msgid "dddd, dd MMMM"178msgid "dddd, dd MMMM"

Subscribers

People subscribed via source and target branches