From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 18 Oct 2018 17:05:10 +0000 (+0000)
Subject: Merge "Revert "Introduce Special:RedirectExternal""
X-Git-Tag: 1.34.0-rc.0~3734
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=837b96248da57b5971bd14e116aee7d0d41f6014;hp=-c

Merge "Revert "Introduce Special:RedirectExternal""
---

837b96248da57b5971bd14e116aee7d0d41f6014
diff --combined autoload.php
index f8fc6b2b56,0f92ccbde0..3e6b4a20b7
--- a/autoload.php
+++ b/autoload.php
@@@ -1396,7 -1396,6 +1396,6 @@@ $wgAutoloadLocalClasses = 
  	'SpecialRecentChanges' => __DIR__ . '/includes/specials/SpecialRecentchanges.php',
  	'SpecialRecentChangesLinked' => __DIR__ . '/includes/specials/SpecialRecentchangeslinked.php',
  	'SpecialRedirect' => __DIR__ . '/includes/specials/SpecialRedirect.php',
- 	'SpecialRedirectExternal' => __DIR__ . '/includes/specials/SpecialRedirectExternal.php',
  	'SpecialRedirectToSpecial' => __DIR__ . '/includes/specialpage/RedirectSpecialPage.php',
  	'SpecialRemoveCredentials' => __DIR__ . '/includes/specials/SpecialRemoveCredentials.php',
  	'SpecialResetTokens' => __DIR__ . '/includes/specials/SpecialResetTokens.php',
@@@ -1537,6 -1536,7 +1536,6 @@@
  	'UploadStashWrongOwnerException' => __DIR__ . '/includes/upload/UploadStash.php',
  	'UploadStashZeroLengthFileException' => __DIR__ . '/includes/upload/UploadStash.php',
  	'UppercaseCollation' => __DIR__ . '/includes/collation/UppercaseCollation.php',
 -	'UsageException' => __DIR__ . '/includes/api/UsageException.php',
  	'User' => __DIR__ . '/includes/user/User.php',
  	'UserArray' => __DIR__ . '/includes/user/UserArray.php',
  	'UserArrayFromResult' => __DIR__ . '/includes/user/UserArrayFromResult.php',
diff --combined languages/i18n/en.json
index 17b7d4c82f,ea6305423b..5283a5bb06
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -2030,7 -2030,7 +2030,7 @@@
  	"prefixindex-namespace": "All pages with prefix ($1 namespace)",
  	"prefixindex-summary": "",
  	"prefixindex-submit": "Show",
 -	"prefixindex-strip": "Strip prefix in list",
 +	"prefixindex-strip": "Hide the prefix in results",
  	"shortpages": "Short pages",
  	"shortpages-summary": "",
  	"longpages": "Long pages",
@@@ -3746,9 -3746,6 +3746,6 @@@
  	"lag-warn-normal": "Changes newer than $1 {{PLURAL:$1|second|seconds}} may not be shown in this list.",
  	"lag-warn-high": "Due to high database server lag, changes newer than $1 {{PLURAL:$1|second|seconds}} may not be shown in this list.",
  	"editwatchlist-summary": "",
- 	"redirectexternal-summary":  "",
- 	"redirectexternal-invalid-url": "$1 is not a valid URL",
- 	"redirectexternal-no-url":  "No argument was provided to Special:RedirectExternal",
  	"watchlistedit-normal-title": "Edit watchlist",
  	"watchlistedit-normal-legend": "Remove titles from watchlist",
  	"watchlistedit-normal-explain": "Titles on your watchlist are shown below.\nTo remove a title, check the box next to it, and click \"{{int:Watchlistedit-normal-submit}}\".\nYou can also [[Special:EditWatchlist/raw|edit the raw list]].",