Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 301 insertions, 96 deletions

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index baa0c96e..de163a61 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -56,9 +56,6 @@ $wgMessageStructure = array(
 		'tog-shownumberswatching',
 		'tog-oldsig',
 		'tog-fancysig',
-		'tog-externaleditor',
-		'tog-externaldiff',
-		'tog-showjumplinks',
 		'tog-uselivepreview',
 		'tog-forceeditsummary',
 		'tog-watchlisthideown',
@@ -72,6 +69,8 @@ $wgMessageStructure = array(
 		'tog-showhiddencats',
 		'tog-noconvertlink',
 		'tog-norollbackdiff',
+		'tog-useeditwarning',
+		'tog-prefershttps'
 	),
 	'underline' => array(
 		'underline-always',
@@ -136,6 +135,18 @@ $wgMessageStructure = array(
 		'oct',
 		'nov',
 		'dec',
+		'january-date',
+		'february-date',
+		'march-date',
+		'april-date',
+		'may-date',
+		'june-date',
+		'july-date',
+		'august-date',
+		'september-date',
+		'october-date',
+		'november-date',
+		'december-date',
 	),
 	'categorypages' => array(
 		'pagecategories',
@@ -167,6 +178,7 @@ $wgMessageStructure = array(
 		'newwindow',
 		'cancel',
 		'moredotdotdot',
+		'morenotlisted',
 		'mypage',
 		'mytalk',
 		'anontalk',
@@ -178,7 +190,6 @@ $wgMessageStructure = array(
 		'qbbrowse',
 		'qbedit',
 		'qbpageoptions',
-		'qbpageinfo',
 		'qbmyoptions',
 		'qbspecialpages',
 		'faq',
@@ -204,6 +215,7 @@ $wgMessageStructure = array(
 		'variants',
 	),
 	'miscellaneous2' => array(
+		'navigation-heading',
 		'errorpagetitle',
 		'returnto',
 		'tagline',
@@ -225,6 +237,7 @@ $wgMessageStructure = array(
 		'create-this-page',
 		'delete',
 		'deletethispage',
+		'undeletethispage',
 		'undelete_short',
 		'viewdeleted_short',
 		'protect',
@@ -312,7 +325,6 @@ $wgMessageStructure = array(
 		'youhavenewmessagesmulti',
 		'newtalkseparator',
 		'editsection',
-		'editsection-brackets',
 		'editold',
 		'viewsourceold',
 		'editlink',
@@ -365,8 +377,11 @@ $wgMessageStructure = array(
 	'errors' => array(
 		'error',
 		'databaseerror',
-		'dberrortext',
-		'dberrortextcl',
+		'databaseerror-text',
+		'databaseerror-textcl',
+		'databaseerror-query',
+		'databaseerror-function',
+		'databaseerror-error',
 		'laggedslavemode',
 		'readonly',
 		'enterlockreason',
@@ -391,6 +406,7 @@ $wgMessageStructure = array(
 		'cannotdelete',
 		'cannotdelete-title',
 		'delete-hook-aborted',
+		'no-null-revision',
 		'badtitle',
 		'badtitletext',
 		'perfcached',
@@ -406,11 +422,14 @@ $wgMessageStructure = array(
 		'viewyourtext',
 		'protectedinterface',
 		'editinginterface',
-		'sqlhidden',
 		'cascadeprotected',
 		'namespaceprotected',
 		'customcssprotected',
 		'customjsprotected',
+		'mycustomcssprotected',
+		'mycustomjsprotected',
+		'myprivateinfoprotected',
+		'mypreferencesprotected',
 		'ns-specialprotected',
 		'titleprotected',
 		'filereadonlyerror',
@@ -426,12 +445,23 @@ $wgMessageStructure = array(
 	),
 	'login' => array(
 		'logouttext',
-		'welcomecreation',
+		'welcomeuser',
+		'welcomecreation-msg',
 		'yourname',
+		'userlogin-yourname',
+		'userlogin-yourname-ph',
+		'createacct-another-username-ph',
+		'createacct-helpusername',
 		'yourpassword',
+		'userlogin-yourpassword',
+		'userlogin-yourpassword-ph',
+		'createacct-yourpassword-ph',
 		'yourpasswordagain',
+		'createacct-yourpasswordagain',
+		'createacct-yourpasswordagain-ph',
 		'remembermypassword',
-		'securelogin-stick-https',
+		'userlogin-remembermypassword',
+		'userlogin-signwithsecure',
 		'yourdomainname',
 		'password-change-forbidden',
 		'externaldberror',
@@ -444,17 +474,49 @@ $wgMessageStructure = array(
 		'userlogout',
 		'userlogout-summary',
 		'notloggedin',
+		'userlogin-noaccount',
+		'userlogin-joinproject',
 		'nologin',
 		'nologinlink',
 		'createaccount',
 		'gotaccount',
 		'gotaccountlink',
 		'userlogin-resetlink',
+		'userlogin-resetpassword-link',
+		'helplogin-url',
+		'userlogin-helplink',
+		'userlogin-loggedin',
+		'userlogin-createanother',
+		'createacct-join',
+		'createacct-another-join',
+		'createacct-emailrequired',
+		'createacct-emailoptional',
+		'createacct-email-ph',
+		'createacct-another-email-ph',
 		'createaccountmail',
+		'createacct-realname',
 		'createaccountreason',
+		'createacct-reason',
+		'createacct-reason-ph',
+		'createacct-captcha',
+		'createacct-imgcaptcha-help',
+		'createacct-imgcaptcha-ph',
+		'createacct-submit',
+		'createacct-another-submit',
+		'createacct-benefit-heading',
+		'createacct-benefit-icon1',
+		'createacct-benefit-head1',
+		'createacct-benefit-body1',
+		'createacct-benefit-icon2',
+		'createacct-benefit-head2',
+		'createacct-benefit-body2',
+		'createacct-benefit-icon3',
+		'createacct-benefit-head3',
+		'createacct-benefit-body3',
 		'badretype',
 		'userexists',
 		'loginerror',
+		'createacct-error',
 		'createaccounterror',
 		'nocookiesnew',
 		'nocookieslogin',
@@ -506,12 +568,14 @@ $wgMessageStructure = array(
 		'loginlanguagelabel',
 		'loginlanguagelinks',
 		'suspicious-userlogout',
+		'createacct-another-realname-tip',
 	),
 	'mail' => array(
 		'pear-mail-error',
 		'php-mail-error',
 		'php-mail-error-unknown',
 		'user-mail-no-addy',
+		'user-mail-no-body',
 	),
 	'resetpass' => array(
 		'resetpass',
@@ -522,20 +586,22 @@ $wgMessageStructure = array(
 		'newpassword',
 		'retypenew',
 		'resetpass_submit',
-		'resetpass_success',
+		'changepassword-success',
 		'resetpass_forbidden',
 		'resetpass-no-info',
 		'resetpass-submit-loggedin',
 		'resetpass-submit-cancel',
 		'resetpass-wrong-oldpass',
 		'resetpass-temp-password',
+		'resetpass-abort-generic',
 	),
 	'passwordreset' => array(
 		'passwordreset',
-		'passwordreset-text',
+		'passwordreset-text-one',
+		'passwordreset-text-many',
 		'passwordreset-legend',
 		'passwordreset-disabled',
-		'passwordreset-pretext',
+		'passwordreset-emaildisabled',
 		'passwordreset-username',
 		'passwordreset-domain',
 		'passwordreset-capture',
@@ -558,9 +624,22 @@ $wgMessageStructure = array(
 		'changeemail-oldemail',
 		'changeemail-newemail',
 		'changeemail-none',
+		'changeemail-password',
 		'changeemail-submit',
 		'changeemail-cancel',
 	),
+	'resettokens' => array(
+		'resettokens',
+		'resettokens-summary',
+		'resettokens-text',
+		'resettokens-no-tokens',
+		'resettokens-legend',
+		'resettokens-tokens',
+		'resettokens-token-label',
+		'resettokens-watchlist-token',
+		'resettokens-done',
+		'resettokens-resetbutton',
+	),
 	'toolbar' => array(
 		'bold_sample',
 		'bold_tip',
@@ -670,7 +749,6 @@ $wgMessageStructure = array(
 		'hiddencategories',
 		'edittools',
 		'edittools-upload',
-		'nocreatetitle',
 		'nocreatetext',
 		'nocreate-loggedin',
 		'sectioneditnotsupported-title',
@@ -685,10 +763,21 @@ $wgMessageStructure = array(
 		'edit-gone-missing',
 		'edit-conflict',
 		'edit-no-change',
+		'postedit-confirmation',
 		'edit-already-exists',
 		'addsection-preload',
 		'addsection-editintro',
 		'defaultmessagetext',
+		'content-failed-to-parse',
+		'invalid-content-data',
+		'content-not-allowed-here',
+		'editwarning-warning',
+	),
+	'contentmodels' => array(
+		'content-model-wikitext',
+		'content-model-text',
+		'content-model-javascript',
+		'content-model-css',
 	),
 	'parserwarnings' => array(
 		'expensive-parserfunction-warning',
@@ -713,6 +802,7 @@ $wgMessageStructure = array(
 		'undo-failure',
 		'undo-norev',
 		'undo-summary',
+		'undo-summary-username-hidden',
 	),
 	'cantcreateaccount' => array(
 		'cantcreateaccounttitle',
@@ -861,6 +951,7 @@ $wgMessageStructure = array(
 		'compareselectedversions',
 		'showhideselectedversions',
 		'editundo',
+		'diff-empty',
 		'diff-multi',
 		'diff-multi-manyusers',
 		'difference-missing-revision',
@@ -887,9 +978,7 @@ $wgMessageStructure = array(
 		'searchmenu-exists',
 		'searchmenu-new',
 		'searchmenu-new-nocreate',
-		'searchhelp-url',
 		'searchmenu-prefix',
-		'searchmenu-help',
 		'searchprofile-articles',
 		'searchprofile-project',
 		'searchprofile-images',
@@ -931,19 +1020,11 @@ $wgMessageStructure = array(
 		'search-external',
 		'searchdisabled',
 		'googlesearch',
+		'search-error',
 	),
 	'opensearch' => array(
 		'opensearch-desc',
 	),
-	'quickbar' => array(
-		'qbsettings',
-		'qbsettings-none',
-		'qbsettings-fixedleft',
-		'qbsettings-fixedright',
-		'qbsettings-floatingleft',
-		'qbsettings-floatingright',
-		'qbsettings-directionality',
-	),
 	'preferences' => array(
 		'preferences',
 		'preferences-summary',
@@ -978,7 +1059,6 @@ $wgMessageStructure = array(
 		'resetprefs',
 		'restoreprefs',
 		'prefs-editing',
-		'prefs-edit-boxsize',
 		'rows',
 		'columns',
 		'searchresultshead',
@@ -989,7 +1069,7 @@ $wgMessageStructure = array(
 		'recentchangesdays-max',
 		'recentchangescount',
 		'prefs-help-recentchangescount',
-		'prefs-help-watchlist-token',
+		'prefs-help-watchlist-token2',
 		'savedprefs',
 		'timezonelegend',
 		'localtime',
@@ -1020,7 +1100,6 @@ $wgMessageStructure = array(
 		'prefs-common-css-js',
 		'prefs-reset-intro',
 		'prefs-emailconfirm-label',
-		'prefs-textboxsize',
 		'youremail',
 		'username',
 		'uid',
@@ -1055,6 +1134,8 @@ $wgMessageStructure = array(
 		'prefs-dateformat',
 		'prefs-timeoffset',
 		'prefs-advancedediting',
+		'prefs-editor',
+		'prefs-preview',
 		'prefs-advancedrc',
 		'prefs-advancedrendering',
 		'prefs-advancedsearchoptions',
@@ -1062,7 +1143,9 @@ $wgMessageStructure = array(
 		'prefs-displayrc',
 		'prefs-displaysearchoptions',
 		'prefs-displaywatchlist',
+		'prefs-tokenwatchlist',
 		'prefs-diffs',
+		'prefs-help-prefershttps',
 	),
 	'preferences-email' => array(
 		'email-address-validity-valid',
@@ -1079,6 +1162,7 @@ $wgMessageStructure = array(
 		'saveusergroups',
 		'userrights-groupsmember',
 		'userrights-groupsmember-auto',
+		'userrights-groupsmember-type',
 		'userrights-groups-help',
 		'userrights-reason',
 		'userrights-no-interwiki',
@@ -1088,6 +1172,8 @@ $wgMessageStructure = array(
 		'userrights-changeable-col',
 		'userrights-unchangeable-col',
 		'userrights-irreversible-marker',
+		'userrights-conflict',
+		'userrights-removed-self',
 	),
 	'group' => array(
 		'group',
@@ -1156,10 +1242,18 @@ $wgMessageStructure = array(
 		'right-unblockself',
 		'right-protect',
 		'right-editprotected',
+		'right-editsemiprotected',
 		'right-editinterface',
 		'right-editusercssjs',
 		'right-editusercss',
 		'right-edituserjs',
+		'right-editmyusercss',
+		'right-editmyuserjs',
+		'right-viewmywatchlist',
+		'right-editmywatchlist',
+		'right-viewmyprivateinfo',
+		'right-editmyprivateinfo',
+		'right-editmyoptions',
 		'right-rollback',
 		'right-markbotedits',
 		'right-noratelimit',
@@ -1177,12 +1271,13 @@ $wgMessageStructure = array(
 		'right-sendemail',
 		'right-passwordreset',
 	),
+	'newuserlog' => array(
+		'newuserlogpage',
+		'newuserlogpagetext',
+	),
 	'rightslog' => array(
 		'rightslog',
 		'rightslogtext',
-		'rightslogentry',
-		'rightslogentry-autopromote',
-		'rightsnone',
 	),
 	'action' => array(
 		'action-read',
@@ -1220,14 +1315,21 @@ $wgMessageStructure = array(
 		'action-userrights-interwiki',
 		'action-siteadmin',
 		'action-sendemail',
+		'action-editmywatchlist',
+		'action-viewmywatchlist',
+		'action-viewmyprivateinfo',
+		'action-editmyprivateinfo',
 	),
 	'recentchanges' => array(
 		'nchanges',
+		'enhancedrc-since-last-visit',
+		'enhancedrc-history',
 		'recentchanges',
 		'recentchanges-url',
 		'recentchanges-legend',
 		'recentchanges-summary',
 		'recentchangestext',
+		'recentchanges-noresult',
 		'recentchanges-feed-description',
 		'recentchanges-label-newpage',
 		'recentchanges-label-minor',
@@ -1267,7 +1369,6 @@ $wgMessageStructure = array(
 		'recentchangeslinked-feed',
 		'recentchangeslinked-toolbox',
 		'recentchangeslinked-title',
-		'recentchangeslinked-noresult',
 		'recentchangeslinked-summary',
 		'recentchangeslinked-page',
 		'recentchangeslinked-to',
@@ -1289,6 +1390,7 @@ $wgMessageStructure = array(
 		'upload-preferred',
 		'upload-prohibited',
 		'uploadfooter',
+		'upload-default-description',
 		'uploadlog',
 		'uploadlogpage',
 		'uploadlogpagetext',
@@ -1387,6 +1489,7 @@ $wgMessageStructure = array(
 		'backend-fail-notsame',
 		'backend-fail-invalidpath',
 		'backend-fail-delete',
+		'backend-fail-describe',
 		'backend-fail-alreadyexists',
 		'backend-fail-store',
 		'backend-fail-copy',
@@ -1465,7 +1568,6 @@ $wgMessageStructure = array(
 		'http-read-error',
 		'http-timed-out',
 		'http-curl-error',
-		'http-host-unreachable',
 		'http-bad-status',
 	),
 
@@ -1496,6 +1598,10 @@ $wgMessageStructure = array(
 		'listfiles_size',
 		'listfiles_description',
 		'listfiles_count',
+		'listfiles-show-all',
+		'listfiles-latestversion',
+		'listfiles-latestversion-yes',
+		'listfiles-latestversion-no',
 	),
 	'filedescription' => array(
 		'file-anchor-link',
@@ -1589,6 +1695,13 @@ $wgMessageStructure = array(
 		'randompage-nopages',
 		'randompage-url',
 	),
+	'randomincategory' => array(
+		'randomincategory',
+		'randomincategory-invalidcategory',
+		'randomincategory-nopages',
+		'randomincategory-selectcategory',
+		'randomincategory-selectcategory-submit',
+	),
 	'randomredirect' => array(
 		'randomredirect',
 		'randomredirect-nopages',
@@ -1616,11 +1729,15 @@ $wgMessageStructure = array(
 		'statistics-mostpopular',
 		'statistics-footer',
 	),
-	'disambiguations' => array(
-		'disambiguations',
-		'disambiguations-summary',
-		'disambiguationspage',
-		'disambiguations-text',
+	'pageswithprop' => array(
+		'pageswithprop',
+		'pageswithprop-summary',
+		'pageswithprop-legend',
+		'pageswithprop-text',
+		'pageswithprop-prop',
+		'pageswithprop-submit',
+		'pageswithprop-prophidden-long',
+		'pageswithprop-prophidden-binary',
 	),
 	'doubleredirects' => array(
 		'doubleredirects',
@@ -1704,6 +1821,7 @@ $wgMessageStructure = array(
 		'prefixindex',
 		'prefixindex-namespace',
 		'prefixindex-summary',
+		'prefixindex-strip',
 		'shortpages',
 		'shortpages-summary',
 		'longpages',
@@ -1725,6 +1843,7 @@ $wgMessageStructure = array(
 		'listusers-summary',
 		'listusers-editsonly',
 		'listusers-creationsort',
+		'listusers-desc',
 		'usereditcount',
 		'usercreated',
 		'newpages',
@@ -1833,10 +1952,6 @@ $wgMessageStructure = array(
 		'activeusers-submit',
 		'activeusers-noresult',
 	),
-	'newuserlog' => array(
-		'newuserlogpage',
-		'newuserlogpagetext',
-	),
 	'listgrouprights' => array(
 		'listgrouprights',
 		'listgrouprights-summary',
@@ -1914,7 +2029,6 @@ $wgMessageStructure = array(
 		'unwatchthispage',
 		'notanarticle',
 		'notvisiblerev',
-		'watchnochange',
 		'watchlist-details',
 		'wlheader-enotif',
 		'wlheader-showupdated',
@@ -1934,15 +2048,23 @@ $wgMessageStructure = array(
 	'enotif' => array(
 		'enotif_mailer',
 		'enotif_reset',
-		'enotif_newpagetext',
 		'enotif_impersonal_salutation',
-		'changed',
-		'created',
-		'enotif_subject',
+		'enotif_subject_deleted',
+		'enotif_subject_created',
+		'enotif_subject_moved',
+		'enotif_subject_restored',
+		'enotif_subject_changed',
+		'enotif_body_intro_deleted',
+		'enotif_body_intro_created',
+		'enotif_body_intro_moved',
+		'enotif_body_intro_restored',
+		'enotif_body_intro_changed',
 		'enotif_lastvisited',
 		'enotif_lastdiff',
 		'enotif_anon_editor',
 		'enotif_body',
+		'created',
+		'changed',
 	),
 	'delete' => array(
 		'deletepage',
@@ -2000,6 +2122,8 @@ $wgMessageStructure = array(
 		'prot_1movedto2',
 		'protect-badnamespace-title',
 		'protect-badnamespace-text',
+		'protect-norestrictiontypes-text',
+		'protect-norestrictiontypes-title',
 		'protect-legend',
 		'protectcomment',
 		'protectexpiry',
@@ -2015,6 +2139,7 @@ $wgMessageStructure = array(
 		'protect-fallback',
 		'protect-level-autoconfirmed',
 		'protect-level-sysop',
+		'protect-summary-desc',
 		'protect-summary-cascade',
 		'protect-expiring',
 		'protect-expiring-local',
@@ -2253,14 +2378,12 @@ $wgMessageStructure = array(
 		'ipb_blocked_as_range',
 		'ip_range_invalid',
 		'ip_range_toolarge',
-		'blockme',
 		'proxyblocker',
-		'proxyblocker-disabled',
 		'proxyblockreason',
-		'proxyblocksuccess',
 		'sorbs',
 		'sorbsreason',
 		'sorbs_create_account_reason',
+		'xffblockreason',
 		'cant-block-while-blocked',
 		'cant-see-hidden-user',
 		'ipbblocked',
@@ -2324,6 +2447,7 @@ $wgMessageStructure = array(
 		'movesubpagetext',
 		'movenosubpage',
 		'movereason',
+		'move-redirect-text',
 		'revertmove',
 		'delete_and_move',
 		'delete_and_move_text',
@@ -2335,6 +2459,7 @@ $wgMessageStructure = array(
 		'immobile-target-namespace-iw',
 		'immobile-source-page',
 		'immobile-target-page',
+		'bad-target-model',
 		'immobile_namespace',
 		'imagenocrossnamespace',
 		'nonfile-cannot-move-to-file',
@@ -2384,6 +2509,7 @@ $wgMessageStructure = array(
 		'thumbnail-more',
 		'filemissing',
 		'thumbnail_error',
+		'thumbnail_error_remote',
 		'djvu_page_error',
 		'djvu_no_xml',
 		'thumbnail-temp-create',
@@ -2436,6 +2562,7 @@ $wgMessageStructure = array(
 		'import-error-interwiki',
 		'import-error-special',
 		'import-error-invalid',
+		'import-error-unserialize',
 		'import-options-wrong',
 		'import-rootpage-invalid',
 		'import-rootpage-nosubpage',
@@ -2451,12 +2578,11 @@ $wgMessageStructure = array(
 	'javaccripttest' => array(
 		'javascripttest',
 		'javascripttest-backlink',
-		'javascripttest-disabled',
 		'javascripttest-title',
 		'javascripttest-pagetext-noframework',
 		'javascripttest-pagetext-unknownframework',
 		'javascripttest-pagetext-frameworks',
-		'javascripttest-pagetext-skins' ,
+		'javascripttest-pagetext-skins',
 		'javascripttest-qunit-name',
 		'javascripttest-qunit-intro',
 		'javascripttest-qunit-heading',
@@ -2601,20 +2727,15 @@ $wgMessageStructure = array(
 		'tooltip-undo',
 		'tooltip-preferences-save',
 		'tooltip-summary',
+		'interlanguage-link-title',
 	),
 	'stylesheets' => array(
 		'common.css',
-		'standard.css',
-		'nostalgia.css',
 		'cologneblue.css',
 		'monobook.css',
-		'myskin.css',
-		'chick.css',
-		'simple.css',
 		'modern.css',
 		'vector.css',
 		'print.css',
-		'handheld.css',
 		'noscript.css',
 		'group-autoconfirmed.css',
 		'group-bot.css',
@@ -2623,13 +2744,8 @@ $wgMessageStructure = array(
 	),
 	'scripts' => array(
 		'common.js',
-		'standard.js',
-		'nostalgia.js',
 		'cologneblue.js',
 		'monobook.js',
-		'myskin.js',
-		'chick.js',
-		'simple.js',
 		'modern.js',
 		'vector.js',
 		'group-autoconfirmed.js',
@@ -2660,6 +2776,7 @@ $wgMessageStructure = array(
 		'spam_reverting',
 		'spam_blanking',
 		'spam_deleting',
+		'simpleantispam-label',
 	),
 	'info' => array(
 		'pageinfo-header',
@@ -2673,11 +2790,13 @@ $wgMessageStructure = array(
 		'pageinfo-default-sort',
 		'pageinfo-length',
 		'pageinfo-article-id',
+		'pageinfo-language',
 		'pageinfo-robot-policy',
 		'pageinfo-robot-index',
 		'pageinfo-robot-noindex',
 		'pageinfo-views',
 		'pageinfo-watchers',
+		'pageinfo-few-watchers',
 		'pageinfo-redirects-name',
 		'pageinfo-redirects-value',
 		'pageinfo-subpages-name',
@@ -2693,16 +2812,24 @@ $wgMessageStructure = array(
 		'pageinfo-magic-words',
 		'pageinfo-hidden-categories',
 		'pageinfo-templates',
+		'pageinfo-transclusions',
 		'pageinfo-footer',
+		'pageinfo-toolboxlink',
+		'pageinfo-redirectsto',
+		'pageinfo-redirectsto-info',
+		'pageinfo-contentpage',
+		'pageinfo-contentpage-yes',
+		'pageinfo-protect-cascading',
+		'pageinfo-protect-cascading-yes',
+		'pageinfo-protect-cascading-from',
+		'pageinfo-category-info',
+		'pageinfo-category-pages',
+		'pageinfo-category-subcats',
+		'pageinfo-category-files'
 	),
 	'skin' => array(
-		'skinname-standard',
-		'skinname-nostalgia',
 		'skinname-cologneblue',
 		'skinname-monobook',
-		'skinname-myskin',
-		'skinname-chick',
-		'skinname-simple',
 		'skinname-modern',
 		'skinname-vector',
 	),
@@ -2717,6 +2844,8 @@ $wgMessageStructure = array(
 		'markedaspatrollederror',
 		'markedaspatrollederrortext',
 		'markedaspatrollederror-noautopatrol',
+		'markedaspatrollednotify',
+		'markedaspatrollederrornotify',
 	),
 	'patrol-log' => array(
 		'patrol-log-page',
@@ -2748,6 +2877,7 @@ $wgMessageStructure = array(
 		'file-nohires',
 		'svg-long-desc',
 		'svg-long-desc-animated',
+		'svg-long-error',
 		'show-big-image',
 		'show-big-image-preview',
 		'show-big-image-other',
@@ -2782,7 +2912,25 @@ $wgMessageStructure = array(
 		'minutes',
 		'hours',
 		'days',
+		'weeks',
+		'months',
+		'years',
 		'ago',
+		'just-now',
+	),
+	'human-timestamps' => array(
+		'hours-ago',
+		'minutes-ago',
+		'seconds-ago',
+		'monday-at',
+		'tuesday-at',
+		'wednesday-at',
+		'thursday-at',
+		'friday-at',
+		'saturday-at',
+		'sunday-at',
+		'today-at',
+		'yesterday-at',
 	),
 	'badimagelist' => array(
 		'bad_image_list',
@@ -3139,16 +3287,16 @@ $wgMessageStructure = array(
 		'exif-lightsource-255',
 	),
 	'exif-flash' => array(
-		'exif-flash-fired-0' ,
-		'exif-flash-fired-1' ,
-		'exif-flash-return-0' ,
-		'exif-flash-return-2' ,
-		'exif-flash-return-3' ,
-		'exif-flash-mode-1' ,
-		'exif-flash-mode-2' ,
-		'exif-flash-mode-3' ,
-		'exif-flash-function-1' ,
-		'exif-flash-redeye-1' ,
+		'exif-flash-fired-0',
+		'exif-flash-fired-1',
+		'exif-flash-return-0',
+		'exif-flash-return-2',
+		'exif-flash-return-3',
+		'exif-flash-mode-1',
+		'exif-flash-mode-2',
+		'exif-flash-mode-3',
+		'exif-flash-function-1',
+		'exif-flash-redeye-1',
 	),
 	'exif-focalplaneresolutionunit' => array(
 		'exif-focalplaneresolutionunit-2',
@@ -3343,6 +3491,7 @@ $wgMessageStructure = array(
 	'scarytransclusion' => array(
 		'scarytranscludedisabled',
 		'scarytranscludefailed',
+		'scarytranscludefailed-httpstatus',
 		'scarytranscludetoolong',
 	),
 	'deleteconflict' => array(
@@ -3542,7 +3691,6 @@ $wgMessageStructure = array(
 		'version-other',
 		'version-mediahandlers',
 		'version-hooks',
-		'version-extension-functions',
 		'version-parser-extensiontags',
 		'version-parser-function-hooks',
 		'version-hook-name',
@@ -3552,10 +3700,19 @@ $wgMessageStructure = array(
 		'version-license',
 		'version-poweredby-credits',
 		'version-poweredby-others',
+		'version-poweredby-translators',
+		'version-credits-summary',
 		'version-license-info',
 		'version-software',
 		'version-software-product',
 		'version-software-version',
+		'version-db-mysql-url',
+		'version-db-mariadb-url',
+		'version-db-percona-url',
+		'version-db-postgres-url',
+		'version-db-oracle-url',
+		'version-db-sqlite-url',
+		'version-db-mssql-url',
 		'version-entrypoints',
 		'version-entrypoints-header-entrypoint',
 		'version-entrypoints-header-url',
@@ -3565,11 +3722,18 @@ $wgMessageStructure = array(
 		'version-entrypoints-api-php',
 		'version-entrypoints-load-php',
 	),
-	'filepath' => array(
-		'filepath',
-		'filepath-page',
-		'filepath-submit',
-		'filepath-summary',
+	'redirect' => array(
+		'redirect',
+		'redirect-legend',
+		'redirect-text',
+		'redirect-summary',
+		'redirect-submit',
+		'redirect-lookup',
+		'redirect-value',
+		'redirect-user',
+		'redirect-revision',
+		'redirect-file',
+		'redirect-not-exists',
 	),
 	'fileduplicatesearch' => array(
 		'fileduplicatesearch',
@@ -3611,12 +3775,16 @@ $wgMessageStructure = array(
 		'tags-summary',
 		'tag-filter',
 		'tag-filter-submit',
+		'tag-list-wrapper',
 		'tags-title',
 		'tags-intro',
 		'tags-tag',
 		'tags-display-header',
 		'tags-description-header',
+		'tags-active-header',
 		'tags-hitcount-header',
+		'tags-active-yes',
+		'tags-active-no',
 		'tags-edit',
 		'tags-hitcount',
 	),
@@ -3638,6 +3806,7 @@ $wgMessageStructure = array(
 		'dberr-problems',
 		'dberr-again',
 		'dberr-info',
+		'dberr-info-hidden',
 		'dberr-usegoogle',
 		'dberr-outofdate',
 		'dberr-cachederror',
@@ -3653,6 +3822,9 @@ $wgMessageStructure = array(
 		'htmlform-submit',
 		'htmlform-reset',
 		'htmlform-selectorother-other',
+		'htmlform-no',
+		'htmlform-yes',
+		'htmlform-chosen-placeholder',
 	),
 	'sqlite' => array(
 		'sqlite-has-fts',
@@ -3690,8 +3862,12 @@ $wgMessageStructure = array(
 		'logentry-newusers-newusers',
 		'logentry-newusers-create',
 		'logentry-newusers-create2',
+		'logentry-newusers-byemail',
 		'logentry-newusers-autocreate',
-		'newuserlog-byemail',
+		'logentry-rights-rights',
+		'logentry-rights-rights-legacy',
+		'logentry-rights-autopromote',
+		'rightsnone',
 	),
 	'logging-irc' => array(
 		'revdelete-logentry',
@@ -3712,7 +3888,6 @@ $wgMessageStructure = array(
 		'1movedto2',
 		'1movedto2_redir',
 		'move-redirect-suppressed',
-		// 'newuserlog-byemail',
 		'newuserlog-create-entry',
 		'newuserlog-create2-entry',
 		'newuserlog-autocreate-entry',
@@ -3720,6 +3895,8 @@ $wgMessageStructure = array(
 		'deletedarticle',
 		// 'uploadedimage',
 		// 'overwroteimage',
+		'rightslogentry',
+		'rightslogentry-autopromote',
 	),
 	'feedback' => array(
 		'feedback-bugornote',
@@ -3772,6 +3949,7 @@ $wgMessageStructure = array(
 		'api-error-ok-but-empty',
 		'api-error-overwrite',
 		'api-error-stashfailed',
+		'api-error-publishfailed',
 		'api-error-timeout',
 		'api-error-unclassified',
 		'api-error-unknown-code',
@@ -3792,16 +3970,38 @@ $wgMessageStructure = array(
 		'duration-centuries',
 		'duration-millennia'
 	),
+	'rotation' => array(
+		'rotate-comment',
+	),
+	'limitreport' => array(
+		'limitreport-title',
+		'limitreport-cputime',
+		'limitreport-cputime-value',
+		'limitreport-walltime',
+		'limitreport-walltime-value',
+		'limitreport-ppvisitednodes',
+		'limitreport-ppvisitednodes-value',
+		'limitreport-ppgeneratednodes',
+		'limitreport-ppgeneratednodes-value',
+		'limitreport-postexpandincludesize',
+		'limitreport-postexpandincludesize-value',
+		'limitreport-templateargumentsize',
+		'limitreport-templateargumentsize-value',
+		'limitreport-expansiondepth',
+		'limitreport-expansiondepth-value',
+		'limitreport-expensivefunctioncount',
+		'limitreport-expensivefunctioncount-value',
+	),
 );
 
 /** Comments for each block */
 $wgBlockComments = array(
 	'sidebar'             => "The sidebar for MonoBook is generated from this message, lines that do not
 begin with * or ** are discarded, furthermore lines that do begin with ** and
-do not contain | are also discarded, but do not depend on this behaviour for
+do not contain | are also discarded, but do not depend on this behavior for
 future releases. Also note that since each list value is wrapped in a unique
-XHTML id it should only appear once and include characters that are legal
-XHTML id names.",
+(X)HTML id it should only appear once and include characters that are legal
+(X)HTML id names.",
 	'toggles'             => 'User preference toggles',
 	'underline'           => '',
 	'editfont'            => 'Font style option in Special:Preferences',
@@ -3812,7 +4012,7 @@ XHTML id names.",
 	'cologneblue'         => 'Cologne Blue skin',
 	'vector'              => 'Vector skin',
 	'miscellaneous2'      => '',
-	'links'               => 'All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).',
+	'links'               => 'All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage).',
 	'badaccess'           => '',
 	'versionrequired'     => '',
 	'miscellaneous3'      => '',
@@ -3826,9 +4026,11 @@ XHTML id names.",
 	'resetpass'           => 'Change password dialog',
 	'passwordreset'       => 'Special:PasswordReset',
 	'changeemail'         => 'Special:ChangeEmail',
+	'resettokens'         => 'Special:ResetTokens',
 	'toolbar'             => 'Edit page toolbar',
 	'edit'                => 'Edit pages',
 	'parserwarnings'      => 'Parser/template warnings',
+	'contentmodels'       => 'Content models',
 	'undo'                => '"Undo" feature',
 	'cantcreateaccount'   => 'Account creation failure',
 	'history'             => 'History pages',
@@ -3840,7 +4042,6 @@ XHTML id names.",
 	'diffs'               => 'Diffs',
 	'search'              => 'Search results',
 	'opensearch'          => 'OpenSearch description',
-	'quickbar'            => 'Quickbar',
 	'preferences'         => 'Preferences page',
 	'preferences-email'   => 'User preference: email validation using jQuery',
 	'userrights'          => 'User rights',
@@ -3872,9 +4073,10 @@ XHTML id names.",
 	'listredirects'       => 'List redirects',
 	'unusedtemplates'     => 'Unused templates',
 	'randompage'          => 'Random page',
+	'randomincategory'    => 'Random page in category',
 	'randomredirect'      => 'Random redirect',
 	'statistics'          => 'Statistics',
-	'disambiguations'     => '',
+	'pageswithprop'       => '',
 	'doubleredirects'     => '',
 	'brokenredirects'     => '',
 	'withoutinterwiki'    => '',
@@ -3929,8 +4131,9 @@ XHTML id names.",
 	'patrol-log'          => 'Patrol log',
 	'imagedeletion'       => 'Image deletion',
 	'browsediffs'         => 'Browsing diffs',
-	'newfiles'           => 'Special:NewFiles',
+	'newfiles'            => 'Special:NewFiles',
 	'video-info'          => 'Video information, used by Language::formatTimePeriod() to format lengths in the above messages',
+	'human-timestamps'    => 'Human-readable timestamps',
 	'badimagelist'        => 'Bad image list',
 	'variantname-zh'      => "Short names for language variants used for language conversion links.
 Variants for Chinese language",
@@ -3943,9 +4146,9 @@ Variants for Chinese language",
 	'variantname-shi'     => 'Variants for Tachelhit language',
 	'media-info'          => 'Media information',
 	'metadata'            => 'Metadata',
-	'exif'                           => 'EXIF tags',
+	'exif'                           => 'Exif tags',
 	'exif-values'                    => 'Make & model, can be wikified in order to link to the camera and model name',
-	'exif-compression'               => 'EXIF attributes',
+	'exif-compression'               => 'Exif attributes',
 	'exif-copyrighted'               => '',
 	'exif-unknowndate'               => '',
 	'exif-photometricinterpretation' => '',
@@ -4014,7 +4217,7 @@ Variants for Chinese language",
 	'signatures'            => 'Signatures',
 	'CoreParserFunctions'   => 'Core parser functions',
 	'version'               => 'Special:Version',
-	'filepath'              => 'Special:FilePath',
+	'redirect'              => 'Special:Redirect',
 	'fileduplicatesearch'   => 'Special:FileDuplicateSearch',
 	'special-specialpages'  => 'Special:SpecialPages',
 	'special-blank'         => 'Special:BlankPage',
@@ -4031,4 +4234,6 @@ Variants for Chinese language",
 	'apierrors'             => 'API errors',
 	'duration'              => 'Durations',
 	'cachedspecial'         => 'SpecialCachedPage',
+	'rotation'              => 'Image rotation',
+	'limitreport'           => 'Limit report',
 );