From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Sun, 18 Oct 2009 19:54:06 +0000 (+0000)
Subject: Follow-up r57868: Update language maintenance scripts
X-Git-Tag: 1.31.0-rc.0~39241
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_user_edit%27%2C%20iduser=user.userid%29%20%7D%7D?a=commitdiff_plain;h=a82938855d0c6b5f5955c509a9f9286191399c11;p=lhc%2Fweb%2Fwiklou.git

Follow-up r57868: Update language maintenance scripts
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c288e702f3..d83bcf41da 100644
--- 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 11fdca71f2..1c2d741658 100644
--- 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 1ffd79d0a3..1e2bb002a1 100644
--- 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',