Tweak for r30349: Use existing message 'and' instead of introducing a new one. Thanks...

Message 'and' moved to a more general section in maintenance/language/messages.inc

diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php
index 9ca096d..4a9fad0 100644 (file)
--- a/includes/SpecialVersion.php
+++ b/includes/SpecialVersion.php
@@ -256,7 +256,7 @@ class SpecialVersion {
                        $t = array_slice( $list, 0, $cnt - 1 );
                        $one = array_map( array( &$this, 'arrayToString' ), $t );
                        $two = $this->arrayToString( $list[$cnt - 1] );
-                       $and = wfMsg( 'version-and' );
+                       $and = wfMsg( 'and' );
 
                        return implode( ', ', $one ) . " $and $two";
                }

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index ce07634..b5e8157 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -307,6 +307,7 @@ $messages = array(
 'mytalk'         => 'Eigene Diskussion',
 'anontalk'       => 'Diskussionsseite dieser IP',
 'navigation'     => 'Navigation',
+'and'            => 'und',
 
 # Metadata in edit box
 'metadata_help' => 'Metadaten:',
@@ -1988,7 +1989,6 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'anonymous'        => 'Anonyme(r) Benutzer auf {{SITENAME}}',
 'siteuser'         => '{{SITENAME}}-Benutzer $1',
 'lastmodifiedatby' => 'Diese Seite wurde zuletzt am $1 um $2 Uhr von $3 geändert.', # $1 date, $2 time, $3 user
-'and'              => 'und',
 'othercontribs'    => 'Basiert auf der Arbeit von $1',
 'others'           => 'andere',
 'siteusers'        => '{{SITENAME}}-Benutzer $1',
@@ -2496,6 +2496,5 @@ Bitte bestätige, dass du diese Seite wirklich neu erstellen möchten.",
 'version-skin-extension-functions' => 'Skin-Erweiterungs-Funktionen',
 'version-hook-name'                => 'Schnittstellenname',
 'version-hook-subscribedby'        => 'Aufruf von',
-'version-and'                      => 'und',
 'version-version'                  => 'Version',
 );

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1e3604a..86b2426 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -593,6 +593,7 @@ XHTML id names.
 'mytalk'         => 'My talk',
 'anontalk'       => 'Talk for this IP',
 'navigation'     => 'Navigation',
+'and'            => 'and',
 
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
@@ -2470,7 +2471,6 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 'anonymous'        => 'Anonymous user(s) of {{SITENAME}}',
 'siteuser'         => '{{SITENAME}} user $1',
 'lastmodifiedatby' => 'This page was last modified $2, $1 by $3.', # $1 date, $2 time, $3 user
-'and'              => 'and',
 'othercontribs'    => 'Based on work by $1.',
 'others'           => 'others',
 'siteusers'        => '{{SITENAME}} user(s) $1',
@@ -3149,6 +3149,5 @@ $1',
 'version-skin-extension-functions' => 'Skin extension functions',
 'version-hook-name'                => 'Hook name',
 'version-hook-subscribedby'        => 'Subscribed by',
-'version-and'                      => 'and',
 'version-version'                  => 'Version',
 );

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 2980512..5a60ac5 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -142,6 +142,7 @@ $wgMessageStructure = array(
                'mytalk',
                'anontalk',
                'navigation',
+               'and',
        ),
        'metadata_help' => array(
                'metadata_help',
@@ -1723,7 +1724,6 @@ $wgMessageStructure = array(
                'anonymous',
                'siteuser',
                'lastmodifiedatby',
-               'and',
                'othercontribs',
                'others',
                'siteusers',