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
1=== modified file 'components/CurrentWeatherDetail.qml'
2--- components/CurrentWeatherDetail.qml 2014-08-12 02:39:00 +0000
3+++ components/CurrentWeatherDetail.qml 2014-08-16 17:45:25 +0000
4@@ -98,7 +98,7 @@
5 Components.WeatherDetailComponent {
6 value: (currentWeather.propPrecip !== "") ? currentWeather.propPrecip: currentWeather.pressure
7 measure: (currentWeather.propPrecip !== "") ? getPrecipLabel(): i18n.tr("Pressure")
8- unit: (currentWeather.propPrecip !== "") ? i18n.tr("% chance") : i18n.tr("mbar")
9+ unit: (currentWeather.propPrecip !== "") ? "% " + i18n.tr("chance") : i18n.tr("mbar")
10 anchors.fill: parent
11 }
12 }
13
14=== modified file 'po/com.ubuntu.weather.pot'
15--- po/com.ubuntu.weather.pot 2014-08-16 10:10:24 +0000
16+++ po/com.ubuntu.weather.pot 2014-08-16 17:45:25 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: ubuntu-weather-app\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2014-08-16 12:09+0200\n"
22+"POT-Creation-Date: 2014-08-16 12:44-0500\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -79,8 +79,7 @@
27 msgstr ""
28
29 #: ../components/CurrentWeatherDetail.qml:101
30-#, c-format
31-msgid "% chance"
32+msgid "chance"
33 msgstr ""
34
35 #: ../components/CurrentWeatherDetail.qml:101
36@@ -153,27 +152,27 @@
37 msgid "Couldn't specify your current location, please try later again!"
38 msgstr ""
39
40-#: ../components/LocationTab.qml:183
41-msgid "Forecast"
42-msgstr ""
43-
44-#: ../components/LocationTab.qml:328
45-msgid ""
46-"No weather data available at the moment, please try to refresh later again!"
47-msgstr ""
48-
49-#: ../components/LocationTab.qml:344
50+#: ../components/LocationTab.qml:136
51 msgid "Refresh"
52 msgstr ""
53
54-#: ../components/LocationTab.qml:357
55+#: ../components/LocationTab.qml:147
56 msgid "Edit"
57 msgstr ""
58
59-#: ../components/LocationTab.qml:369 ../components/SettingsSheet.qml:27
60+#: ../components/LocationTab.qml:157 ../components/SettingsSheet.qml:27
61 msgid "Settings"
62 msgstr ""
63
64+#: ../components/LocationTab.qml:218
65+msgid "Forecast"
66+msgstr ""
67+
68+#: ../components/LocationTab.qml:363
69+msgid ""
70+"No weather data available at the moment, please try to refresh later again!"
71+msgstr ""
72+
73 #. TRANSLATORS: this is a date to which a time of the day will be appended
74 #: ../components/ScrollingArea.qml:92
75 msgid "dddd, dd MMMM"

Subscribers

People subscribed via source and target branches