Update sectioning of messages, adding 'cologneblue' and 'quickbar'

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 872b1a9..7872f28 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -627,10 +627,18 @@ XHTML id names.
 * [http://www.mediawiki.org/wiki/Manual:FAQ MediaWiki FAQ]
 * [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 
-'about'          => 'About',
-'article'        => 'Content page',
-'newwindow'      => '(opens in new window)',
-'cancel'         => 'Cancel',
+'about'         => 'About',
+'article'       => 'Content page',
+'newwindow'     => '(opens in new window)',
+'cancel'        => 'Cancel',
+'moredotdotdot' => 'More…',
+'mypage'        => 'My page',
+'mytalk'        => 'My talk',
+'anontalk'      => 'Talk for this IP',
+'navigation'    => 'Navigation',
+'and'           => ' and',
+
+# Cologne Blue skin
 'qbfind'         => 'Find',
 'qbbrowse'       => 'Browse',
 'qbedit'         => 'Edit',
@@ -638,12 +646,6 @@ XHTML id names.
 'qbpageinfo'     => 'Context',
 'qbmyoptions'    => 'My pages',
 'qbspecialpages' => 'Special pages',
-'moredotdotdot'  => 'More…',
-'mypage'         => 'My page',
-'mytalk'         => 'My talk',
-'anontalk'       => 'Talk for this IP',
-'navigation'     => 'Navigation',
-'and'            => ' and',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -1547,6 +1549,14 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 # OpenSearch description
 'opensearch-desc' => '{{SITENAME}} ({{CONTENTLANGUAGE}})', # do not translate or duplicate this message to other languages
 
+# Quickbar
+'qbsettings'               => 'Quickbar',
+'qbsettings-none'          => 'None',
+'qbsettings-fixedleft'     => 'Fixed left',
+'qbsettings-fixedright'    => 'Fixed right',
+'qbsettings-floatingleft'  => 'Floating left',
+'qbsettings-floatingright' => 'Floating right',
+
 # Preferences page
 'preferences'               => 'Preferences',
 'preferences-summary'       => '', # do not translate or duplicate this message to other languages
@@ -1555,12 +1565,6 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'prefsnologin'              => 'Not logged in',
 'prefsnologintext'          => 'You must be <span class="plainlinks">[{{fullurl:Special:UserLogin|returnto=$1}} logged in]</span> to set user preferences.',
 'prefsreset'                => 'Preferences have been reset from storage.',
-'qbsettings'                => 'Quickbar',
-'qbsettings-none'           => 'None',
-'qbsettings-fixedleft'      => 'Fixed left',
-'qbsettings-fixedright'     => 'Fixed right',
-'qbsettings-floatingleft'   => 'Floating left',
-'qbsettings-floatingright'  => 'Floating right',
 'changepassword'            => 'Change password',
 'prefs-skin'                => 'Skin',
 'skin-preview'              => 'Preview',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 7d7b772..ba57ed0 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -144,6 +144,14 @@ $wgMessageStructure = array(
                'article',
                'newwindow',
                'cancel',
+               'moredotdotdot',
+               'mypage',
+               'mytalk',
+               'anontalk',
+               'navigation',
+               'and',
+       ),
+       'cologneblue' => array(
                'qbfind',
                'qbbrowse',
                'qbedit',
@@ -151,12 +159,6 @@ $wgMessageStructure = array(
                'qbpageinfo',
                'qbmyoptions',
                'qbspecialpages',
-               'moredotdotdot',
-               'mypage',
-               'mytalk',
-               'anontalk',
-               'navigation',
-               'and',
        ),
        'metadata_help' => array(
                'metadata_help',
@@ -857,6 +859,14 @@ $wgMessageStructure = array(
        'opensearch' => array(
                'opensearch-desc',
        ),
+       'quickbar' => array(
+               'qbsettings',
+               'qbsettings-none',
+               'qbsettings-fixedleft',
+               'qbsettings-fixedright',
+               'qbsettings-floatingleft',
+               'qbsettings-floatingright',
+       ),
        'preferences' => array(
                'preferences',
                'preferences-summary',
@@ -865,12 +875,6 @@ $wgMessageStructure = array(
                'prefsnologin',
                'prefsnologintext',
                'prefsreset',
-               'qbsettings',
-               'qbsettings-none',
-               'qbsettings-fixedleft',
-               'qbsettings-fixedright',
-               'qbsettings-floatingleft',
-               'qbsettings-floatingright',
                'changepassword',
                'prefs-skin',
                'skin-preview',
@@ -3018,6 +3022,7 @@ XHTML id names.",
        'categorypages'       => 'Categories related messages',
        'mainpage'            => '',
        'miscellaneous1'      => '',
+       'cologneblue'         => 'Cologne Blue skin',
        'metadata_help'       => 'Metadata in edit box',
        '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).',
@@ -3044,6 +3049,7 @@ XHTML id names.",
        'diffs'               => 'Diffs',
        'search'              => 'Search results',
        'opensearch'          => 'OpenSearch description',
+       'quickbar'            => 'Quickbar',
        'preferences'         => 'Preferences page',
        'userrights'          => 'User rights',
        'group'               => 'Groups',