Merge branch 'master' into wikidataEdits

This commit is contained in:
Vivek Maskara 2018-05-31 10:02:38 +05:30 committed by GitHub
commit 0e86741cc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
126 changed files with 1634 additions and 665 deletions

View file

@ -46,8 +46,7 @@
<string name="add_title_toast">Please provide a title for this file</string>
<string name="share_description_hint">Description</string>
<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_wrong_credentials">Unable to login - please check your username and password</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_2fa_needed">You must provide your two factor authentication code.</string>
@ -286,4 +285,6 @@
<string name="successful_wikidata_edit">Image successfully added to %1$s on Wikidata!</string>
<string name="wikidata_edit_failure">Failed to update corresponding wiki data entity!</string>
<string name="menu_set_wallpaper">Set wallpaper</string>
<string name="wallpaper_set_successfully">Wallpaper set successfully!</string>
</resources>