Merge "Add a 'revdelete-selected-file' message on Special:RevisionDelete"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 26 Mar 2014 17:18:57 +0000 (17:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 26 Mar 2014 17:18:57 +0000 (17:18 +0000)
1  2 
includes/specials/SpecialRevisiondelete.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/language/messages.inc

Simple merge
@@@ -2489,34 -2501,21 +2498,36 @@@ See also
  'logdelete-selected' => '{{RevisionDelete}}
  Parameters:
  * $1 - number of log events
+ * $2 - localized name of Special:Log, maybe with type as subpage [unused]
  See also:
- * {{msg-mw|Revdelete-selected}}',
+ * {{msg-mw|Revdelete-selected-text}}
+ * {{msg-mw|Revdelete-selected-file}}',
  'revdelete-text-text' => '{{RevisionDelete}}
  This is the introduction explaining the feature.
 -See also: {{msg-mw|revdelete-text-file}}, {{msg-mw|logdelete-text}}, {{msg-mw|revdelete-text-others}}',
 +
 +See also:
 +* {{msg-mw|Revdelete-text-file}}
 +* {{msg-mw|Logdelete-text}}
 +* {{msg-mw|Revdelete-text-others}}',
  'revdelete-text-file' => '{{RevisionDelete}}
  This is the introduction explaining the feature.
 -See also: {{msg-mw|revdelete-text-text}}, {{msg-mw|logdelete-text}}, {{msg-mw|revdelete-text-others}}',
 +
 +See also:
 +* {{msg-mw|Revdelete-text-text}}
 +* {{msg-mw|Logdelete-text}}
 +* {{msg-mw|Revdelete-text-others}}',
  'logdelete-text' => '{{RevisionDelete}}
  This is the introduction explaining the feature.
 -See also: {{msg-mw|revdelete-text-text}}, {{msg-mw|revdelete-text-file}}, {{msg-mw|revdelete-text-others}}',
 +
 +See also:
 +* {{msg-mw|Revdelete-text-text}}
 +* {{msg-mw|Revdelete-text-file}}
 +* {{msg-mw|Revdelete-text-others}}',
  'revdelete-text-others' => '{{RevisionDelete}}
 -This message is shown after one of: {{msg-mw|revdelete-text-text}}, {{msg-mw|revdelete-text-image}}, {{msg-mw|revdelete-text-logging}}',
 +This message is shown after one of:
 +* {{msg-mw|Revdelete-text-text}}
 +* {{msg-mw|Revdelete-text-file}}
 +* {{msg-mw|Logdelete-text}}',
  'revdelete-confirm' => 'This message is a part of the [[mw:RevisionDelete|RevisionDelete]] feature.
  
  Refers to {{msg-mw|Policy-url}}.
Simple merge