From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Sun, 29 Sep 2013 20:33:01 +0000 (+0000)
Subject: Merge "Add explicit GENDER support for 'revertpage-nouser'"
X-Git-Tag: 1.31.0-rc.0~18652
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=2bc2f5d98cbfe4d7f6414489d50ff053b89d0bdc;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Add explicit GENDER support for 'revertpage-nouser'"
---

2bc2f5d98cbfe4d7f6414489d50ff053b89d0bdc
diff --combined languages/messages/MessagesEn.php
index 529c2c89df,52b0d37f77..149d795182
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -2171,9 -2171,9 +2171,9 @@@ Your email address is not revealed whe
  'action-block'                => 'block this user from editing',
  'action-protect'              => 'change protection levels for this page',
  'action-rollback'             => 'quickly rollback the edits of the last user who edited a particular page',
 -'action-import'               => 'import this page from another wiki',
 -'action-importupload'         => 'import this page from a file upload',
 -'action-patrol'               => "mark others' edit as patrolled",
 +'action-import'               => 'import pages from another wiki',
 +'action-importupload'         => 'import pages from a file upload',
 +'action-patrol'               => "mark others' edits as patrolled",
  'action-autopatrol'           => 'have your edit marked as patrolled',
  'action-unwatchedpages'       => 'view the list of unwatched pages',
  'action-mergehistory'         => 'merge the history of this page',
@@@ -2771,7 -2771,6 +2771,7 @@@ It now redirects to [[$2]].'
  'listusers-summary'               => '', # do not translate or duplicate this message to other languages
  'listusers-editsonly'             => 'Show only users with edits',
  'listusers-creationsort'          => 'Sort by creation date',
 +'listusers-desc'                  => 'Sort in descending order',
  'usereditcount'                   => '$1 {{PLURAL:$1|edit|edits}}',
  'usercreated'                     => '{{GENDER:$3|Created}} on $1 at $2',
  'newpages'                        => 'New pages',
@@@ -3077,7 -3076,7 +3077,7 @@@ someone else has edited or rolled back 
  The last edit to the page was by [[User:$3|$3]] ([[User talk:$3|talk]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).',
  'editcomment'                => "The edit summary was: \"''\$1''\".",
  'revertpage'                 => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|talk]]) to last revision by [[User:$1|$1]]',
- 'revertpage-nouser'          => 'Reverted edits by a hidden user to last revision by [[User:$1|$1]]',
+ 'revertpage-nouser'          => 'Reverted edits by a hidden user to last revision by {{GENDER:$1|[[User:$1|$1]]}}',
  'rollback-success'           => 'Reverted edits by $1;
  changed back to last revision by $2.',