Merge lp:~gang65/ubuntu-weather-app/ubuntu-weather-app-message-text-fix into lp:ubuntu-weather-app

[Bartosz Kosiorek]

Change message text according to Ubuntu UX comment (LP: #1493466)

Change message text according to Ubuntu UX comment (LP: #1493466)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:145
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/281/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/281

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I'm not sure we have enough time to get the new string translated prior to releasing the initial version of the app. IMO, we should approve this after the first version is released to allow for this new string to be adequately translated.

review: Needs Information

[Victor Thompson (vthompson)]

Now that the initial reboot app is in the store, let's land this and get the new string translated.

Thanks Bartosz!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/121/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/121/console

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Hi Bartosz, there was a conflict in the merge. Also, Andrew is going to mark the 3.0 app as released, so you'll need to update your changelog entry as well.

review: Needs Fixing

[lp:~gang65/ubuntu-weather-app/ubuntu-weather-app-message-text-fix]

146. By Bartosz Kosiorek on 2015-10-25

Merge with trunk

147. By Bartosz Kosiorek on 2015-10-25

Update changelog

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:147
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/287/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/287

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :-) Thanks for resolving the conflicts.

review: Approve

[Victor Thompson (vthompson)]

Great, thanks!

review: Approve

=== modified file 'app/components/NetworkErrorStateComponent.qml'
--- app/components/NetworkErrorStateComponent.qml	2015-08-28 21:54:22 +0000
+++ app/components/NetworkErrorStateComponent.qml	2015-10-25 20:14:56 +0000
@@ -54,7 +54,7 @@
             anchors {
                 horizontalCenter: parent.horizontalCenter
             }
-            text: i18n.tr("Ubuntu suggests you check your network settings and try again.")
+            text: i18n.tr("Please check your network settings and try again.")
             width: parent.width
             wrapMode: Text.WordWrap
         }

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-24 19:24:48 +0000
+++ debian/changelog	2015-10-25 20:14:56 +0000
@@ -1,7 +1,11 @@
 ubuntu-weather-app (3.1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Andrew Hayzen ]
   * Bump version to 3.1
 
+  [ Bartosz Kosiorek ]
+  * Change message text according to Ubuntu UX comment (LP: #1493466)
+
  -- Andrew Hayzen <[e-mail]>  Sat, 24 Oct 2015 20:22:31 +0100
 
 ubuntu-weather-app (3.0ubuntu1) vivid; urgency=medium

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-10-22 15:17:02 +0000
+++ po/com.ubuntu.weather.pot	2015-10-25 20:14:56 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-22 16:15+0100\n"
+"POT-Creation-Date: 2015-10-25 21:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -87,7 +87,7 @@
 msgstr ""
 
 #: ../app/components/NetworkErrorStateComponent.qml:57
-msgid "Ubuntu suggests you check your network settings and try again."
+msgid "Please check your network settings and try again."
 msgstr ""
 
 #: ../app/components/NetworkErrorStateComponent.qml:63