Merge lp:~dpm/ubuntu-weather-app/desktop-i18n-1325626-1318008 into lp:ubuntu-weather-app/obsolete.trunk
- desktop-i18n-1325626-1318008
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Martin Borho |
Approved revision: | 273 |
Merged at revision: | 335 |
Proposed branch: | lp:~dpm/ubuntu-weather-app/desktop-i18n-1325626-1318008 |
Merge into: | lp:ubuntu-weather-app/obsolete.trunk |
Diff against target: |
473 lines (+116/-81) 9 files modified
.bzrignore (+3/-1) CMakeLists.txt (+12/-10) README (+11/-1) README.translations (+3/-6) click/manifest.json.in (+1/-1) com.ubuntu.weather_weather.desktop.in.in (+3/-2) debian/control (+1/-0) po/CMakeLists.txt (+7/-3) po/com.ubuntu.weather.pot (+75/-57) |
To merge this branch: | bzr merge lp:~dpm/ubuntu-weather-app/desktop-i18n-1325626-1318008 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Martin Borho | Approve | ||
Nekhelesh Ramananthan (community) | Approve | ||
Victor Thompson | Approve | ||
Review via email: mp+222417@code.launchpad.net |
Commit message
Added inline translations support in the desktop file, so that its translations are loaded in the click scope.
Description of the change
Added inline translations support in the desktop file, so that its translations are loaded in the click scope.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:270
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Nekhelesh Ramananthan (nik90) wrote : | # |
In my experience, I found that the package "intltool" is not installed by default on trusty. Could you add a line in the README.translations file to first install that package before proceeding to update the .pro file? In the clock app, I have added a step,
1. Ensure you have "intltool" package installed, if not install it:
`sudo apt-get install intltool`
I believe we should also do this in other apps since many devs are not aware of the package name.
Nekhelesh Ramananthan (nik90) wrote : | # |
In the clock app po/CMakeLists.txt file has the following command to copy the generated pot file into the po directory.
# Copy generated pot file into "po" directory
COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_
I believe this needs to be added after the line,
119 --copyright-
120 ${I18N_SRC_FILES})
Nekhelesh Ramananthan (nik90) wrote : | # |
In the following lines, you only seem to be looking at the translation strings in the components folder. Shouldn't this just be *.qml, *.js so that it also checks ubuntu-
34 + RELATIVE ${CMAKE_
35 + components/*.qml components/*.js *.qml)
David Planella (dpm) wrote : | # |
Thanks again for the review, I think I've now addressed all the comments:
- Added intltool installation instructions to the README file (I thought they should rather be there and not on README.
- Added rule to copy the .desktop file
- On the last comment, we're already looking at qml files in the root folder (see the *.qml at the end of the highlighted line 35)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:271
http://
Executed test runs:
FAILURE: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:272
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Victor Thompson (vthompson) wrote : | # |
Code looks good and the change fixes the issue of the app not being translated in the dash. LGTM!
David Planella (dpm) wrote : | # |
Thanks Victor!
Nekhelesh, Martin, are you happy with the changes, and if so, could one of you top-approve?
Nekhelesh Ramananthan (nik90) wrote : | # |
I see the updated translation strings in the .pot file. CMake stuff looks good as well. Approve.
Nekhelesh Ramananthan (nik90) wrote : | # |
> Thanks Victor!
>
> Nekhelesh, Martin, are you happy with the changes, and if so, could one of you
> top-approve?
I am afraid nether Victor nor myself have the permission to top-approve as we are not part of ther weather-app-devs
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
None: http://
FAILURE: http://
deb: http://
FAILURE: http://
- 273. By David Planella
-
Merged from trunk
David Planella (dpm) wrote : | # |
Ok, merged from trunk to fix conflict. Martin, could you top-approve again? Thanks!
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) : | # |
Preview Diff
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2014-02-14 09:04:01 +0000 |
3 | +++ .bzrignore 2014-08-16 10:10:42 +0000 |
4 | @@ -1,4 +1,4 @@ |
5 | -*.qmlproject.user* |
6 | +*.user* |
7 | debian/files |
8 | debian/tmp |
9 | debian/ubuntu-weather-app* |
10 | @@ -14,3 +14,5 @@ |
11 | *.gmo |
12 | *.mo |
13 | *.desktop |
14 | +*.desktop.in |
15 | +*.desktop.in.in.h |
16 | |
17 | === modified file 'CMakeLists.txt' |
18 | --- CMakeLists.txt 2014-07-17 19:07:20 +0000 |
19 | +++ CMakeLists.txt 2014-08-16 10:10:42 +0000 |
20 | @@ -1,5 +1,7 @@ |
21 | project(com.ubuntu.weather) |
22 | cmake_minimum_required(VERSION 2.8.9) |
23 | +find_program(INTLTOOL_MERGE intltool-merge) |
24 | +find_program(INTLTOOL_EXTRACT intltool-extract) |
25 | |
26 | # Standard install paths |
27 | include(GNUInstallDirs) |
28 | @@ -37,10 +39,11 @@ |
29 | endif(CLICK_MODE) |
30 | |
31 | file(GLOB_RECURSE I18N_SRC_FILES |
32 | - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} |
33 | - components/*.qml components/*.js ${DESKTOP_FILE}.in.in) |
34 | + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po |
35 | + components/*.qml components/*.js *.qml) |
36 | +list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h) |
37 | list(SORT I18N_SRC_FILES) |
38 | -list(REMOVE_ITEM I18N_SRC_FILES .build/${DESKTOP_FILE}.in.in) |
39 | +message("Found ${I18N_SRC_FILES}") |
40 | |
41 | file(GLOB SRC_FILES |
42 | RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} |
43 | @@ -49,13 +52,12 @@ |
44 | install(FILES key.js DESTINATION ${DATA_DIR}) |
45 | install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR}) |
46 | |
47 | -configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY) |
48 | -file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}) |
49 | -file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS) |
50 | -foreach(LINE ${DESKTOP_FILE_CONTENTS}) |
51 | - string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}") |
52 | - file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n") |
53 | -endforeach(LINE) |
54 | +configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in) |
55 | + |
56 | +add_custom_target(${DESKTOP_FILE} ALL |
57 | + COMMENT "Merging translations into ${DESKTOP_FILE}" |
58 | + COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null |
59 | +) |
60 | |
61 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} |
62 | DESTINATION ${DESKTOP_DIR}) |
63 | |
64 | === modified file 'README' |
65 | --- README 2013-02-12 16:18:48 +0000 |
66 | +++ README 2014-08-16 10:10:42 +0000 |
67 | @@ -1,1 +1,11 @@ |
68 | -this is an example README file. |
69 | +Weather app for Ubuntu devices |
70 | + |
71 | +To contribute: |
72 | + https://wiki.ubuntu.com/Touch/CoreApps/Weather |
73 | + https://wiki.ubuntu.com/Touch/CoreApps/DevelopmentGuide |
74 | + |
75 | +The following essential packages are required to develop this app: |
76 | +- ubuntu-sdk (see http://developer.ubuntu.com/start) |
77 | +- intltool - run the `sudo apt-get install intltool` command for installation |
78 | + |
79 | +See the debian/control file for an up-to-date list of dependencies |
80 | |
81 | === modified file 'README.translations' |
82 | --- README.translations 2014-03-12 00:00:26 +0000 |
83 | +++ README.translations 2014-08-16 10:10:42 +0000 |
84 | @@ -10,12 +10,9 @@ |
85 | translatable messages to translators. So whenever you add new translatable |
86 | messages in the code, make sure to follow these steps: |
87 | |
88 | - 1. Run click-buddy retaining the build directory: `click-buddy --dir . --no-clean` |
89 | - 2. Copy the .pot file from the <build dir> mentioned in the output to your original |
90 | - source: |
91 | - `cp <build dir>/po/*.pot po/` |
92 | - 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"` |
93 | - 4. Push the branch and send a merge proposal as usual |
94 | + 1. Run click-buddy: `click-buddy --dir .` |
95 | + 2. Commit the generated .pot file: `bzr commit -m"Updated translation template"` |
96 | + 3. Push the branch and send a merge proposal as usual |
97 | |
98 | And that's it, once the branch lands Launchpad should take care of all the rest! |
99 | |
100 | |
101 | === modified file 'click/manifest.json.in' |
102 | --- click/manifest.json.in 2014-08-05 14:51:29 +0000 |
103 | +++ click/manifest.json.in 2014-08-16 10:10:42 +0000 |
104 | @@ -1,5 +1,5 @@ |
105 | { |
106 | - "description": "Weather application", |
107 | + "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources", |
108 | "framework": "ubuntu-sdk-14.10-qml-dev3", |
109 | "hooks": { |
110 | "@APP_NAME@": { |
111 | |
112 | === modified file 'com.ubuntu.weather_weather.desktop.in.in' |
113 | --- com.ubuntu.weather_weather.desktop.in.in 2014-07-21 14:40:24 +0000 |
114 | +++ com.ubuntu.weather_weather.desktop.in.in 2014-08-16 10:10:42 +0000 |
115 | @@ -4,7 +4,8 @@ |
116 | Terminal=false |
117 | Exec=@EXEC@ |
118 | Icon=@ICON@ |
119 | -Name=tr("Weather") |
120 | +_Name=Weather |
121 | +_Comment=A weather forecast application for Ubuntu with support for multiple online weather data sources |
122 | +_Keywords=weather;forecast;twc;openweathermap;the weather channel; |
123 | X-Ubuntu-Touch=true |
124 | -X-Ubuntu-Gettext-Domain=@PROJECT_NAME@ |
125 | X-Ubuntu-Default-Department-ID=accessories |
126 | |
127 | === modified file 'debian/control' |
128 | --- debian/control 2014-04-29 12:49:46 +0000 |
129 | +++ debian/control 2014-08-16 10:10:42 +0000 |
130 | @@ -3,6 +3,7 @@ |
131 | Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net> |
132 | Build-Depends: cmake, |
133 | debhelper (>= 9), |
134 | + intltool, |
135 | python, |
136 | Standards-Version: 3.9.4 |
137 | Section: misc |
138 | |
139 | === modified file 'po/CMakeLists.txt' |
140 | --- po/CMakeLists.txt 2014-03-12 00:00:26 +0000 |
141 | +++ po/CMakeLists.txt 2014-08-16 10:10:42 +0000 |
142 | @@ -8,14 +8,18 @@ |
143 | # Creates the .pot file containing the translations template |
144 | add_custom_target(${POT_FILE} ALL |
145 | COMMENT "Generating translation template" |
146 | + COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini |
147 | + --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in |
148 | COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE} |
149 | - -D ${CMAKE_SOURCE_DIR} |
150 | + -D ${CMAKE_CURRENT_SOURCE_DIR} |
151 | + -D ${CMAKE_CURRENT_BINARY_DIR} |
152 | --from-code=UTF-8 |
153 | --c++ --qt --add-comments=TRANSLATORS |
154 | - --keyword=tr --keyword=tr:1,2 |
155 | + --keyword=tr --keyword=tr:1,2 --keyword=N_ |
156 | --package-name='${APP_HARDCODE}' |
157 | --copyright-holder='Canonical Ltd.' |
158 | - ${I18N_SRC_FILES}) |
159 | + ${I18N_SRC_FILES} |
160 | + COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}) |
161 | |
162 | # Builds the binary translations catalog for each language |
163 | # it finds source translations (*.po) for |
164 | |
165 | === modified file 'po/com.ubuntu.weather.pot' |
166 | --- po/com.ubuntu.weather.pot 2014-08-16 04:56:53 +0000 |
167 | +++ po/com.ubuntu.weather.pot 2014-08-16 10:10:42 +0000 |
168 | @@ -8,7 +8,7 @@ |
169 | msgstr "" |
170 | "Project-Id-Version: ubuntu-weather-app\n" |
171 | "Report-Msgid-Bugs-To: \n" |
172 | -"POT-Creation-Date: 2014-08-15 23:51-0500\n" |
173 | +"POT-Creation-Date: 2014-08-16 12:09+0200\n" |
174 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
175 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
176 | "Language-Team: LANGUAGE <LL@li.org>\n" |
177 | @@ -17,222 +17,240 @@ |
178 | "Content-Type: text/plain; charset=CHARSET\n" |
179 | "Content-Transfer-Encoding: 8bit\n" |
180 | |
181 | -#: com.ubuntu.weather_weather.desktop.in.in:7 |
182 | -msgid "Weather" |
183 | -msgstr "" |
184 | - |
185 | -#: components/AddLocationSheet.qml:33 components/LocationManagerSheet.qml:317 |
186 | +#: ../components/AddLocationSheet.qml:33 |
187 | +#: ../components/LocationManagerSheet.qml:317 |
188 | msgid "Add city" |
189 | msgstr "" |
190 | |
191 | -#: components/AddLocationSheet.qml:76 |
192 | +#: ../components/AddLocationSheet.qml:76 |
193 | #, qt-format |
194 | msgid "No location was found for %1" |
195 | msgstr "" |
196 | |
197 | -#: components/AddLocationSheet.qml:139 |
198 | +#: ../components/AddLocationSheet.qml:139 |
199 | msgid "Enter a city name" |
200 | msgstr "" |
201 | |
202 | -#: components/CurrentWeather.qml:62 components/CurrentWeatherDetail.qml:32 |
203 | +#: ../components/CurrentWeather.qml:62 |
204 | +#: ../components/CurrentWeatherDetail.qml:32 |
205 | msgid "Snow" |
206 | msgstr "" |
207 | |
208 | -#: components/CurrentWeather.qml:62 components/CurrentWeatherDetail.qml:32 |
209 | +#: ../components/CurrentWeather.qml:62 |
210 | +#: ../components/CurrentWeatherDetail.qml:32 |
211 | msgid "Rain" |
212 | msgstr "" |
213 | |
214 | -#: components/CurrentWeather.qml:69 components/CurrentWeatherDetail.qml:39 |
215 | +#: ../components/CurrentWeather.qml:69 |
216 | +#: ../components/CurrentWeatherDetail.qml:39 |
217 | msgid "Low" |
218 | msgstr "" |
219 | |
220 | -#: components/CurrentWeather.qml:71 components/CurrentWeatherDetail.qml:41 |
221 | +#: ../components/CurrentWeather.qml:71 |
222 | +#: ../components/CurrentWeatherDetail.qml:41 |
223 | msgid "Moderate" |
224 | msgstr "" |
225 | |
226 | -#: components/CurrentWeather.qml:73 components/CurrentWeatherDetail.qml:43 |
227 | +#: ../components/CurrentWeather.qml:73 |
228 | +#: ../components/CurrentWeatherDetail.qml:43 |
229 | msgid "High" |
230 | msgstr "" |
231 | |
232 | -#: components/CurrentWeather.qml:75 components/CurrentWeatherDetail.qml:45 |
233 | +#: ../components/CurrentWeather.qml:75 |
234 | +#: ../components/CurrentWeatherDetail.qml:45 |
235 | msgid "Very high" |
236 | msgstr "" |
237 | |
238 | -#: components/CurrentWeather.qml:77 components/CurrentWeatherDetail.qml:47 |
239 | +#: ../components/CurrentWeather.qml:77 |
240 | +#: ../components/CurrentWeatherDetail.qml:47 |
241 | msgid "Extreme" |
242 | msgstr "" |
243 | |
244 | -#: components/CurrentWeatherDetail.qml:69 |
245 | +#: ../components/CurrentWeatherDetail.qml:69 |
246 | msgid "Humidity" |
247 | msgstr "" |
248 | |
249 | -#: components/CurrentWeatherDetail.qml:85 |
250 | +#: ../components/CurrentWeatherDetail.qml:85 |
251 | msgid "Wind speed" |
252 | msgstr "" |
253 | |
254 | -#: components/CurrentWeatherDetail.qml:100 |
255 | +#: ../components/CurrentWeatherDetail.qml:100 |
256 | msgid "Pressure" |
257 | msgstr "" |
258 | |
259 | -#: components/CurrentWeatherDetail.qml:101 |
260 | +#: ../components/CurrentWeatherDetail.qml:101 |
261 | #, c-format |
262 | msgid "% chance" |
263 | msgstr "" |
264 | |
265 | -#: components/CurrentWeatherDetail.qml:101 |
266 | +#: ../components/CurrentWeatherDetail.qml:101 |
267 | msgid "mbar" |
268 | msgstr "" |
269 | |
270 | -#: components/CurrentWeatherDetail.qml:116 |
271 | +#: ../components/CurrentWeatherDetail.qml:116 |
272 | msgid "UV index" |
273 | msgstr "" |
274 | |
275 | -#: components/CurrentWeatherDetail.qml:116 |
276 | +#: ../components/CurrentWeatherDetail.qml:116 |
277 | msgid "Precipitation" |
278 | msgstr "" |
279 | |
280 | -#: components/LastUpdatedComponent.qml:35 |
281 | +#: ../components/LastUpdatedComponent.qml:35 |
282 | msgid "Updated: " |
283 | msgstr "" |
284 | |
285 | -#: components/LastUpdatedComponent.qml:38 |
286 | +#: ../components/LastUpdatedComponent.qml:38 |
287 | msgid "yyyy-MM-dd" |
288 | msgstr "" |
289 | |
290 | -#: components/LastUpdatedComponent.qml:39 |
291 | +#: ../components/LastUpdatedComponent.qml:39 |
292 | msgid "Today, " |
293 | msgstr "" |
294 | |
295 | -#: components/LastUpdatedComponent.qml:41 |
296 | +#: ../components/LastUpdatedComponent.qml:41 |
297 | msgid "dddd, dd MMMM " |
298 | msgstr "" |
299 | |
300 | -#: components/LoadingSpinnerComponent.qml:44 |
301 | +#: ../components/LoadingSpinnerComponent.qml:44 |
302 | msgid "Loading..." |
303 | msgstr "" |
304 | |
305 | -#: components/LocationManagerSheet.qml:33 |
306 | +#: ../components/LocationManagerSheet.qml:33 |
307 | msgid "Edit locations" |
308 | msgstr "" |
309 | |
310 | -#: components/LocationManagerSheet.qml:122 |
311 | +#: ../components/LocationManagerSheet.qml:122 |
312 | msgid "Current location" |
313 | msgstr "" |
314 | |
315 | -#: components/LocationManagerSheet.qml:147 |
316 | +#: ../components/LocationManagerSheet.qml:147 |
317 | msgid "Scan for location" |
318 | msgstr "" |
319 | |
320 | #. TRANSLATORS: this is the button to add a location (city) that has been |
321 | #. detected to be the current position |
322 | -#: components/LocationManagerSheet.qml:214 |
323 | +#: ../components/LocationManagerSheet.qml:214 |
324 | msgid "Add" |
325 | msgstr "" |
326 | |
327 | -#: components/LocationManagerSheet.qml:234 |
328 | +#: ../components/LocationManagerSheet.qml:234 |
329 | msgid "Locations" |
330 | msgstr "" |
331 | |
332 | -#: components/LocationManagerSheet.qml:329 |
333 | +#: ../components/LocationManagerSheet.qml:329 |
334 | msgid "Remove a city first." |
335 | msgstr "" |
336 | |
337 | -#: components/LocationManagerSheet.qml:350 |
338 | +#: ../components/LocationManagerSheet.qml:350 |
339 | msgid "Location already added." |
340 | msgstr "" |
341 | |
342 | -#: components/LocationManagerSheet.qml:352 |
343 | +#: ../components/LocationManagerSheet.qml:352 |
344 | msgid "OK" |
345 | msgstr "" |
346 | |
347 | -#: components/LocationManagerSheet.qml:405 |
348 | +#: ../components/LocationManagerSheet.qml:405 |
349 | msgid "Couldn't specify your current location, please try later again!" |
350 | msgstr "" |
351 | |
352 | -#: components/LocationTab.qml:183 |
353 | +#: ../components/LocationTab.qml:183 |
354 | msgid "Forecast" |
355 | msgstr "" |
356 | |
357 | -#: components/LocationTab.qml:328 |
358 | +#: ../components/LocationTab.qml:328 |
359 | msgid "" |
360 | "No weather data available at the moment, please try to refresh later again!" |
361 | msgstr "" |
362 | |
363 | -#: components/LocationTab.qml:344 |
364 | +#: ../components/LocationTab.qml:344 |
365 | msgid "Refresh" |
366 | msgstr "" |
367 | |
368 | -#: components/LocationTab.qml:357 |
369 | +#: ../components/LocationTab.qml:357 |
370 | msgid "Edit" |
371 | msgstr "" |
372 | |
373 | -#: components/LocationTab.qml:369 components/SettingsSheet.qml:27 |
374 | +#: ../components/LocationTab.qml:369 ../components/SettingsSheet.qml:27 |
375 | msgid "Settings" |
376 | msgstr "" |
377 | |
378 | #. TRANSLATORS: this is a date to which a time of the day will be appended |
379 | -#: components/ScrollingArea.qml:92 |
380 | +#: ../components/ScrollingArea.qml:92 |
381 | msgid "dddd, dd MMMM" |
382 | msgstr "" |
383 | |
384 | -#: components/SettingsSheet.qml:33 |
385 | +#: ../components/SettingsSheet.qml:33 |
386 | msgid "Celsius" |
387 | msgstr "" |
388 | |
389 | -#: components/SettingsSheet.qml:34 |
390 | +#: ../components/SettingsSheet.qml:34 |
391 | msgid "Fahrenheit" |
392 | msgstr "" |
393 | |
394 | -#: components/SettingsSheet.qml:41 |
395 | +#: ../components/SettingsSheet.qml:41 |
396 | msgid "Kilometers per hour" |
397 | msgstr "" |
398 | |
399 | -#: components/SettingsSheet.qml:42 |
400 | +#: ../components/SettingsSheet.qml:42 |
401 | msgid "Miles per hour" |
402 | msgstr "" |
403 | |
404 | -#: components/SettingsSheet.qml:49 |
405 | +#: ../components/SettingsSheet.qml:49 |
406 | msgid "Millimeters" |
407 | msgstr "" |
408 | |
409 | -#: components/SettingsSheet.qml:50 |
410 | +#: ../components/SettingsSheet.qml:50 |
411 | msgid "Inches" |
412 | msgstr "" |
413 | |
414 | -#: components/SettingsSheet.qml:82 |
415 | +#: ../components/SettingsSheet.qml:82 |
416 | msgid "Temperature units" |
417 | msgstr "" |
418 | |
419 | -#: components/SettingsSheet.qml:94 |
420 | +#: ../components/SettingsSheet.qml:94 |
421 | msgid "Wind speed units" |
422 | msgstr "" |
423 | |
424 | -#: components/SettingsSheet.qml:106 |
425 | +#: ../components/SettingsSheet.qml:106 |
426 | msgid "Precipitation units" |
427 | msgstr "" |
428 | |
429 | -#: components/SettingsSheet.qml:133 |
430 | +#: ../components/SettingsSheet.qml:133 |
431 | msgid "Weather Service" |
432 | msgstr "" |
433 | |
434 | -#: components/SplashComponent.qml:35 |
435 | +#: ../components/SplashComponent.qml:35 |
436 | msgid "Couldn't load weather data, please try later again!" |
437 | msgstr "" |
438 | |
439 | -#: components/TabFooter.qml:98 |
440 | +#: ../components/TabFooter.qml:98 |
441 | msgid "10 days forecast" |
442 | msgstr "" |
443 | |
444 | -#: components/TabFooter.qml:120 |
445 | +#: ../components/TabFooter.qml:120 |
446 | msgid "Hourly forecast" |
447 | msgstr "" |
448 | |
449 | #. TRANSLATORS: this refers to the High (max) temperature forecasted for a day |
450 | -#: components/WeatherTemperatureComponent.qml:113 |
451 | +#: ../components/WeatherTemperatureComponent.qml:113 |
452 | msgid "H:" |
453 | msgstr "" |
454 | |
455 | #. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day |
456 | -#: components/WeatherTemperatureComponent.qml:133 |
457 | +#: ../components/WeatherTemperatureComponent.qml:133 |
458 | msgid "L:" |
459 | msgstr "" |
460 | + |
461 | +#: com.ubuntu.weather_weather.desktop.in.in.h:1 |
462 | +msgid "Weather" |
463 | +msgstr "" |
464 | + |
465 | +#: com.ubuntu.weather_weather.desktop.in.in.h:2 |
466 | +msgid "" |
467 | +"A weather forecast application for Ubuntu with support for multiple online " |
468 | +"weather data sources" |
469 | +msgstr "" |
470 | + |
471 | +#: com.ubuntu.weather_weather.desktop.in.in.h:3 |
472 | +msgid "weather;forecast;twc;openweathermap;the weather channel;" |
473 | +msgstr "" |
FAILED: Continuous integration, rev:269 91.189. 93.70:8080/ job/ubuntu- weather- app-ci/ 212/ 91.189. 93.70:8080/ job/generic- mediumtests- trusty- weather- app/136/ console 91.189. 93.70:8080/ job/generic- mediumtests- utopic- weather- app/16/ console 91.189. 93.70:8080/ job/ubuntu- weather- app-trusty- amd64-ci/ 124/console 91.189. 93.70:8080/ job/ubuntu- weather- app-utopic- amd64-ci/ 19/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- weather- app-ci/ 212/rebuild
http://