Merge "Transclude translation for preference edit section to ensure consistency of...

diff --combined languages/messages/MessagesEn.php
index 2771f64,bead13f..5d42c83
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -659,6 -659,7 +659,6 @@@ future releases. Also note that since e
  
  # User preference toggles
  'tog-underline'               => 'Link underlining:',
 -'tog-justify'                 => 'Justify paragraphs',
  'tog-hideminor'               => 'Hide minor edits in recent changes',
  'tog-hidepatrolled'           => 'Hide patrolled edits in recent changes',
  'tog-newpageshidepatrolled'   => 'Hide patrolled pages from new page list',
@@@ -1579,7 -1580,7 +1579,7 @@@ It already exists.'
  'invalid-content-data'             => 'Invalid content data',
  'content-not-allowed-here'         => '"$1" content is not allowed on page [[$2]]',
  'editwarning-warning'              => 'Leaving this page may cause you to lose any changes you have made.
- If you are logged in, you can disable this warning in the "Editing" section of your preferences.',
+ If you are logged in, you can disable this warning in the "{{int:prefs-editing}}" section of your preferences.',
  'editpage-notsupportedcontentformat-title'=> 'Content format not supported',
  'editpage-notsupportedcontentformat-text' => 'The content format $1 is not supported by the content model $2.',
  
@@@ -1803,8 -1804,7 +1803,8 @@@ Note that using the navigation links wi
  'showhideselectedversions'    => 'Change visibility of selected revisions',
  'editundo'                    => 'undo',
  'diff-empty'                  => '(No difference)',
 -'diff-multi'                  => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by {{PLURAL:$2|one user|$2 users}} not shown)',
 +'diff-multi-sameuser'         => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by the same user not shown)',
 +'diff-multi-otherusers'       => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by {{PLURAL:$2|one other user|$2 users}} not shown)',
  'diff-multi-manyusers'        => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by more than $2 {{PLURAL:$2|user|users}} not shown)',
  'difference-missing-revision' => '{{PLURAL:$2|One revision|$2 revisions}} of this difference ($1) {{PLURAL:$2|was|were}} not found.