Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281188
Change subject: Use IP address range instead of IP range
......................................................................
Use IP address range instead of IP range
We use "IP address" consistently instead of "IP", but this was never
applied to the "range" addition.
Change-Id: I02fecf0b9e6a5b90f7a24209c7a1cdce64060b23
---
M includes/api/i18n/en.json
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/281188/1
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 2d1542e..bff7854 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -20,7 +20,7 @@
"apihelp-main-param-uselang": "Language to use for message
translations.
<kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> with
<kbd>siprop=languages</kbd> returns a list of language codes, or specify
<kbd>user</kbd> to use the current user's language preference, or specify
<kbd>content</kbd> to use this wiki's content language.",
"apihelp-block-description": "Block a user.",
- "apihelp-block-param-user": "Username, IP address, or IP range to
block.",
+ "apihelp-block-param-user": "Username, IP address, or IP address range
to block.",
"apihelp-block-param-expiry": "Expiry time. May be relative (e.g.
<kbd>5 months</kbd> or <kbd>2 weeks</kbd>) or absolute (e.g.
<kbd>2014-09-18T12:34:56Z</kbd>). If set to <kbd>infinite</kbd>,
<kbd>indefinite</kbd>, or <kbd>never</kbd>, the block will never expire.",
"apihelp-block-param-reason": "Reason for block.",
"apihelp-block-param-anononly": "Block anonymous users only (i.e.
disable anonymous edits for this IP address).",
@@ -1331,7 +1331,7 @@
"apihelp-unblock-description": "Unblock a user.",
"apihelp-unblock-param-id": "ID of the block to unblock (obtained
through <kbd>list=blocks</kbd>). Cannot be used together with
<var>$1user</var>.",
- "apihelp-unblock-param-user": "Username, IP address or IP range to
unblock. Cannot be used together with <var>$1id</var>.",
+ "apihelp-unblock-param-user": "Username, IP address or IP address range
to unblock. Cannot be used together with <var>$1id</var>.",
"apihelp-unblock-param-reason": "Reason for unblock.",
"apihelp-unblock-param-tags": "Change tags to apply to the entry in the
block log.",
"apihelp-unblock-example-id": "Unblock block ID #<kbd>105</kbd>.",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index c26d2a9..7342efe 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2300,7 +2300,7 @@
"unblock-summary": "",
"blockip": "Block {{GENDER:$1|user}}",
"blockip-legend": "Block user",
- "blockiptext": "Use the form below to block write access from a
specific IP address or username.\nThis should be done only to prevent
vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in
a specific reason below (for example, citing particular pages that were
vandalized).\nYou can block IP ranges using the
[https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] syntax; the
largest allowed range is /$1 for IPv4 and /$2 for IPv6.",
+ "blockiptext": "Use the form below to block write access from a
specific IP address or username.\nThis should be done only to prevent
vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in
a specific reason below (for example, citing particular pages that were
vandalized).\nYou can block IP address ranges using the
[https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] syntax; the
largest allowed range is /$1 for IPv4 and /$2 for IPv6.",
"ipaddressorusername": "IP address or username:",
"ipbexpiry": "Expiration:",
"ipbreason": "Reason:",
@@ -2393,7 +2393,7 @@
"unblock-hideuser": "You cannot unblock this user, as their username
has been hidden.",
"ipb_cant_unblock": "Error: Block ID $1 not found. It may have been
unblocked already.",
"ipb_blocked_as_range": "Error: The IP address $1 is not blocked
directly and cannot be unblocked.\nIt is, however, blocked as part of the range
$2, which can be unblocked.",
- "ip_range_invalid": "Invalid IP range.",
+ "ip_range_invalid": "Invalid IP address range.",
"ip_range_toolarge": "Range blocks larger than /$1 are not allowed.",
"proxyblocker": "Proxy blocker",
"proxyblockreason": "Your IP address has been blocked because it is an
open proxy.\nPlease contact your Internet service provider or technical support
of your organization and inform them of this serious security problem.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index e7df244..bdba606 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -968,7 +968,7 @@
"undo-summary-username-hidden": "Edit summary for an undo action where
the username of the old revision is hidden.\n\nParameters:\n* $1 - the revision
ID being undone\nSee also:\n* {{msg-mw|Undo-summary}}",
"cantcreateaccounttitle": "Used as title of the error message
{{msg-mw|Cantcreateaccount-text}}.",
"cantcreateaccount-text": "Used as error message, with the title
{{msg-mw|Cantcreateaccounttitle}}.\n* $1 - target IP address\n* $2 - reason or
{{msg-mw|Blockednoreason}}\n* $3 - username\nSee also:\n*
{{msg-mw|Cantcreateaccount-range-text}}",
- "cantcreateaccount-range-text": "Used as more detailed version of the
{{msg-mw|Cantcreateaccount-text}} error message, with the title
{{msg-mw|Cantcreateaccounttitle}}.\n* $1 - target IP range\n* $2 - reason or
{{msg-mw|Blockednoreason}}\n* $3 - username\n* $4 - current user's IP address",
+ "cantcreateaccount-range-text": "Used as more detailed version of the
{{msg-mw|Cantcreateaccount-text}} error message, with the title
{{msg-mw|Cantcreateaccounttitle}}.\n* $1 - target IP address range\n* $2 -
reason or {{msg-mw|Blockednoreason}}\n* $3 - username\n* $4 - current user's IP
address",
"createaccount-hook-aborted": "Placeholder message to return with API
errors on account create; passes through the message from a hook
{{notranslate}}",
"viewpagelogs": "Link displayed in history of pages",
"nohistory": "Message shown when there are no history to list. See
[{{canonicalurl:x|action=history}} example history].\n----\nAlso used as title
of error message when the feed is empty. See
[{{canonicalurl:x|action=history&feed=atom}} example feed].\n\nSee the error
message:\n* {{msg-mw|history-feed-empty}}",
@@ -2568,7 +2568,7 @@
"ipb-otherblocks-header": "[[File:Special.Block with other blocks from
GlobalBlocking and TorBlocks.png|thumb|Example]]\nUsed on [[Special:Block]] as
header for other blocks, i.e. from GlobalBlocking or
TorBlocks\n\nParameters:\n* $1 - number of blocks\nSee also:\n*
{{msg-mw|Ipblocklist-otherblocks}}",
"unblock-hideuser": "{{doc-singularthey}}",
"ipb_cant_unblock": "Used as error message in [[Special:Unblock]].
Parameters:\n* $1 - block ID",
- "ipb_blocked_as_range": "Used when unblock of a single IP fails.
Parameters:\n* $1 - IP address\n* $2 - IP range",
+ "ipb_blocked_as_range": "Used when unblock of a single IP fails.
Parameters:\n* $1 - IP address\n* $2 - IP address range",
"ip_range_invalid": "Used as error message in [[Special:Block]].\n\nSee
also:\n* {{msg-mw|Range block disabled}}\n* {{msg-mw|Ip range invalid}}\n*
{{msg-mw|Ip range toolarge}}",
"ip_range_toolarge": "Used as error message in [[Special:Block]].
Parameters:\n* $1 - a number from 0 to 32 for IPv4 (from 0 to 128 for IPv6); a
part of CIDR (Classless Inter-Domain Routing) notation.\nSee also:\n*
{{msg-mw|Range block disabled}}\n* {{msg-mw|Ip range invalid}}\n* {{msg-mw|Ip
range toolarge}}",
"proxyblocker": "Used in [[Special:BlockMe]].\n\nSee also:\n*
{{msg-mw|proxyblocker-disabled}}\n* {{msg-mw|proxyblockreason}}\n*
{{msg-mw|proxyblocksuccess}}",
--
To view, visit https://gerrit.wikimedia.org/r/281188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02fecf0b9e6a5b90f7a24209c7a1cdce64060b23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
