Update to MediaWiki 1.25.1

45 files changed, 273 insertions, 172 deletions

diff --git a/skins/Modern/COPYING b/skins/Modern/COPYING
index 019694a9..d159169d 100644
--- a/skins/Modern/COPYING
+++ b/skins/Modern/COPYING
@@ -1,65 +1,65 @@
-== GNU GENERAL PUBLIC LICENSE ==
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-Version 2, June 1991
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+                            Preamble
 
-=== Preamble ===
-
-The licenses for most software are designed to take away your
+  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 License is intended to guarantee your freedom to share and change free
 software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
-When we speak of free software, we are referring to freedom, not
+  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 this service if you wish), that you receive source code or can get it
 if you want it, that you can change the software or use pieces of it
 in new free programs; and that you know you can do these things.
 
-To protect your rights, we need to make restrictions that forbid
+  To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
 These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
 
-For example, if you distribute copies of such a program, whether
+  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must give the recipients all the rights that
 you have.  You must make sure that they, too, receive or can get the
 source code.  And you must show them these terms so they know their
 rights.
 
-We protect your rights with two steps: (1) copyright the software, and
+  We protect your rights with two steps: (1) copyright the software, and
 (2) offer you this license which gives you legal permission to copy,
 distribute and/or modify the software.
 
-Also, for each author's protection and ours, we want to make certain
+  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
 software.  If the software is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
 
-Finally, any free program is threatened constantly by software
+  Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that redistributors of a free
 program will individually obtain patent licenses, in effect making the
 program proprietary.  To prevent this, we have made it clear that any
 patent must be licensed for everyone's free use or not licensed at all.
 
-The precise terms and conditions for copying, distribution and
+  The precise terms and conditions for copying, distribution and
 modification follow.
 
-== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ==
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-'''0.''' This License applies to any program or other work which contains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -76,7 +76,7 @@ is covered only if its contents constitute a work based on the
 Program (independent of having been made by running the Program).
 Whether that is true depends on what the Program does.
 
-'''1.''' You may copy and distribute verbatim copies of the Program's
+  1. You may copy and distribute verbatim copies of the Program's
 source code as you receive it, in any medium, provided that you
 conspicuously and appropriately publish on each copy an appropriate
 copyright notice and disclaimer of warranty; keep intact all the
@@ -87,29 +87,29 @@ along with the Program.
 You may charge a fee for the physical act of transferring a copy, and
 you may at your option offer warranty protection in exchange for a fee.
 
-'''2.''' You may modify your copy or copies of the Program or any portion
+  2. You may modify your copy or copies of the Program or any portion
 of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
 
-	'''a)''' You must cause the modified files to carry prominent notices
-	stating that you changed the files and the date of any change.
-
-	'''b)''' You must cause any work that you distribute or publish, that in
-	whole or in part contains or is derived from the Program or any
-	part thereof, to be licensed as a whole at no charge to all third
-	parties under the terms of this License.
-
-	'''c)''' If the modified program normally reads commands interactively
-	when run, you must cause it, when started running for such
-	interactive use in the most ordinary way, to print or display an
-	announcement including an appropriate copyright notice and a
-	notice that there is no warranty (or else, saying that you provide
-	a warranty) and that users may redistribute the program under
-	these conditions, and telling the user how to view a copy of this
-	License.  (Exception: if the Program itself is interactive but
-	does not normally print such an announcement, your work based on
-	the Program is not required to print an announcement.)
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
 
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
@@ -131,26 +131,26 @@ with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
 
-'''3.''' You may copy and distribute the Program (or a work based on it,
+  3. You may copy and distribute the Program (or a work based on it,
 under Section 2) in object code or executable form under the terms of
 Sections 1 and 2 above provided that you also do one of the following:
 
-	'''a)''' Accompany it with the complete corresponding machine-readable
-	source code, which must be distributed under the terms of Sections
-	1 and 2 above on a medium customarily used for software interchange; or,
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
 
-	'''b)''' Accompany it with a written offer, valid for at least three
-	years, to give any third party, for a charge no more than your
-	cost of physically performing source distribution, a complete
-	machine-readable copy of the corresponding source code, to be
-	distributed under the terms of Sections 1 and 2 above on a medium
-	customarily used for software interchange; or,
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
 
-	'''c)''' Accompany it with the information you received as to the offer
-	to distribute corresponding source code.  (This alternative is
-	allowed only for noncommercial distribution and only if you
-	received the program in object code or executable form with such
-	an offer, in accord with Subsection b above.)
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
@@ -169,7 +169,7 @@ access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
 
-'''4.''' You may not copy, modify, sublicense, or distribute the Program
+  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
 void, and will automatically terminate your rights under this License.
@@ -177,7 +177,7 @@ However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
 
-'''5.''' You are not required to accept this License, since you have not
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
@@ -186,7 +186,7 @@ Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Program or works based on it.
 
-'''6.''' Each time you redistribute the Program (or any work based on the
+  6. Each time you redistribute the Program (or any work based on the
 Program), the recipient automatically receives a license from the
 original licensor to copy, distribute or modify the Program subject to
 these terms and conditions.  You may not impose any further
@@ -194,7 +194,7 @@ restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
 
-'''7.''' If, as a consequence of a court judgment or allegation of patent
+  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
@@ -226,7 +226,7 @@ impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
 
-'''8.''' If the distribution and/or use of the Program is restricted in
+  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
 may add an explicit geographical distribution limitation excluding
@@ -234,7 +234,7 @@ those countries, so that distribution is permitted only in or among
 countries not thus excluded.  In such case, this License incorporates
 the limitation as if written in the body of this License.
 
-'''9.''' The Free Software Foundation may publish revised and/or new versions
+  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
@@ -247,7 +247,7 @@ Software Foundation.  If the Program does not specify a version number of
 this License, you may choose any version ever published by the Free Software
 Foundation.
 
-'''10.''' If you wish to incorporate parts of the Program into other free
+  10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
@@ -255,9 +255,9 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-=== NO WARRANTY ===
+                            NO WARRANTY
 
-'''11.''' BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
@@ -267,7 +267,7 @@ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
 
-'''12.''' IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
@@ -277,47 +277,45 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-	'''END OF TERMS AND CONDITIONS'''
+                     END OF TERMS AND CONDITIONS
 
-== How to Apply These Terms to Your New Programs ==
+            How to Apply These Terms to Your New Programs
 
-If you develop a new program, and you want it to be of the greatest
+  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
 
-To do so, attach the following notices to the program.  It is safest
+  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-	<one line to give the program's name and a brief idea of what it does.>
-
-	Copyright (C) <year>  <name of author>
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-	Gnomovision version 69, Copyright (C) year name of author
-	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-	This is free software, and you are welcome to redistribute it
-	under certain conditions; type `show c' for details.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, the commands you use may
@@ -328,15 +326,14 @@ You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
 
-	Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-	`Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-	<signature of Ty Coon>, 1 April 1989
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-	Ty Coon, President of Vice
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/skins/Modern/Modern.php b/skins/Modern/Modern.php
index f1a3ce34..4ba6c476 100644
--- a/skins/Modern/Modern.php
+++ b/skins/Modern/Modern.php
@@ -1,50 +1,14 @@
 <?php
-/**
- * Modern skin
- *
- * @file
- * @ingroup Skins
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- */
 
-$wgExtensionCredits['skin'][] = array(
-	'path' => __FILE__,
-	'name' => 'Modern',
-	'namemsg' => 'skinname-modern',
-	'descriptionmsg' => 'modern-desc',
-	'url' => 'https://www.mediawiki.org/wiki/Skin:Modern',
-	'author' => array( 'River Tarnell', '...' ),
-	'license-name' => 'GPLv2+',
-);
-
-// Register files
-$wgAutoloadClasses['SkinModern'] = __DIR__ . '/SkinModern.php';
-$wgAutoloadClasses['ModernTemplate'] = __DIR__ . '/SkinModern.php';
-$wgMessagesDirs['Modern'] = __DIR__ . '/i18n';
-
-// Register skin
-$wgValidSkinNames['modern'] = 'Modern';
-
-// Register modules
-$wgResourceModules['skins.modern'] = array(
-	'styles' => array(
-		'resources/main.css' => array( 'media' => 'screen' ),
-		'resources/print.css' => array( 'media' => 'print' ),
-	),
-	'remoteBasePath' => $GLOBALS['wgStylePath'] . '/Modern',
-	'localBasePath' => __DIR__,
-);
+if ( function_exists( 'wfLoadSkin' ) ) {
+	wfLoadSkin( 'Modern' );
+	// Keep i18n globals so mergeMessageFileList.php doesn't break
+	$wgMessagesDirs['Modern'] = __DIR__ . '/i18n';
+	/* wfWarn(
+		'Deprecated PHP entry point used for Modern skin. Please use wfLoadSkin instead, ' .
+		'see https://www.mediawiki.org/wiki/Extension_registration for more details.'
+	); */
+	return true;
+} else {
+	die( 'This version of the Modern skin requires MediaWiki 1.25+' );
+}
diff --git a/skins/Modern/SkinModern.php b/skins/Modern/SkinModern.php
index e12ad357..3c36a1a7 100644
--- a/skins/Modern/SkinModern.php
+++ b/skins/Modern/SkinModern.php
@@ -66,10 +66,13 @@ class ModernTemplate extends MonoBookTemplate {
 		?>
 
 		<!-- heading -->
-		<div id="mw_header"><h1 id="firstHeading" lang="<?php
+		<div id="mw_header">
+			<?php echo $this->getIndicators(); ?>
+			<h1 id="firstHeading" lang="<?php
 			$this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
 			$this->text( 'pageLanguage' );
-			?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1></div>
+			?>"><?php $this->html( 'title' ) ?></h1>
+		</div>
 
 		<div id="mw_main">
 			<div id="mw_contentwrapper">
diff --git a/skins/Modern/i18n/ar.json b/skins/Modern/i18n/ar.json
index fe3fa710..80971198 100644
--- a/skins/Modern/i18n/ar.json
+++ b/skins/Modern/i18n/ar.json
@@ -1,10 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Meno25"
+			"Meno25",
+			"Khaled"
 		]
 	},
 	"modern.css": "/* الأنماط المتراصة CSS المعروضة هنا ستؤثر على مستخدمي واجهة مودرن */",
 	"modern.js": "/* أي جافاسكريبت هنا سيتم تحميلها للمستخدمين الذين يستعملون واجهة مودرن */",
-	"skinname-modern": "مودرن"
+	"skinname-modern": "مودرن",
+	"modern-desc": "مظهر ازرق/رمادي بشريط جانبي وعلوي. مشتق من مونوبوك"
 }
diff --git a/skins/Modern/i18n/av.json b/skins/Modern/i18n/av.json
new file mode 100644
index 00000000..11f3d30a
--- /dev/null
+++ b/skins/Modern/i18n/av.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Gazimagomedov"
+		]
+	},
+	"modern-desc": "ХъахӀилаб/цӀцӀахӀилаб тема бокӀоналъул ва тӀасияб панелгун. MonoBook'алъул гьабураб"
+}
diff --git a/skins/Modern/i18n/bcc.json b/skins/Modern/i18n/bcc.json
index 036721e0..bbc32039 100644
--- a/skins/Modern/i18n/bcc.json
+++ b/skins/Modern/i18n/bcc.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "مدرن"
 }
diff --git a/skins/Modern/i18n/bcl.json b/skins/Modern/i18n/bcl.json
index 84f5a0b2..e4f318e7 100644
--- a/skins/Modern/i18n/bcl.json
+++ b/skins/Modern/i18n/bcl.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Bago"
 }
diff --git a/skins/Modern/i18n/be-tarask.json b/skins/Modern/i18n/be-tarask.json
index bdd735cf..896f46b7 100644
--- a/skins/Modern/i18n/be-tarask.json
+++ b/skins/Modern/i18n/be-tarask.json
@@ -1,3 +1,9 @@
 {
-	"skinname-modern": "Сучаснае"
+	"@metadata": {
+		"authors": [
+			"Red Winged Duck"
+		]
+	},
+	"skinname-modern": "Сучаснае",
+	"modern-desc": "Блакітная/шэрая тэма з бакавой і верхняй панэлямі. Паходзіць ад MonoBook."
 }
diff --git a/skins/Modern/i18n/be.json b/skins/Modern/i18n/be.json
index 52a2be37..8a9670f8 100644
--- a/skins/Modern/i18n/be.json
+++ b/skins/Modern/i18n/be.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Сучаснасць"
 }
diff --git a/skins/Modern/i18n/bg.json b/skins/Modern/i18n/bg.json
index ad220251..322df9a2 100644
--- a/skins/Modern/i18n/bg.json
+++ b/skins/Modern/i18n/bg.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Модерен"
 }
diff --git a/skins/Modern/i18n/da.json b/skins/Modern/i18n/da.json
index 62c98826..51151604 100644
--- a/skins/Modern/i18n/da.json
+++ b/skins/Modern/i18n/da.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Moderne"
 }
diff --git a/skins/Modern/i18n/de.json b/skins/Modern/i18n/de.json
index a666783b..4b14cdbd 100644
--- a/skins/Modern/i18n/de.json
+++ b/skins/Modern/i18n/de.json
@@ -1,11 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Metalhead64"
+			"Metalhead64",
+			"Kghbln"
 		]
 	},
 	"modern.css": "/* Das folgende CSS wird für Benutzer der Modern-Benutzeroberfläche geladen. */",
 	"modern.js": "/* Das folgende JavaScript wird für Benutzer der Modern-Benutzeroberfläche geladen. */",
 	"skinname-modern": "Modern",
-	"modern-desc": "Ein Thema in blau und grau mit Seiten- und Kopfleiste. Abgeleitet von MonoBook."
+	"modern-desc": "Stellt eine klassische Benutzeroberfläche bereit"
 }
diff --git a/skins/Modern/i18n/el.json b/skins/Modern/i18n/el.json
index b824d77a..01dce87a 100644
--- a/skins/Modern/i18n/el.json
+++ b/skins/Modern/i18n/el.json
@@ -1,10 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Dead3y3"
+			"Dead3y3",
+			"Geraki"
 		]
 	},
 	"modern.css": "/* Το τοποθετημένο εδώ CSS θα επηρεάσει χρήστες του Modern skin */",
 	"modern.js": "/* Οποιοσδήποτε κώδικας JavaScript εδώ θα φορτωθεί για χρήστες που χρησιμοποιούν το Modern skin */",
-	"skinname-modern": "Μοντέρνο"
+	"skinname-modern": "Μοντέρνο",
+	"modern-desc": "Ένα μπλε/γκρι θέμα με πλαϊνή μπάρα και μπάρα στην κορυφή. Προέρχεται από το MonoBook."
 }
diff --git a/skins/Modern/i18n/en.json b/skins/Modern/i18n/en.json
index 398e5329..a22435e4 100644
--- a/skins/Modern/i18n/en.json
+++ b/skins/Modern/i18n/en.json
@@ -2,5 +2,5 @@
 	"modern.css": "/* CSS placed here will affect users of the Modern skin */",
 	"modern.js": "/* Any JavaScript here will be loaded for users using the Modern skin */",
 	"skinname-modern": "Modern",
-	"modern-desc": "A blue/grey theme with sidebar and top bar. Derived from MonoBook."
+	"modern-desc": "A blue/grey theme with sidebar and top bar. Derived from MonoBook"
 }
diff --git a/skins/Modern/i18n/fi.json b/skins/Modern/i18n/fi.json
index df0fec75..fcbcf0eb 100644
--- a/skins/Modern/i18n/fi.json
+++ b/skins/Modern/i18n/fi.json
@@ -3,10 +3,12 @@
 		"authors": [
 			"Nedergard",
 			"Nike",
-			"Str4nd"
+			"Str4nd",
+			"McSalama"
 		]
 	},
 	"modern.css": "/* Tämä sivu sisältää Moderni-ulkoasua muuttavia tyylejä. */",
 	"modern.js": "/* Tämän sivun JavaScript-koodi liitetään Moderni-tyyliin */",
-	"skinname-modern": "Moderni"
+	"skinname-modern": "Moderni",
+	"modern-desc": "Siniharmaa teema sivu- ja yläpalkilla. Muunnettu MonoBookista"
 }
diff --git a/skins/Modern/i18n/fur.json b/skins/Modern/i18n/fur.json
index 62c98826..51151604 100644
--- a/skins/Modern/i18n/fur.json
+++ b/skins/Modern/i18n/fur.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Moderne"
 }
diff --git a/skins/Modern/i18n/gl.json b/skins/Modern/i18n/gl.json
index 5067710a..9d227c9f 100644
--- a/skins/Modern/i18n/gl.json
+++ b/skins/Modern/i18n/gl.json
@@ -1,10 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Toliño"
+			"Toliño",
+			"Elisardojm"
 		]
 	},
 	"modern.css": "/* O CSS que se coloque aquí afectará a quen use a aparencia Moderna */",
 	"modern.js": "/* Calquera JavaScript que haxa aquí será cargado para os usuarios que usen a aparencia Moderna */",
-	"skinname-modern": "Moderna"
+	"skinname-modern": "Moderna",
+	"modern-desc": "Un tema azul e gris, con barras lateral e superior. Derivado de MonoBook."
 }
diff --git a/skins/Modern/i18n/he.json b/skins/Modern/i18n/he.json
index 27f64752..51662949 100644
--- a/skins/Modern/i18n/he.json
+++ b/skins/Modern/i18n/he.json
@@ -1,5 +1,11 @@
 {
+	"@metadata": {
+		"authors": [
+			"Amire80"
+		]
+	},
 	"modern.css": "/* הסגנונות הנכתבים כאן ישפיעו על העיצוב Modern בלבד */",
 	"modern.js": "/* כל סקריפט JavaScript שנכתב כאן ירוץ רק עבור המשתמשים בעיצוב Modern */",
-	"skinname-modern": "מודרני"
+	"skinname-modern": "מודרני",
+	"modern-desc": "עיצוב כחול־אפור עם סרגל צד וסרגל עליון. נגזר ממונובוק"
 }
diff --git a/skins/Modern/i18n/hi.json b/skins/Modern/i18n/hi.json
new file mode 100644
index 00000000..df6edb25
--- /dev/null
+++ b/skins/Modern/i18n/hi.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Siddhartha Ghai"
+		]
+	},
+	"modern-desc": "ऊपर एवं किनारे की पट्टी के साथ एक नीला/ग्रे थीम। मोनोबुक पर आधारित।"
+}
diff --git a/skins/Modern/i18n/ilo.json b/skins/Modern/i18n/ilo.json
new file mode 100644
index 00000000..3437a471
--- /dev/null
+++ b/skins/Modern/i18n/ilo.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Lam-ang"
+		]
+	},
+	"modern-desc": "Ti asul/kolordapo a tema nga addaan iti igid a baras ken ngato a baras. Napataud manipud ti MonoBook"
+}
diff --git a/skins/Modern/i18n/is.json b/skins/Modern/i18n/is.json
index 7e18fc5a..910832ae 100644
--- a/skins/Modern/i18n/is.json
+++ b/skins/Modern/i18n/is.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Nútímalegt"
 }
diff --git a/skins/Modern/i18n/kk-arab.json b/skins/Modern/i18n/kk-arab.json
index 937f5fcb..505c7636 100644
--- a/skins/Modern/i18n/kk-arab.json
+++ b/skins/Modern/i18n/kk-arab.json
@@ -1,4 +1,5 @@
 {
+	"@metadata": [],
 	"modern.css": "/* مىندا ورنالاستىرىلعان CSS تەك «زاماناۋىي» (modern) مانەرىن پايدالانۋشىلارىنا ىقپال ەتەدى */",
 	"modern.js": "/* مىنداعى JavaScript تەك «زاماناۋىي» (modern) مانەرىن پايدالانۋشىلار ٴۇشىن جەگىلەدى */",
 	"skinname-modern": "زاماناۋىي (modern)"
diff --git a/skins/Modern/i18n/kk-cyrl.json b/skins/Modern/i18n/kk-cyrl.json
index c7055c9c..9f32a343 100644
--- a/skins/Modern/i18n/kk-cyrl.json
+++ b/skins/Modern/i18n/kk-cyrl.json
@@ -1,4 +1,5 @@
 {
+	"@metadata": [],
 	"modern.css": "/* Мында орналастырылған CSS тек «Заманауи» (modern) мәнерін пайдаланушыларына ықпал етеді */",
 	"modern.js": "/* Мындағы JavaScript тек «Заманауи» (modern) мәнерін пайдаланушылар үшін жегіледі */",
 	"skinname-modern": "Заманауи (modern)"
diff --git a/skins/Modern/i18n/kk-latn.json b/skins/Modern/i18n/kk-latn.json
index 41764951..1ae1e2df 100644
--- a/skins/Modern/i18n/kk-latn.json
+++ b/skins/Modern/i18n/kk-latn.json
@@ -1,4 +1,5 @@
 {
+	"@metadata": [],
 	"modern.css": "/* Mında ornalastırılğan CSS tek «Zamanawï» (modern) mänerin paýdalanwşılarına ıqpal etedi */",
 	"modern.js": "/* Mındağı JavaScript tek «Zamanawï» (modern) mänerin paýdalanwşılar üşin jegiledi */",
 	"skinname-modern": "Zamanawï (modern)"
diff --git a/skins/Modern/i18n/ko.json b/skins/Modern/i18n/ko.json
index 3a5703ec..4a4056e6 100644
--- a/skins/Modern/i18n/ko.json
+++ b/skins/Modern/i18n/ko.json
@@ -6,5 +6,6 @@
 	},
 	"modern.css": "/* 이 CSS 설정은 모던 스킨을 사용하는 사용자에게 적용됩니다 */",
 	"modern.js": "/* 이 자바스크립트 설정은 모던 스킨을 사용하는 사용자에게 적용됩니다 */",
-	"skinname-modern": "모던"
+	"skinname-modern": "모던",
+	"modern-desc": "사이드바와 위 막대가 있는 파랑/회색 테마입니다. 모노북에서 파생되었습니다."
 }
diff --git a/skins/Modern/i18n/ksh.json b/skins/Modern/i18n/ksh.json
index a2175809..a90e0749 100644
--- a/skins/Modern/i18n/ksh.json
+++ b/skins/Modern/i18n/ksh.json
@@ -4,7 +4,8 @@
 			"Purodha"
 		]
 	},
-	"modern.css": "/* CSS heh aan dä Stell wirrek nur op de Ovverflääsch „Modern“ */",
-	"modern.js": "/* De JavaSkrippte fun hee krijje alle Sigge met de Ovverflääsch \"Modern\" jescheck */",
-	"skinname-modern": "Modern"
+	"modern.css": "/* at CSS heh aan dä Schtäll wirrek nur op di Bedehnbovverflääsch „Modärn“ */",
+	"modern.js": "/* De JavaSkreppte fun heh krejje alle Sigge met de Bedehnbovverflääsch „Modärn“ jescheck */",
+	"skinname-modern": "Modärn",
+	"modern-desc": "En blou-jroue Bedehnbovverfläsch med enem Menüh aan de Sigg un einem bovve drövver. Ene Affkömmleng vum Monobohch."
 }
diff --git a/skins/Modern/i18n/lzh.json b/skins/Modern/i18n/lzh.json
index 052736eb..88f1760d 100644
--- a/skins/Modern/i18n/lzh.json
+++ b/skins/Modern/i18n/lzh.json
@@ -1,4 +1,5 @@
 {
+	"@metadata": [],
 	"modern.css": "/* 此之 CSS 用於時髦面之簿也 */",
 	"modern.js": "/* 此之JavaScript將載於用時髦面之簿 */",
 	"skinname-modern": "時髦"
diff --git a/skins/Modern/i18n/mr.json b/skins/Modern/i18n/mr.json
index 8bce4a6b..c06601b3 100644
--- a/skins/Modern/i18n/mr.json
+++ b/skins/Modern/i18n/mr.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "आधुनिक"
 }
diff --git a/skins/Modern/i18n/mwl.json b/skins/Modern/i18n/mwl.json
index ec5086ef..3b25d7cc 100644
--- a/skins/Modern/i18n/mwl.json
+++ b/skins/Modern/i18n/mwl.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Moderno"
 }
diff --git a/skins/Modern/i18n/myv.json b/skins/Modern/i18n/myv.json
index f2d412f3..efe00393 100644
--- a/skins/Modern/i18n/myv.json
+++ b/skins/Modern/i18n/myv.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "НееньШкань"
 }
diff --git a/skins/Modern/i18n/nap.json b/skins/Modern/i18n/nap.json
new file mode 100644
index 00000000..5eb9f31d
--- /dev/null
+++ b/skins/Modern/i18n/nap.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"C.R."
+		]
+	},
+	"modern-desc": "Verziona 'n blu e grigio cu barra laterale e supiriore. Derivata 'a MonoBook."
+}
diff --git a/skins/Modern/i18n/nb.json b/skins/Modern/i18n/nb.json
index 74fe02b8..da77d690 100644
--- a/skins/Modern/i18n/nb.json
+++ b/skins/Modern/i18n/nb.json
@@ -1,5 +1,7 @@
 {
+	"@metadata": [],
 	"modern.css": "/* CSS i denne fila vil gjelde alle som bruker drakta Modern */",
 	"modern.js": "/* Javascript i denne fila vil gjelde for brukere av drakta Modern */",
-	"skinname-modern": "Moderne"
+	"skinname-modern": "Moderne",
+	"modern-desc": "En blågrå drakt med sidestolpe og topplinje. Basert på MonoBook"
 }
diff --git a/skins/Modern/i18n/nl.json b/skins/Modern/i18n/nl.json
index efd95d57..27717073 100644
--- a/skins/Modern/i18n/nl.json
+++ b/skins/Modern/i18n/nl.json
@@ -6,5 +6,6 @@
 	},
 	"modern.css": "/* CSS die hier wordt geplaatst heeft alleen invloed op de skin Modern */",
 	"modern.js": "/* JavaScript die hier wordt geplaatst heeft alleen invloed op gebruikers die de skin Modern gebruiken */",
-	"skinname-modern": "Modern"
+	"skinname-modern": "Modern",
+	"modern-desc": "Een blauw-grijs uiterlijk met een zij- en bovenmenu, afgeleid van MonoBook"
 }
diff --git a/skins/Modern/i18n/ps.json b/skins/Modern/i18n/ps.json
index c687dfda..c0838ea3 100644
--- a/skins/Modern/i18n/ps.json
+++ b/skins/Modern/i18n/ps.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "نوی"
 }
diff --git a/skins/Modern/i18n/qqq.json b/skins/Modern/i18n/qqq.json
index a620a1d7..f7087455 100644
--- a/skins/Modern/i18n/qqq.json
+++ b/skins/Modern/i18n/qqq.json
@@ -7,5 +7,6 @@
 	},
 	"modern.css": "{{optional}}",
 	"modern.js": "{{optional}}",
-	"skinname-modern": "{{optional}}\n{{Identical|Modern}}"
+	"skinname-modern": "{{optional}}\n{{Identical|Modern}}",
+	"modern-desc": "{{desc|what=skin|name=Modern|url=https://www.mediawiki.org/wiki/Skin:Modern}}"
 }
diff --git a/skins/Modern/i18n/roa-tara.json b/skins/Modern/i18n/roa-tara.json
index 5ba5bc97..df3e0d11 100644
--- a/skins/Modern/i18n/roa-tara.json
+++ b/skins/Modern/i18n/roa-tara.json
@@ -6,5 +6,6 @@
 	},
 	"modern.css": "/* 'U CSS ca se iacchie aqquà 'u 'ndrucane le utinde d'a masckere Moderne */",
 	"modern.js": "/* Ogne JavaScript aqquà avène carecate pe le utinde ca ausane 'a masckere Moderne */",
-	"skinname-modern": "Moderne"
+	"skinname-modern": "Moderne",
+	"modern-desc": "'Nu teme blu/grigge cu le barre laterale e de sus. Derivate da MonoBook"
 }
diff --git a/skins/Modern/i18n/sah.json b/skins/Modern/i18n/sah.json
index f389250d..31842423 100644
--- a/skins/Modern/i18n/sah.json
+++ b/skins/Modern/i18n/sah.json
@@ -1,3 +1,4 @@
 {
+	"@metadata": [],
 	"skinname-modern": "Билиҥҥи"
 }
diff --git a/skins/Modern/i18n/sco.json b/skins/Modern/i18n/sco.json
new file mode 100644
index 00000000..d61b4c8c
--- /dev/null
+++ b/skins/Modern/i18n/sco.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"John Reid"
+		]
+	},
+	"modern-desc": "Ae blue/gray theme wi sidebaur n tap baur. Basit oan MonoBook."
+}
diff --git a/skins/Modern/i18n/sr-el.json b/skins/Modern/i18n/sr-el.json
index 33899819..d829c287 100644
--- a/skins/Modern/i18n/sr-el.json
+++ b/skins/Modern/i18n/sr-el.json
@@ -1,4 +1,5 @@
 {
+	"@metadata": [],
 	"modern.css": "/* CSS postavljen ovde će uticati na sve korisnike teme „Savremeno“ */",
 	"modern.js": "/* Javaskript postavljen ovde će se učitati za sve one koji koriste temu „Savremeno“ */",
 	"skinname-modern": "Savremeno"
diff --git a/skins/Modern/i18n/uk.json b/skins/Modern/i18n/uk.json
index 9aa7a2a5..8ba258b8 100644
--- a/skins/Modern/i18n/uk.json
+++ b/skins/Modern/i18n/uk.json
@@ -1,10 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Dim Grits"
+			"Dim Grits",
+			"Andriykopanytsia"
 		]
 	},
 	"modern.css": "/* Розміщений тут CSS-код буде використаний в темі оформлення Сучасне */",
 	"modern.js": "/* Розміщений тут код JavaScript буде завантажений для всіх користувачів, що використовують тему оформлення Сучасне */",
-	"skinname-modern": "Сучасне"
+	"skinname-modern": "Сучасне",
+	"modern-desc": "Синя/сіра тема з бічною та верхньою панелями. Похідна від MonoBook."
 }
diff --git a/skins/Modern/i18n/yue.json b/skins/Modern/i18n/yue.json
index 3c28d364..3cec7249 100644
--- a/skins/Modern/i18n/yue.json
+++ b/skins/Modern/i18n/yue.json
@@ -1,4 +1,5 @@
 {
+	"@metadata": [],
 	"modern.css": "/* 響呢度放 CSS 碼去改用戶用嘅摩登畫面 */",
 	"modern.js": "/* 響每一次個頁面載入時，用摩登畫面嘅用戶都會載入呢度任何嘅JavaScript */",
 	"skinname-modern": "摩登"
diff --git a/skins/Modern/i18n/zh-hans.json b/skins/Modern/i18n/zh-hans.json
index 756f801d..7ee50a3d 100644
--- a/skins/Modern/i18n/zh-hans.json
+++ b/skins/Modern/i18n/zh-hans.json
@@ -8,5 +8,5 @@
 	"modern.css": "/* 放置于这里的CSS将影响使用现代皮肤的用户 */",
 	"modern.js": "/* 这里的任何JavaScript将为使用现代皮肤的用户加载 */",
 	"skinname-modern": "现代",
-	"modern-desc": "带侧边栏和顶栏的蓝灰色主题。从MonoBook衍生而来。"
+	"modern-desc": "带侧边栏和顶栏的蓝灰色主题。从MonoBook衍生而来"
 }
diff --git a/skins/Modern/i18n/zh-hant.json b/skins/Modern/i18n/zh-hant.json
index 431c568d..25e3b3ba 100644
--- a/skins/Modern/i18n/zh-hant.json
+++ b/skins/Modern/i18n/zh-hant.json
@@ -1,11 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Cwlin0416"
+			"Cwlin0416",
+			"Liuxinyu970226"
 		]
 	},
 	"modern.css": "/* 此 CSS 會影響使用 Modern 介面外觀的使用者 */",
 	"modern.js": "/* 此 JavaScript 會用於使用 Modern 介面外觀的使用者 */",
 	"skinname-modern": "現代",
-	"modern-desc": "擁有側邊欄與上方列的藍灰色主題。 自 MonoBook 衍生而來。"
+	"modern-desc": "擁有側邊欄與上方列的藍灰色主題。自 MonoBook 衍生而來"
 }
diff --git a/skins/Modern/resources/main.css b/skins/Modern/resources/main.css
index 1ce8ada4..8c8ce3c8 100644
--- a/skins/Modern/resources/main.css
+++ b/skins/Modern/resources/main.css
@@ -27,11 +27,21 @@ body {
 	border: none;
 	height: 2em;
 	width: 100%;
-
 	background-color: #003366;
 	color: white;
 }
 
+.mw-indicators {
+	float: right;
+}
+
+.mw-indicator {
+	display: -moz-inline-block;
+	display: inline-block;
+	zoom: 1;
+	*display: inline;
+}
+
 #mw_header h1 {
 	margin: 0 0 0 0.5em;
 	padding: 0 0 0 0;
@@ -47,7 +57,6 @@ body {
 	margin: 0 0 0 0;
 	padding: 0 0 0 0;
 	width: 100%;
-
 }
 
 #p-personal div.pBody {
@@ -649,7 +658,6 @@ table.toc td {
 	margin: 0 0 0 0;
 }
 
-#mw_header h1,
 #p-personal,
 #p-cactions {
 	overflow: hidden;
diff --git a/skins/Modern/skin.json b/skins/Modern/skin.json
new file mode 100644
index 00000000..98ba815a
--- /dev/null
+++ b/skins/Modern/skin.json
@@ -0,0 +1,40 @@
+{
+	"name": "Modern",
+	"author": [
+		"River Tarnell",
+		"..."
+	],
+	"url": "https://www.mediawiki.org/wiki/Skin:Modern",
+	"descriptionmsg": "modern-desc",
+	"namemsg": "skinname-modern",
+	"license-name": "GPL-2.0+",
+	"type": "skin",
+	"ValidSkinNames": {
+		"modern": "Modern"
+	},
+	"MessagesDirs": {
+		"Modern": [
+			"i18n"
+		]
+	},
+	"ResourceModules": {
+		"skins.modern": {
+			"styles": {
+				"resources/main.css": {
+					"media": "screen"
+				},
+				"resources/print.css": {
+					"media": "print"
+				}
+			}
+		}
+	},
+	"ResourceFileModulePaths": {
+		"localBasePath": "",
+		"remoteSkinPath": "Modern"
+	},
+	"AutoloadClasses": {
+		"SkinModern": "SkinModern.php",
+		"ModernTemplate": "SkinModern.php"
+	}
+}