Ubuntu Weather App

Merge lp:~martin-borho/ubuntu-weather-app/fix-1366714-min-max-overlayed into lp:ubuntu-weather-app/obsolete.trunk

  1. fix-1366714-min-max-overlayed
  2. Merge into trunk
Proposed by Martin Borho
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 361
Merged at revision: 361
Proposed branch: lp:~martin-borho/ubuntu-weather-app/fix-1366714-min-max-overlayed
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 191 lines (+35/-35)
2 files modified
components/WeatherTemperatureComponent.qml (+2/-2)
po/com.ubuntu.weather.pot (+33/-33)
To merge this branch: bzr merge lp:~martin-borho/ubuntu-weather-app/fix-1366714-min-max-overlayed
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Weather Developers Pending
Review via email: mp+233916@code.launchpad.net

Commit message

Added message for translators about abbreviations for "L:/H:" "High/Low" temperatures.

Description of the change

Added message for translators about abbreviations for "L:/H:" "High/Low" temperatures.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:361
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/266/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/99
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/72

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/WeatherTemperatureComponent.qml'
2--- components/WeatherTemperatureComponent.qml 2014-09-02 07:21:28 +0000
3+++ components/WeatherTemperatureComponent.qml 2014-09-09 12:51:23 +0000
4@@ -109,7 +109,7 @@
5
6 Text {
7 id: max
8- // TRANSLATORS: this refers to the High (max) temperature forecasted for a day
9+ // TRANSLATORS: this refers to the High (max) temperature forecasted for a day, use 1 character at maximum!
10 text: i18n.tr("H:") + " " + tempComponent.maxTemp
11 color: Theme.palette.normal.baseText
12 style: Text.Raised
13@@ -129,7 +129,7 @@
14
15 Label {
16 id: min
17- // TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
18+ // TRANSLATORS: this refers to the Low (min) temperature forecasted for a day, use 1 character at maximum!
19 text: i18n.tr("L:") + " " + tempComponent.minTemp
20 color: Theme.palette.normal.baseText
21 style: Text.Raised
22
23=== modified file 'po/com.ubuntu.weather.pot'
24--- po/com.ubuntu.weather.pot 2014-09-04 05:56:22 +0000
25+++ po/com.ubuntu.weather.pot 2014-09-09 12:51:23 +0000
26@@ -8,7 +8,7 @@
27 msgstr ""
28 "Project-Id-Version: ubuntu-weather-app\n"
29 "Report-Msgid-Bugs-To: \n"
30-"POT-Creation-Date: 2014-09-03 23:29-0600\n"
31+"POT-Creation-Date: 2014-09-09 14:41+0200\n"
32 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
33 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
34 "Language-Team: LANGUAGE <LL@li.org>\n"
35@@ -17,17 +17,17 @@
36 "Content-Type: text/plain; charset=CHARSET\n"
37 "Content-Transfer-Encoding: 8bit\n"
38
39-#: ../components/AddLocationSheet.qml:33
40-#: ../components/LocationManagerSheet.qml:317
41+#: ../components/AddLocationPage.qml:31
42+#: ../components/LocationManagerPage.qml:372
43 msgid "Add city"
44 msgstr ""
45
46-#: ../components/AddLocationSheet.qml:76
47+#: ../components/AddLocationPage.qml:87
48 #, qt-format
49 msgid "No location was found for %1"
50 msgstr ""
51
52-#: ../components/AddLocationSheet.qml:139
53+#: ../components/AddLocationPage.qml:159
54 msgid "Enter a city name"
55 msgstr ""
56
57@@ -114,41 +114,41 @@
58 msgid "Loading..."
59 msgstr ""
60
61-#: ../components/LocationManagerSheet.qml:33
62+#: ../components/LocationManagerPage.qml:30
63 msgid "Edit locations"
64 msgstr ""
65
66-#: ../components/LocationManagerSheet.qml:122
67+#: ../components/LocationManagerPage.qml:140
68+msgid "Location already added."
69+msgstr ""
70+
71+#: ../components/LocationManagerPage.qml:142
72+msgid "OK"
73+msgstr ""
74+
75+#: ../components/LocationManagerPage.qml:177
76 msgid "Current location"
77 msgstr ""
78
79-#: ../components/LocationManagerSheet.qml:147
80+#: ../components/LocationManagerPage.qml:202
81 msgid "Scan for location"
82 msgstr ""
83
84 #. TRANSLATORS: this is the button to add a location (city) that has been
85 #. detected to be the current position
86-#: ../components/LocationManagerSheet.qml:214
87+#: ../components/LocationManagerPage.qml:269
88 msgid "Add"
89 msgstr ""
90
91-#: ../components/LocationManagerSheet.qml:234
92+#: ../components/LocationManagerPage.qml:289
93 msgid "Locations"
94 msgstr ""
95
96-#: ../components/LocationManagerSheet.qml:329
97+#: ../components/LocationManagerPage.qml:384
98 msgid "Remove a city first."
99 msgstr ""
100
101-#: ../components/LocationManagerSheet.qml:350
102-msgid "Location already added."
103-msgstr ""
104-
105-#: ../components/LocationManagerSheet.qml:352
106-msgid "OK"
107-msgstr ""
108-
109-#: ../components/LocationManagerSheet.qml:405
110+#: ../components/LocationManagerPage.qml:407
111 msgid "Couldn't specify your current location, please try later again!"
112 msgstr ""
113
114@@ -160,7 +160,7 @@
115 msgid "Edit"
116 msgstr ""
117
118-#: ../components/LocationTab.qml:157 ../components/SettingsSheet.qml:27
119+#: ../components/LocationTab.qml:157 ../components/SettingsPage.qml:23
120 msgid "Settings"
121 msgstr ""
122
123@@ -178,43 +178,43 @@
124 msgid "dddd, dd MMMM"
125 msgstr ""
126
127-#: ../components/SettingsSheet.qml:33
128+#: ../components/SettingsPage.qml:56
129 msgid "Celsius"
130 msgstr ""
131
132-#: ../components/SettingsSheet.qml:34
133+#: ../components/SettingsPage.qml:57
134 msgid "Fahrenheit"
135 msgstr ""
136
137-#: ../components/SettingsSheet.qml:41
138+#: ../components/SettingsPage.qml:62
139 msgid "Kilometers per hour"
140 msgstr ""
141
142-#: ../components/SettingsSheet.qml:42
143+#: ../components/SettingsPage.qml:63
144 msgid "Miles per hour"
145 msgstr ""
146
147-#: ../components/SettingsSheet.qml:49
148+#: ../components/SettingsPage.qml:68
149 msgid "Millimeters"
150 msgstr ""
151
152-#: ../components/SettingsSheet.qml:50
153+#: ../components/SettingsPage.qml:69
154 msgid "Inches"
155 msgstr ""
156
157-#: ../components/SettingsSheet.qml:82
158+#: ../components/SettingsPage.qml:113
159 msgid "Temperature units"
160 msgstr ""
161
162-#: ../components/SettingsSheet.qml:94
163+#: ../components/SettingsPage.qml:130
164 msgid "Wind speed units"
165 msgstr ""
166
167-#: ../components/SettingsSheet.qml:106
168+#: ../components/SettingsPage.qml:147
169 msgid "Precipitation units"
170 msgstr ""
171
172-#: ../components/SettingsSheet.qml:133
173+#: ../components/SettingsPage.qml:179
174 msgid "Weather Service"
175 msgstr ""
176
177@@ -230,12 +230,12 @@
178 msgid "Hourly forecast"
179 msgstr ""
180
181-#. TRANSLATORS: this refers to the High (max) temperature forecasted for a day
182+#. TRANSLATORS: this refers to the High (max) temperature forecasted for a day, use 1 character at maximum!
183 #: ../components/WeatherTemperatureComponent.qml:113
184 msgid "H:"
185 msgstr ""
186
187-#. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
188+#. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day, use 1 character at maximum!
189 #: ../components/WeatherTemperatureComponent.qml:133
190 msgid "L:"
191 msgstr ""

Subscribers

People subscribed via source and target branches