* (bug 14259) Localisation message for upload button on Special:Import is now 'import...

  instead of 'upload'
* -> German localisation update

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a328fea..9974285 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -129,6 +129,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Sidebar is now cached for all languages
 * Paging links on special pages now have CSS classes and are greyed out by default
   when disabled
+* (bug 14259) Localisation message for upload button on Special:Import is now 'import-upload'
+  instead of 'upload'
 
 === Bug fixes in 1.13 ===
 

diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 9e104fa..4c37f1f 100644 (file)
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -101,7 +101,7 @@ function wfSpecialImport( $page = '' ) {
                $wgOut->addWikiMsg( "importtext" );
                $wgOut->addHTML(
                        Xml::openElement( 'fieldset' ).
-                       Xml::element( 'legend', null, wfMsg( 'upload' ) ) .
+                       Xml::element( 'legend', null, wfMsg( 'import-upload' ) ) .
                        Xml::openElement( 'form', array( 'enctype' => 'multipart/form-data', 'method' => 'post', 'action' => $action ) ) .
                        Xml::hidden( 'action', 'submit' ) .
                        Xml::hidden( 'source', 'upload' ) .

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index d1942ff..4ecb142 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -2050,6 +2050,7 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'import-noarticle'           => 'Es wurde kein zu importierender Artikel angegeben!',
 'import-nonewrevisions'      => 'Es sind keine neuen Versionen zum Import vorhanden, alle Versionen wurden bereits früher importiert.',
 'xml-error-string'           => '$1 Zeile $2, Spalte $3, (Byte $4): $5',
+'import-upload'                     => 'XML-Daten importieren',
 
 # Import log
 'importlogpage'                    => 'Import-Logbuch',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 9a154ed..236ffe7 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2519,6 +2519,7 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 'import-noarticle'           => 'No page to import!',
 'import-nonewrevisions'      => 'All revisions were previously imported.',
 'xml-error-string'           => '$1 at line $2, col $3 (byte $4): $5',
+'import-upload'                     => 'Upload XML data',
 
 # Import log
 'importlogpage'                    => 'Import log',