From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 30 Apr 2013 18:37:04 +0000 (+0000)
Subject: Merge "Reimplement Special:Filepath as a redirect through Special:Redirect/File."
X-Git-Tag: 1.31.0-rc.0~19811
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=e593d18a886a9a9286753b41e4941fcb456a616a;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Reimplement Special:Filepath as a redirect through Special:Redirect/File."
---

e593d18a886a9a9286753b41e4941fcb456a616a
diff --combined languages/messages/MessagesEn.php
index e111afce93,61f921674b..3a5d11233e
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -1138,7 -1138,7 +1138,7 @@@ Do not forget to change your [[Special:
  'createacct-benefit-body2'        => 'pages',
  'createacct-benefit-icon3'        => 'icon-contributors',
  'createacct-benefit-head3'        => '{{NUMBEROFACTIVEUSERS}}',
 -'createacct-benefit-body3'        => 'contributors this month',
 +'createacct-benefit-body3'        => 'recent contributors',
  'badretype'                    => 'The passwords you entered do not match.',
  'userexists'                   => 'Username entered already in use.
  Please choose a different name.',
@@@ -4788,13 -4788,6 +4788,6 @@@ You should have received [{{SERVER}}{{S
  'version-entrypoints-api-php'           => '[https://www.mediawiki.org/wiki/Manual:api.php api.php]', # do not translate or duplicate this message to other languages
  'version-entrypoints-load-php'          => '[https://www.mediawiki.org/wiki/Manual:load.php load.php]', # do not translate or duplicate this message to other languages
  
- # Special:FilePath
- 'filepath'         => 'File path',
- 'filepath-page'    => 'File:',
- 'filepath-submit'  => 'Go',
- 'filepath-summary' => 'This special page returns the complete path for a file.
- Images are shown in full resolution, other file types are started with their associated program directly.',
- 
  # Special:Redirect
  'redirect'         => 'Redirect by file, user, or revision ID',
  'redirect-legend'  => 'Redirect to a file or page',
@@@ -4902,7 -4895,6 +4895,7 @@@ This site is experiencing technical dif
  'htmlform-selectorother-other' => 'Other',
  'htmlform-no'                  => 'No',
  'htmlform-yes'                 => 'Yes',
 +'htmlform-chosen-placeholder'  => 'Select an option',
  
  # SQLite database support
  'sqlite-has-fts' => '$1 with full-text search support',
diff --combined maintenance/language/messages.inc
index a25708bf6d,4c159286f5..536ae86b41
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@@ -3637,12 -3637,6 +3637,6 @@@ $wgMessageStructure = array
  		'version-entrypoints-api-php',
  		'version-entrypoints-load-php',
  	),
- 	'filepath' => array(
- 		'filepath',
- 		'filepath-page',
- 		'filepath-submit',
- 		'filepath-summary',
- 	),
  	'redirect' => array(
  		'redirect',
  		'redirect-legend',
@@@ -3740,7 -3734,6 +3734,7 @@@
  		'htmlform-selectorother-other',
  		'htmlform-no',
  		'htmlform-yes',
 +		'htmlform-chosen-placeholder',
  	),
  	'sqlite' => array(
  		'sqlite-has-fts',