Follow-up r57868: Update language maintenance scripts

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c288e70..d83bcf4 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2038,7 +2038,7 @@ Pages on [[Special:Watchlist|your watchlist]] are '''bold'''.",
 # Upload
 'upload'                      => 'Upload file',
 'uploadbtn'                   => 'Upload file',
-'reuploaddesc'                => 'Cancel upload and return to the upload form ',
+'reuploaddesc'                => 'Cancel upload and return to the upload form',
 'uploadnologin'               => 'Not logged in',
 'uploadnologintext'           => 'You must be [[Special:UserLogin|logged in]] to upload files.',
 'upload_directory_missing'    => 'The upload directory ($1) is missing and could not be created by the webserver.',
@@ -2131,7 +2131,7 @@ Please check the file and upload again.',
 'destfilename'                => 'Destination filename:',
 'upload-maxfilesize'          => 'Maximum file size: $1',
 'upload-description'          => 'File description',
-'upload-options'              => '',
+'upload-options'              => '', # do not translate or duplicate this message to other languages
 'watchthisupload'             => 'Watch this file',
 'filewasdeleted'              => 'A file of this name has been previously uploaded and subsequently deleted.
 You should check the $1 before proceeding to upload it again.',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 11fdca7..1c2d741 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -158,6 +158,7 @@ $wgIgnoredMessages = array(
        'wantedtemplates-summary',
        'activeusers-summary',
        'editpage-tos-summary',
+       'upload-options',
 );
 
 /** Optional messages, which may be translated only if changed in the target language. */

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 1ffd79d..1e2bb00 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1215,10 +1215,9 @@ $wgMessageStructure = array(
        'upload' => array(
                'upload',
                'uploadbtn',
-               'reupload',
                'reuploaddesc',
-        'uploadnologin',
-        'uploadnologintext',
+               'uploadnologin',
+               'uploadnologintext',
                'upload_directory_missing',
                'upload_directory_read_only',
                'uploaderror',
@@ -1271,9 +1270,13 @@ $wgMessageStructure = array(
                'uploadscripted',
                'uploadcorrupt',
                'uploadvirus',
+               'upload-source',
                'sourcefilename',
+               'sourceurl',
                'destfilename',
                'upload-maxfilesize',
+               'upload-description',
+               'upload-options',
                'watchthisupload',
                'filewasdeleted',
                'upload-wasdeleted',