diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-21 17:48:48 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-21 17:48:48 +0200 |
| commit | a8fb843ded90590f1dd38d7ee16ac730d0d51bb2 (patch) | |
| tree | e36df465697d9bce5575c74eab54c8ce54eba802 | |
| parent | 77da8b650725473fedfcebc76d5a387a9ea493ef (diff) | |
| parent | 6e757eea94b93cacf4db195e4c90b0ceffc43563 (diff) | |
| download | forums-a8fb843ded90590f1dd38d7ee16ac730d0d51bb2.tar forums-a8fb843ded90590f1dd38d7ee16ac730d0d51bb2.tar.gz forums-a8fb843ded90590f1dd38d7ee16ac730d0d51bb2.tar.bz2 forums-a8fb843ded90590f1dd38d7ee16ac730d0d51bb2.tar.xz forums-a8fb843ded90590f1dd38d7ee16ac730d0d51bb2.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 119ad2d7e9..1e1c5554e1 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -78,13 +78,13 @@ $lang = array_merge($lang, array( 'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.', 'tokens' => array( - 'TEXT' => 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER, INTTEXT or SIMPLETEXT.', + 'TEXT' => 'Any text, including foreign characters, numbers, etc…', 'SIMPLETEXT' => 'Characters from the latin alphabet (A-Z), numbers, spaces, commas, dots, minus, plus, hyphen and underscore', 'INTTEXT' => 'Unicode letter characters, numbers, spaces, commas, dots, minus, plus, hyphen, underscore and whitespaces.', 'IDENTIFIER' => 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore', 'NUMBER' => 'Any series of digits', 'EMAIL' => 'A valid email address', - 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, “http://” is prefixed to the string.', + 'URL' => 'A valid URL using any allowed protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, “http://” is prefixed to the string.', 'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol, as links are prefixed with “%s”', 'RELATIVE_URL' => 'A relative URL. You can use this to match parts of a URL, but be careful: a full URL is a valid relative URL. When you want to use relative URLs of your board, use the LOCAL_URL token.', 'COLOR' => 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>', |