From: jenkins-bot Date: Tue, 8 Nov 2016 21:26:07 +0000 (+0000) Subject: Merge "Clarify "while blocked" where something else could be "blocked" too" X-Git-Tag: 1.31.0-rc.0~4921 X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=c807d75bb18d33d029f1bf903fb844fde82af57c;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "Clarify "while blocked" where something else could be "blocked" too" --- c807d75bb18d33d029f1bf903fb844fde82af57c diff --combined languages/i18n/en.json index 99f36fbac3,ab213c7b2d..a033eddb69 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@@ -564,7 -564,7 +564,7 @@@ "botpasswords-label-delete": "Delete", "botpasswords-label-resetpassword": "Reset the password", "botpasswords-label-grants": "Applicable grants:", - "botpasswords-help-grants": "Each grant gives access to listed user rights that a user account already has. See the [[Special:ListGrants|table of grants]] for more information.", + "botpasswords-help-grants": "Grants allow access to rights already held by your user account. Enabling a grant here does not provide access to any rights that your user account would not otherwise have. See the [[Special:ListGrants|table of grants]] for more information.", "botpasswords-label-grants-column": "Granted", "botpasswords-bad-appid": "The bot name \"$1\" is not valid.", "botpasswords-insert-failed": "Failed to add bot name \"$1\". Was it already added?", @@@ -2887,8 -2887,6 +2887,8 @@@ "patrol-log-header": "This is a log of patrolled revisions.", "log-show-hide-patrol": "$1 patrol log", "log-show-hide-tag": "$1 tag log", + "confirm-markpatrolled-button": "OK", + "confirm-markpatrolled-top": "Mark revision $3 of $2 as patrolled?", "deletedrevision": "Deleted old revision $1", "filedeleteerror-short": "Error deleting file: $1", "filedeleteerror-long": "Errors were encountered while deleting the file:\n\n$1", @@@ -3704,7 -3702,7 +3704,7 @@@ "tags-deactivate": "deactivate", "tags-hitcount": "$1 {{PLURAL:$1|change|changes}}", "tags-manage-no-permission": "You do not have permission to manage change tags.", - "tags-manage-blocked": "You cannot manage change tags while blocked.", + "tags-manage-blocked": "You cannot manage change tags while you are blocked.", "tags-create-heading": "Create a new tag", "tags-create-explanation": "By default, newly created tags will be made available for use by users and bots.", "tags-create-tag-name": "Tag name:", @@@ -3740,11 -3738,11 +3740,11 @@@ "tags-deactivate-not-allowed": "It is not possible to deactivate the tag \"$1\".", "tags-deactivate-submit": "Deactivate", "tags-apply-no-permission": "You do not have permission to apply change tags along with your changes.", - "tags-apply-blocked": "You cannot apply change tags along with your changes while blocked.", + "tags-apply-blocked": "You cannot apply change tags along with your changes while you are blocked.", "tags-apply-not-allowed-one": "The tag \"$1\" is not allowed to be manually applied.", "tags-apply-not-allowed-multi": "The following {{PLURAL:$2|tag is|tags are}} not allowed to be manually applied: $1", "tags-update-no-permission": "You do not have permission to add or remove change tags from individual revisions or log entries.", - "tags-update-blocked": "You cannot add or remove change tags while blocked.", + "tags-update-blocked": "You cannot add or remove change tags while you are blocked.", "tags-update-add-not-allowed-one": "The tag \"$1\" is not allowed to be manually added.", "tags-update-add-not-allowed-multi": "The following {{PLURAL:$2|tag is|tags are}} not allowed to be manually added: $1", "tags-update-remove-not-allowed-one": "The tag \"$1\" is not allowed to be removed.", @@@ -4167,7 -4165,7 +4167,7 @@@ "authmanager-authn-autocreate-failed": "Auto-creation of a local account failed: $1", "authmanager-change-not-supported": "The supplied credentials cannot be changed, as nothing would use them.", "authmanager-create-disabled": "Account creation is disabled.", - "authmanager-create-from-login": "To create your account, please fill in the fields below.", + "authmanager-create-from-login": "To create your account, please fill in the fields.", "authmanager-create-not-in-progress": "Account creation is not in progress or session data has been lost. Please start again from the beginning.", "authmanager-create-no-primary": "The supplied credentials could not be used for account creation.", "authmanager-link-no-primary": "The supplied credentials could not be used for account linking.",