Merge "Improve clarity of diff-multi message"

[lhc/web/wiklou.git] / maintenance / language / messages.inc

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index d51cdd0..fd23ea1 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -28,7 +28,6 @@ $wgMessageStructure = array(
        ),
        'toggles' => array(
                'tog-underline',
-               'tog-justify',
                'tog-hideminor',
                'tog-hidepatrolled',
                'tog-newpageshidepatrolled',
@@ -37,9 +36,7 @@ $wgMessageStructure = array(
                'tog-numberheadings',
                'tog-showtoolbar',
                'tog-editondblclick',
-               'tog-editsection',
                'tog-editsectiononrightclick',
-               'tog-showtoc',
                'tog-rememberpassword',
                'tog-watchcreations',
                'tog-watchdefault',
@@ -945,7 +942,8 @@ $wgMessageStructure = array(
                'showhideselectedversions',
                'editundo',
                'diff-empty',
-               'diff-multi',
+               'diff-multi-sameuser',
+               'diff-multi-otherusers',
                'diff-multi-manyusers',
                'difference-missing-revision',
        ),
@@ -2013,7 +2011,7 @@ $wgMessageStructure = array(
                'watchmethod-list',
                'watchlistcontains',
                'iteminvalidname',
-               'wlnote',
+               'wlnote2',
                'wlshowlast',
                'watchlist-options',
        ),
@@ -2474,6 +2472,7 @@ $wgMessageStructure = array(
                'allmessages-prefix',
                'allmessages-language',
                'allmessages-filter-submit',
+               'allmessages-filter-translate',
        ),
        'thumbnails' => array(
                'thumbnail-more',
@@ -2533,6 +2532,7 @@ $wgMessageStructure = array(
                'import-error-special',
                'import-error-invalid',
                'import-error-unserialize',
+               'import-error-bad-location',
                'import-options-wrong',
                'import-rootpage-invalid',
                'import-rootpage-nosubpage',
@@ -2566,7 +2566,6 @@ $wgMessageStructure = array(
                'accesskey-pt-watchlist',
                'accesskey-pt-mycontris',
                'accesskey-pt-login',
-               'accesskey-pt-anonlogin',
                'accesskey-pt-logout',
                'accesskey-ca-talk',
                'accesskey-ca-edit',
@@ -2637,7 +2636,6 @@ $wgMessageStructure = array(
                'tooltip-pt-watchlist',
                'tooltip-pt-mycontris',
                'tooltip-pt-login',
-               'tooltip-pt-anonlogin',
                'tooltip-pt-logout',
                'tooltip-ca-talk',
                'tooltip-ca-edit',