r108457 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108456‎ | r108457 | r108458 >
Date:18:49, 9 January 2012
Author:siebrand
Status:ok
Tags:
Comment:
Backport compatible updates from trunk.

Among others: MFT r108415, r108418
Modified paths:
  • /branches/wmf/1.18wmf1/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/languages/messages/MessagesEn.php
@@ -2105,10 +2105,10 @@
21062106 'uploadedfiles' => 'Uploaded files',
21072107 'ignorewarning' => 'Ignore warning and save file anyway',
21082108 'ignorewarnings' => 'Ignore any warnings',
2109 -'minlength1' => 'File names must be at least one letter.',
 2109+'minlength1' => 'Filenames must be at least one letter.',
21102110 'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles.
21112111 Please rename the file and try uploading it again.',
2112 -'badfilename' => 'File name has been changed to "$1".',
 2112+'badfilename' => 'Filename has been changed to "$1".',
21132113 'filetype-mime-mismatch' => 'File extension ".$1" does not match the detected MIME type of the file ($2).',
21142114 'filetype-badmime' => 'Files of the MIME type "$1" are not allowed to be uploaded.',
21152115 'filetype-bad-ie-mime' => 'Cannot upload this file because Internet Explorer would detect it as "$1", which is a disallowed and potentially dangerous file type.',
@@ -2122,7 +2122,7 @@
21232123 'filename-tooshort' => 'The filename is too short.',
21242124 'filetype-banned' => 'This type of file is banned.',
21252125 'verification-error' => 'This file did not pass file verification.',
2126 -'hookaborted' => 'The modification you tried to make was aborted by an extension hook.',
 2126+'hookaborted' => 'The modification you tried to make was aborted by an extension.',
21272127 'illegal-filename' => 'The filename is not allowed.',
21282128 'overwrite' => 'Overwriting an existing file is not allowed.',
21292129 'unknown-error' => 'An unknown error occured.',
@@ -2132,7 +2132,7 @@
21332133 this file is $2.',
21342134 'largefileserver' => 'This file is bigger than the server is configured to allow.',
21352135 'emptyfile' => 'The file you uploaded seems to be empty.
2136 -This might be due to a typo in the file name.
 2136+This might be due to a typo in the filename.
21372137 Please check whether you really want to upload this file.',
21382138 'windows-nonascii-filename' => 'This wiki does not support filenames with special characters.',
21392139 'fileexists' => "A file with this name exists already, please check '''<tt>[[:$1]]</tt>''' if you are not sure if you want to change it.
@@ -2151,7 +2151,7 @@
21522152 If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.",
21532153 'file-thumbnail-no' => "The filename begins with '''<tt>$1</tt>'''.
21542154 It seems to be an image of reduced size ''(thumbnail)''.
2155 -If you have this image in full resolution upload this one, otherwise change the file name please.",
 2155+If you have this image in full resolution upload this one, otherwise change the filename please.",
21562156 'fileexists-forbidden' => 'A file with this name already exists, and cannot be overwritten.
21572157 If you still want to upload your file, please go back and use a new name.
21582158 [[File:$1|thumb|center|$1]]',
@@ -2192,7 +2192,7 @@
21932193 'filename-prefix-blacklist' => ' #<!-- leave this line exactly as it is --> <pre>
21942194 # Syntax is as follows:
21952195 # * Everything from a "#" character to the end of the line is a comment
2196 -# * Every non-blank line is a prefix for typical file names assigned automatically by digital cameras
 2196+# * Every non-blank line is a prefix for typical filenames assigned automatically by digital cameras
21972197 CIMG # Casio
21982198 DSC_ # Nikon
21992199 DSCF # Fuji
@@ -3252,7 +3252,7 @@
32533253 'imagenocrossnamespace' => 'Cannot move file to non-file namespace',
32543254 'nonfile-cannot-move-to-file' => 'Cannot move non-file to file namespace',
32553255 'imagetypemismatch' => 'The new file extension does not match its type',
3256 -'imageinvalidfilename' => 'The target file name is invalid',
 3256+'imageinvalidfilename' => 'The target filename is invalid',
32573257 'fix-double-redirects' => 'Update any redirects that point to the original title',
32583258 'move-leave-redirect' => 'Leave a redirect behind',
32593259 'protectedpagemovewarning' => "'''Warning:''' This page has been protected so that only users with administrator privileges can move it.
@@ -3261,7 +3261,7 @@
32623262 The latest log entry is provided below for reference:",
32633263 'move-over-sharedrepo' => '== File exists ==
32643264 [[:$1]] exists on a shared repository. Moving a file to this title will override the shared file.',
3265 -'file-exists-sharedrepo' => 'The file name chosen is already in use on a shared repository.
 3265+'file-exists-sharedrepo' => 'The filename chosen is already in use on a shared repository.
32663266 Please choose another name.',
32673267
32683268 # Export
@@ -4614,4 +4614,41 @@
46154615 'feedback-close' => 'Done',
46164616 'feedback-bugcheck' => 'Great! Just check that it is not already one of the [$1 known bugs].',
46174617 'feedback-bugnew' => 'I checked. Report a new bug',
 4618+
 4619+# API errors
 4620+'api-error-badaccess-groups' => 'You are not permitted to upload files to this wiki.',
 4621+'api-error-badtoken' => 'Internal error: Bad token.',
 4622+'api-error-copyuploaddisabled' => 'Uploading by URL is disabled on this server.',
 4623+'api-error-duplicate' => 'There {{PLURAL:$1|is [$2 another file]|are [$2 some other files]}} already on the site with the same content.',
 4624+'api-error-duplicate-archive' => 'There {{PLURAL:$1|was [$2 another file]|were [$2 some other files]}} already on the site with the same content, but {{PLURAL:$1|it was|they were}} deleted.',
 4625+'api-error-duplicate-archive-popup-title' => 'Duplicate {{PLURAL:$1|file|files}} that have already been deleted',
 4626+'api-error-duplicate-popup-title' => 'Duplicate {{PLURAL:$1|file|files}}',
 4627+'api-error-empty-file' => 'The file you submitted was empty.',
 4628+'api-error-fetchfileerror' => 'Internal error: Something went wrong while fetching the file.',
 4629+'api-error-file-too-large' => 'The file you submitted was too large.',
 4630+'api-error-filename-tooshort' => 'The filename is too short.',
 4631+'api-error-filetype-banned' => 'This type of file is banned.',
 4632+'api-error-filetype-missing' => 'The filename is missing an extension.',
 4633+'api-error-hookaborted' => 'The modification you tried to make was aborted by an extension.',
 4634+'api-error-http' => 'Internal error: Unable to connect to server.',
 4635+'api-error-illegal-filename' => 'The filename is not allowed.',
 4636+'api-error-internal-error' => 'Internal error: Something went wrong with processing your upload on the wiki.',
 4637+'api-error-invalid-file-key' => 'Internal error: File was not found in temporary storage.',
 4638+'api-error-missingparam' => 'Internal error: Missing parameters on request.',
 4639+'api-error-missingresult' => 'Internal error: Could not determine if the copy succeeded.',
 4640+'api-error-mustbeloggedin' => 'You must be logged in to upload files.',
 4641+'api-error-mustbeposted' => 'Internal error: Request requires HTTP POST.',
 4642+'api-error-noimageinfo' => 'The upload succeeded, but the server did not give us any information about the file.',
 4643+'api-error-nomodule' => 'Internal error: No upload module set.',
 4644+'api-error-ok-but-empty' => 'Internal error: No response from server.',
 4645+'api-error-overwrite' => 'Overwriting an existing file is not allowed.',
 4646+'api-error-stashfailed' => 'Internal error: Server failed to store temporary file.',
 4647+'api-error-timeout' => 'The server did not respond within the expected time.',
 4648+'api-error-unclassified' => 'An unknown error occurred.',
 4649+'api-error-unknown-code' => 'Unknown error: "$1"',
 4650+'api-error-unknown-error' => 'Internal error: Something went wrong when trying to upload your file.',
 4651+'api-error-unknown-warning' => 'Unknown warning: $1',
 4652+'api-error-uploaddisabled' => 'Uploading is disabled on this wiki.',
 4653+'api-error-verification-error' => 'This file might be corrupt, or have the wrong extension.',
 4654+
46184655 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r108458Partial revert of r108432. Meant to merge this into 1.18wmf1 (done in r108457).siebrand18:54, 9 January 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r108415Remove API error message duplication from Translate and UploadWizard into core....siebrand14:21, 9 January 2012
r108418file name -> filename for consistency.siebrand14:42, 9 January 2012

Status & tagging log