Merge "(Bug 38439) Attempt on fixing the suicidal LangObjCache"

[lhc/web/wiklou.git] / languages / messages / MessagesQqq.php

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 38e1356..8a1db5e 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1576,9 +1576,13 @@ Shown as legend of the second fieldset of the tab 'Search' in [[Special:Preferen
 'youremail' => 'Label of the e-mail text box of the "E-mail options" section of "Special:Preferences".
 
 {{Identical|E-mail}}',
-'username' => '{{Identical|Username}}',
-'uid' => '{{Identical|User ID}}',
-'prefs-memberingroups' => 'This message is shown on [[Special:Preferences]], first tab. See also {{msg-mw|prefs-memberingroups-type}}.',
+'username' => 'Username field in [[Special:Preferences]]. $1 is the current user name for GENDER distinction (depends on sex setting).
+
+{{Identical|Username}}',
+'uid' => 'User ID field in [[Special:Preferences]]. $1 is the current user name for GENDER distinction (depends on sex setting).
+
+{{Identical|User ID}}',
+'prefs-memberingroups' => 'This message is shown on [[Special:Preferences]], first tab. See also {{msg-mw|prefs-memberingroups-type}}. $2 is the user name for GENDER.',
 'prefs-memberingroups-type' => '{{optional}}
 Parameters:
 * $1 is list of group names
@@ -2802,10 +2806,12 @@ Similar to {{msg-mw|rcnote}} which is used on [[Special:RecentChanges]].
 **{{msg-mw|enotif body intro moved}}
 **{{msg-mw|enotif body intro restored}} 
 **{{msg-mw|enotif body intro changed}} (for all the other cases).
-*$NEWPAGE consists of
-**{{msg-mw|enotif lastdiff}}
-**a newline
-**{{msg-mw|enotif lastvisited}}
+*$NEWPAGE consists of either
+**if the page is new (in older releases), {{msg-mw|enotif newpagetext}}
+**if the page has a previous revision,
+***{{msg-mw|enotif lastdiff}}
+***a newline
+***{{msg-mw|enotif lastvisited}}
 *$PAGEEDITOR_EMAIL and $PAGEEDITOR_WIKI are links respectively to the e-mail user special page and user page for the user who performed the action.
 
 The subject of the e-mail is one of the following messages: