Merge changes Ic19071c7,Icc8dc4ae

* changes:
  Message documentation for Icc8dc4ae (circular references in strip tags)
  (bug 35315) Detect circular references in strip tags

diff --combined languages/messages/MessagesEn.php
index c3af5bf,3066e6c..bb405b6
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -1039,8 -1039,6 +1039,8 @@@ The reason given is "\'\'$2\'\'".'
  'filereadonlyerror'    => 'Unable to modify the file "$1" because the file repository "$2" is in read-only mode.
  
  The administrator who locked it offered this explanation: "$3".',
 +'invalidtitle-knownnamespace'   => 'Invalid title with namespace "$2" and text "$3"',
 +'invalidtitle-unknownnamespace' => 'Invalid title with unknown namespace number $1 and text "$2"',
  
  # Virus scanner
  'virus-badscanner'     => "Bad configuration: Unknown virus scanner: ''$1''",
@@@ -1484,6 -1482,8 +1484,8 @@@ These arguments have been omitted."
  'node-count-exceeded-warning'             => 'Page exceeded the node-count',
  'expansion-depth-exceeded-category'       => 'Pages where expansion depth is exceeded',
  'expansion-depth-exceeded-warning'        => 'Page exceeded the expansion depth',
+ 'parser-unstrip-loop-warning'             => 'Unstrip loop detected',
+ 'parser-unstrip-recursion-limit'          => 'Unstrip recursion limit exceeded ($1)',
  
  # "Undo" feature
  'undo-success' => 'The edit can be undone.

diff --combined languages/messages/MessagesQqq.php
index 757490e,2d01a5c..7a0383c
--- 1/languages/messages/MessagesQqq.php
--- 2/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@@ -683,13 -683,6 +683,13 @@@ $1 is a filename, I think.'
  'editinginterface' => "A message shown when editing pages in the namespace MediaWiki:. In the [http://translatewiki.net/wiki/Main_Page?setlang=en URL], '''change \"setlang=en\" to your own language code.'''",
  'ns-specialprotected' => 'Error message displayed when trying to edit a page in the Special namespace',
  'titleprotected' => 'Use $1 for GENDER.',
 +'invalidtitle-knownnamespace' => 'Displayed when an invalid title was encountered (generally in a list), but the namespace number is known to exist.
 +* $1 is the namespace number
 +* $2 is the namespace name in content language or {{msg-mw|blanknamespace}} for the main namespace
 +* $3 is the part of the title after the namespace (e.g. SomeName for the page User:SomeName)',
 +'invalidtitle-unknownnamespace' => 'Displayed when an invalid title was encountered (generally in a list) and the namespace number is unknown.
 +* $1 is the namespace number
 +* $2 is the part of the title after the namespace (e.g. SomeName for the page User:SomeName)',
  
  # Login and logout pages
  'logouttext' => 'Log out message',
@@@ -1040,6 -1033,13 +1040,13 @@@ When templates are expanded, there is 
  
  * <tt>$1</tt> is the value of the depth limit
  * <tt>$2</tt> is the value of the max depth limit',
+ 'parser-unstrip-loop-warning' => 'This error is shown when a parser extension tag such as <pre> includes a reference to itself in its own output.
+ The reference must be to the exact same invocation of the tag at the same location in the source, merely writing &lt;pre>&lt;pre>&lt;/pre>&lt;/pre> will not do it.
+ This is usually impossible and unlikely to happen by accident, so translation is not essential.',
+ 'parser-unstrip-recursion-limit' => 'This message is shown when the recursion limit for nested parser extension tags is exceeded.
+ This warning may be encountered due to input text like &lt;ref>&lt;ref>&lt;ref>...&lt;/ref>&lt;/ref>&lt;/ref>.
+ 
+ * <tt>$1</tt> is the depth limit',
  
  # "Undo" feature
  'undo-success' => 'Text on special page to confirm edit revert. You arrive on this page by clicking on the "undo" link on a revision history special page.
@@@ -2023,7 -2023,7 +2030,7 @@@ Siebrand think this has to do with allo
  
  If \'scheme\' is difficult to translate, then you could use \'prefix\' instead.',
  'http-bad-status' => '$1 is an HTTP error code (e.g. 404), $2 is the HTTP error message (e.g. File Not Found)',
 -'http-truncated-body'   => 'Seems the connection closed prematurely. The HTTP response contained a Content-length greated than the received body.',
 +'http-truncated-body' => 'This is a standard HTTP error message. → Seems the connection closed prematurely. The HTTP response contained a content-length greater than the received body.',
  
  'license' => 'This appears in the upload form for the license drop-down. The header in the file description page is now at {{msg-mw|License-header}}.',
  'nolicense' => '{{Identical|None selected}}',