Merge lp:~arashbm/ubuntu-weather-app/translation-string into lp:ubuntu-weather-app/obsolete.trunk

[Arash Badie Modiri]

changed a translation string into something a little bit more general

changed a translation string into something a little bit more general to support Persian and other languages that don't have nouns at the end of sentence.

[David Planella (dpm)]

Thanks a lot! The change looks good to me and makes sense.

Could you also please update the .pot file? Once you've done it and pushed it to your branch, this merge proposal should get updated automatically for you.

The steps on how to update the .pot file are described in http://bazaar.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk/view/head:/README.translations

review: Needs Fixing

[Adolfo Jayme Barrientos (fitojb)]

Thank you!

review: Approve

[David Planella (dpm)]

Looks good to me, thanks!

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~arashbm/ubuntu-weather-app/translation-string/+merge/201690/+edit-commit-message

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'components/AddLocationSheet.qml'
--- components/AddLocationSheet.qml	2013-10-04 15:26:59 +0000
+++ components/AddLocationSheet.qml	2014-01-14 23:22:44 +0000
@@ -67,7 +67,7 @@
                     //
                     if (!citiesModel.count) {
                         noCityError.visible = true
-                        noCityError.text = i18n.tr("No location was found for ") + locationString.text
+                        noCityError.text = i18n.tr("No location was found for %1").arg(locationString.text)
                     }
                 } else {
                     console.log("search: "+messageObject.error.msg+" / "+messageObject.error.request.url)

=== modified file 'po/ubuntu-weather-app.pot'
--- po/ubuntu-weather-app.pot	2013-09-26 05:23:41 +0000
+++ po/ubuntu-weather-app.pot	2014-01-14 23:22:44 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-26 07:22+0200\n"
+"POT-Creation-Date: 2014-01-15 02:51+0330\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,44 +17,45 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../components/AddLocationSheet.qml:30
-#: ../components/LocationManagerSheet.qml:215
+#: ../components/AddLocationSheet.qml:32
+#: ../components/LocationManagerSheet.qml:268
 msgid "Add city"
 msgstr ""
 
-#: ../components/AddLocationSheet.qml:77
-msgid "No location was found for "
+#: ../components/AddLocationSheet.qml:70
+#, qt-format
+msgid "No location was found for %1"
 msgstr ""
 
-#: ../components/AddLocationSheet.qml:126
+#: ../components/AddLocationSheet.qml:128
 msgid "Enter a city name"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:136
+#: ../components/CurrentWeather.qml:154
 msgid "Humidity"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:152
+#: ../components/CurrentWeather.qml:170
 msgid "Wind speed"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:177
+#: ../components/CurrentWeather.qml:195
 msgid "Pressure"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:178
+#: ../components/CurrentWeather.qml:196
 msgid "mbar"
 msgstr ""
 
-#: ../components/CurrentWeather.qml:192
+#: ../components/CurrentWeather.qml:211
 msgid "Precipitation"
 msgstr ""
 
-#: ../components/LastUpdatedComponent.qml:32
+#: ../components/LastUpdatedComponent.qml:33
 msgid "Updated: "
 msgstr ""
 
-#: ../components/LastUpdatedComponent.qml:36
+#: ../components/LastUpdatedComponent.qml:37
 msgid "Today, "
 msgstr ""
 
@@ -66,88 +67,76 @@
 msgid "Edit locations"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:84
+#: ../components/LocationManagerSheet.qml:104
 msgid "Current location"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:102
-msgid "Lookup location"
+#: ../components/LocationManagerSheet.qml:124
+msgid "Scan for location"
 msgstr ""
 
 #. TRANSLATORS: this is the button to add a location (city) that has been
 #. detected to be the current position
-#: ../components/LocationManagerSheet.qml:134
+#: ../components/LocationManagerSheet.qml:187
 msgid "Add"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:150
+#: ../components/LocationManagerSheet.qml:204
 msgid "World"
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:233
+#: ../components/LocationManagerSheet.qml:286
 msgid "Location already added."
 msgstr ""
 
-#: ../components/LocationManagerSheet.qml:235
+#: ../components/LocationManagerSheet.qml:288
 msgid "OK"
 msgstr ""
 
-#: ../components/LocationTab.qml:164
+#: ../components/LocationManagerSheet.qml:345
+msgid "Couldn't specify your current location, please try later again!"
+msgstr ""
+
+#: ../components/LocationTab.qml:167
 msgid ""
 "No weather data available at the moment, please try to refresh later again!"
 msgstr ""
 
-#: ../components/LocationTab.qml:180
+#: ../components/LocationTab.qml:200
 msgid "Refresh"
 msgstr ""
 
-#: ../components/LocationTab.qml:192
+#: ../components/LocationTab.qml:213
 msgid "Edit"
 msgstr ""
 
-#: ../components/LocationTab.qml:204 ../components/SettingsSheet.qml:27
+#: ../components/LocationTab.qml:225 ../components/SettingsSheet.qml:27
 msgid "Settings"
 msgstr ""
 
-#: ../components/SettingsSheet.qml:36
+#: ../components/SettingsSheet.qml:51
 msgid "Temperature units"
 msgstr ""
 
-#: ../components/SettingsSheet.qml:37
-msgid "Celsius"
-msgstr ""
-
-#: ../components/SettingsSheet.qml:37
-msgid "Fahrenheit"
-msgstr ""
-
-#: ../components/SettingsSheet.qml:43
+#: ../components/SettingsSheet.qml:66
 msgid "Wind speed units"
 msgstr ""
 
-#: ../components/SettingsSheet.qml:44
-msgid "Kilometers per hour"
-msgstr ""
-
-#: ../components/SettingsSheet.qml:44
-msgid "Miles per hour"
-msgstr ""
-
-#: ../components/SplashComponent.qml:34
+#: ../components/SettingsSheet.qml:81
+msgid "Precipitation units"
+msgstr ""
+
+#: ../components/SplashComponent.qml:33
 msgid "Couldn't load weather data, please try later again!"
 msgstr ""
 
-#: ../components/SwipeDelete.qml:52 ../components/SwipeDelete.qml:60
-msgid "Delete"
-msgstr ""
-
 #. TRANSLATORS: this refers to the High (max) temperature forecasted for a day
-#: ../components/WeatherTemperatureComponent.qml:84
+#: ../components/WeatherTemperatureComponent.qml:102
 msgid "H:"
 msgstr ""
 
 #. TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
-#: ../components/WeatherTemperatureComponent.qml:104
+#: ../components/WeatherTemperatureComponent.qml:122
 msgid "L:"
 msgstr ""