MtDu has uploaded a new change for review. https://gerrit.wikimedia.org/r/261364
Change subject: Use American English instead of British English in messages ...................................................................... Use American English instead of British English in messages https://translatewiki.net/wiki/Thread:Support/British_English_in_Mediawiki_messages Change-Id: Ieab4800725b3ed0691614f974e1e962f3a066da9 --- M i18n/en.json 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking refs/changes/64/261364/1 diff --git a/i18n/en.json b/i18n/en.json index b4263c7..522b660 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -14,8 +14,8 @@ "globalblocking-block-reasonotherlist": "Other reason", "globalblocking-block-reason-dropdown": "* Common block reasons\n** Crosswiki spamming\n** Crosswiki abuse\n** Vandalism", "globalblocking-block-edit-dropdown": "Edit block reasons", - "globalblocking-block-expiry": "Expiry:", - "globalblocking-block-expiry-other": "Other expiry time", + "globalblocking-block-expiry": "Expiration:", + "globalblocking-block-expiry-other": "Other expiration time", "globalblocking-block-expiry-selector-other": "Other time:", "globalblocking-block-legend": "Block an IP address globally", "globalblocking-block-options": "Options:", @@ -23,7 +23,7 @@ "globalblocking-ipbanononly": "Block anonymous users only", "globalblocking-block-errors": "Your block was unsuccessful, for the following {{PLURAL:$1|reason|reasons}}:", "globalblocking-block-ipinvalid": "The IP address ($1) you entered is invalid.\nPlease note that you cannot enter a user name!", - "globalblocking-block-expiryinvalid": "The expiry you entered is invalid.", + "globalblocking-block-expiryinvalid": "The expiration you entered is invalid.", "globalblocking-block-submit": "Block this IP address globally", "globalblocking-modify-submit": "Modify this global block", "globalblocking-block-success": "The IP address $1 has been successfully blocked on all projects.", @@ -42,7 +42,7 @@ "globalblocking-list-ipinvalid": "The IP address you searched for ($1) is invalid.\nPlease enter a valid IP address.", "globalblocking-search-errors": "Your search was unsuccessful, for the following {{PLURAL:$1|reason|reasons}}:", "globalblocking-list-blockitem": "$1: <span class=\"plainlinks\">'''$2'''</span> (''$3'') globally blocked [[Special:Contributions/$4|$4]] ''($5)''", - "globalblocking-list-expiry": "expiry $1", + "globalblocking-list-expiry": "expiration $1", "globalblocking-list-anononly": "anonymous only", "globalblocking-list-unblock": "remove", "globalblocking-list-whitelisted": "locally disabled by $1: $2", @@ -74,20 +74,19 @@ "globalblocking-whitelist-dewhitelisted": "You have successfully re-enabled the global block #$2 on the IP address '''$1''' on {{SITENAME}}.", "globalblocking-whitelist-nochange": "You made no change to the local status of this block.", "globalblocking-whitelist-intro": "You can use this form to edit the local status of a global block.\nIf a global block is disabled on this wiki, users on the affected IP address will be able to edit normally.", - "globalblocking-ipblocked": "'''Your IP address has been blocked on all wikis.'''\n\nThe block was made by $1 ($2).\nThe reason given is ''$3''.\n\n* Start of block: $4\n* Expiry of block: $5\n\nYou can contact $1 to discuss the block.\nYou cannot use the \"{{int:emailuser}}\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $6.\nPlease include all above details in any queries you make.", - "globalblocking-ipblocked-range": "'''Your IP address is in a range which has been blocked on all wikis.'''\n\nThe block was made by $1 ($2).\nThe reason given is ''$3''.\n\n* Start of block: $4\n* Expiry of block: $5\n\nYou can contact $1 to discuss the block.\nYou cannot use the \"{{int:emailuser}}\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $6, and the blocked range is $7.\nPlease include all above details in any queries you make.", - "globalblocking-ipblocked-xff": "'''One or more proxy servers used by your request is globally blocked'''\n\nThe block was made by $1 ($2).\nThe reason given is ''$3''.\n\n* Start of block: $4\n* Expiry of block: $5\n\nYou can contact $1 to discuss the block.\nYou cannot use the \"{{int:emailuser}}\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nThe blocked proxy address was $6.\nPlease include all above details in any queries you make.", + "globalblocking-ipblocked-range": "'''Your IP address is in a range which has been blocked on all wikis.'''\n\nThe block was made by $1 ($2).\nThe reason given is ''$3''.\n\n* Start of block: $4\n* Expiration of block: $5\n\nYou can contact $1 to discuss the block.\nYou cannot use the \"{{int:emailuser}}\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $6, and the blocked range is $7.\nPlease include all above details in any queries you make.", + "globalblocking-ipblocked-xff": "'''One or more proxy servers used by your request is globally blocked'''\n\nThe block was made by $1 ($2).\nThe reason given is ''$3''.\n\n* Start of block: $4\n* Expiration of block: $5\n\nYou can contact $1 to discuss the block.\nYou cannot use the \"{{int:emailuser}}\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nThe blocked proxy address was $6.\nPlease include all above details in any queries you make.", "globalblocking-blocked-nopassreset": "You cannot reset user's passwords because you are blocked globally.", "globalblocking-logpage": "Global block log", "globalblocking-logpagetext": "This is a log of global blocks which have been made and removed on this wiki.\nIt should be noted that global blocks can be made and removed on other wikis, and that these global blocks may affect this wiki.\nTo view all active global blocks, you may view the [[Special:GlobalBlockList|global block list]].", - "globalblocking-block-logentry": "globally blocked [[$1]] with an expiry time of $2", + "globalblocking-block-logentry": "globally blocked [[$1]] with an expiration time of $2", "globalblocking-block2-logentry": "globally blocked [[$1]] ($2)", "globalblocking-unblock-logentry": "removed global block on [[$1]]", "globalblocking-whitelist-logentry": "disabled the global block on [[$1]] locally", "globalblocking-dewhitelist-logentry": "re-enabled the global block on [[$1]] locally", "globalblocking-modify-logentry": "modified the global block on [[$1]] ($2)", "globalblocking-logentry-expiry": "expires $1", - "globalblocking-logentry-noexpiry": "no expiry set", + "globalblocking-logentry-noexpiry": "no expiration set", "globalblocking-loglink": "The IP address $1 is blocked globally ([[{{#Special:GlobalBlockList}}/$1|full details]]).", "globalblocking-contribs-notice": "This IP address is currently globally blocked.\nThe global block log entry is provided below for reference:", "globalblocking-showlog": "This IP address has been blocked previously.\nThe block log is provided below for reference:", -- To view, visit https://gerrit.wikimedia.org/r/261364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieab4800725b3ed0691614f974e1e962f3a066da9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalBlocking Gerrit-Branch: master Gerrit-Owner: MtDu <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
