Merge remote-tracking branch 'refs/remotes/commons-app/master'

This commit is contained in:
misaochan 2016-12-15 21:12:08 +13:00
commit e31cae36b7

View file

@ -10,7 +10,7 @@
<string name="logging_in_message">Please wait...</string>
<string name="login_success">Login success!</string>
<string name="login_failed">Login failed!</string>
<string name="upload_failed">File not found, please try another file</string>
<string name="upload_failed">File not found. Please try another file.</string>
<string name="authentication_failed">Authentication failed!</string>
<string name="uploading_started">Upload started!</string>
@ -44,8 +44,7 @@
<string name="login_failed_network">Unable to login - network failure</string>
<string name="login_failed_username">Unable to login - please check your username</string>
<string name="login_failed_password">Unable to login - please check your password</string>
<string name="login_failed_throttled">Too many unsuccessful attempts. Please try again in a few minutes
</string>
<string name="login_failed_throttled">Too many unsuccessful attempts. Please try again in a few minutes.</string>
<string name="login_failed_blocked">Sorry, this user has been blocked on Commons</string>
<string name="login_failed_generic">Login failed</string>
@ -80,7 +79,7 @@
<string name="menu_about">About</string>
<string name="about_license">Open Source software released under the &lt;a href="https://github.com/wikimedia/apps-android-commons/blob/master/COPYING">Apache License v2&lt;/a>. Wikimedia Commons and its logo are trademarks of the Wikimedia Foundation and are used with the permission of the Wikimedia Foundation. We are not endorsed by or affiliated with the Wikimedia Foundation.</string>
<string name="about_improve">&lt;a href="https://github.com/commons-app/apps-android-commons">Source&lt;/a> and &lt;a href="https://commons-app.github.io/">website&lt;/a> on GitHub&lt;/a>. Create a new &lt;a href="https://github.com/commons-app/apps-android-commons/issues">GitHub issue&lt;/a> for bug reports/suggestions.</string>
<string name="about_improve">&lt;a href="https://github.com/commons-app/apps-android-commons">Source&lt;/a> and &lt;a href="https://commons-app.github.io/">website&lt;/a> on GitHub&lt;/a>. Create a new &lt;a href="https://github.com/commons-app/apps-android-commons/issues">GitHub issue&lt;/a> for bug reports and suggestions.</string>
<string name="about_privacy_policy">&lt;a href="https://wikimediafoundation.org/wiki/Privacy_policy">Privacy policy&lt;/a></string>
<string name="title_activity_about">About</string>