Merge lp://qastaging/~vthompson/ubuntu-weather-app/fix-1521701 into lp://qastaging/ubuntu-weather-app

Proposed by Victor Thompson
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 189
Merged at revision: 201
Proposed branch: lp://qastaging/~vthompson/ubuntu-weather-app/fix-1521701
Merge into: lp://qastaging/ubuntu-weather-app
Diff against target: 87 lines (+11/-7)
5 files modified
app/components/DayDelegateExtraInfo.qml (+3/-3)
app/components/ForecastDetailsDelegate.qml (+2/-1)
app/ui/LocationPane.qml (+1/-1)
debian/changelog (+3/-0)
po/com.ubuntu.weather.pot (+2/-2)
To merge this branch: bzr merge lp://qastaging/~vthompson/ubuntu-weather-app/fix-1521701
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Bartosz Kosiorek (community) Approve
Review via email: mp+280379@code.qastaging.launchpad.net

Commit message

* Change translatable string from "rain" to "precipitation"

Description of the change

* Change translatable string from "rain" to "precipitation"

This change still needs Design approval.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

It looks perfectly fine for me.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/weather-app-autolanding/10/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1382/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

I'll resolve the merge conflicts--but don't we want to wait for design approval? I'm not sure they approve yet.

189. By Victor Thompson

Merge of trunk and resolve conflict.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: