r108432 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108431‎ | r108432 | r108433 >
Date:17:36, 9 January 2012
Author:siebrand
Status:reverted
Tags:
Comment:
Backport compatible updates from trunk.

Among others: MFT r107067, r108415, r108418
Modified paths:
  • /branches/REL1_18/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/languages/messages/MessagesEn.php
@@ -1,4 +1,4 @@
2 -<?php
 2+ <?php
33 /**
44 * This is the default English localisation file
55 *
@@ -1316,8 +1316,8 @@
13171317 'blocked-notice-logextract' => 'This user is currently blocked.
13181318 The latest block log entry is provided below for reference:',
13191319 'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes.
1320 -* '''Firefox / Safari:''' Hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Mac)
1321 -* '''Google Chrome:''' Press ''Ctrl-Shift-R'' (''Command-Shift-R'' on a Mac)
 1320+* '''Firefox / Safari:''' Hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''⌘-R'' on a Mac)
 1321+* '''Google Chrome:''' Press ''Ctrl-Shift-R'' (''⌘-Shift-R'' on a Mac)
13221322 * '''Internet Explorer:''' Hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''
13231323 * '''Konqueror:''' Click ''Reload'' or press ''F5''
13241324 * '''Opera:''' Clear the cache in ''Tools → Preferences''",
@@ -2103,10 +2103,10 @@
21042104 'uploadedfiles' => 'Uploaded files',
21052105 'ignorewarning' => 'Ignore warning and save file anyway',
21062106 'ignorewarnings' => 'Ignore any warnings',
2107 -'minlength1' => 'File names must be at least one letter.',
 2107+'minlength1' => 'Filenames must be at least one letter.',
21082108 'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles.
21092109 Please rename the file and try uploading it again.',
2110 -'badfilename' => 'File name has been changed to "$1".',
 2110+'badfilename' => 'Filename has been changed to "$1".',
21112111 'filetype-mime-mismatch' => 'File extension ".$1" does not match the detected MIME type of the file ($2).',
21122112 'filetype-badmime' => 'Files of the MIME type "$1" are not allowed to be uploaded.',
21132113 '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.',
@@ -2120,7 +2120,7 @@
21212121 'filename-tooshort' => 'The filename is too short.',
21222122 'filetype-banned' => 'This type of file is banned.',
21232123 'verification-error' => 'This file did not pass file verification.',
2124 -'hookaborted' => 'The modification you tried to make was aborted by an extension hook.',
 2124+'hookaborted' => 'The modification you tried to make was aborted by an extension.',
21252125 'illegal-filename' => 'The filename is not allowed.',
21262126 'overwrite' => 'Overwriting an existing file is not allowed.',
21272127 'unknown-error' => 'An unknown error occured.',
@@ -2130,7 +2130,7 @@
21312131 this file is $2.',
21322132 'largefileserver' => 'This file is bigger than the server is configured to allow.',
21332133 'emptyfile' => 'The file you uploaded seems to be empty.
2134 -This might be due to a typo in the file name.
 2134+This might be due to a typo in the filename.
21352135 Please check whether you really want to upload this file.',
21362136 'windows-nonascii-filename' => 'This wiki does not support filenames with special characters.',
21372137 'fileexists' => "A file with this name exists already, please check '''<tt>[[:$1]]</tt>''' if you are not sure if you want to change it.
@@ -2149,7 +2149,7 @@
21502150 If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.",
21512151 'file-thumbnail-no' => "The filename begins with '''<tt>$1</tt>'''.
21522152 It seems to be an image of reduced size ''(thumbnail)''.
2153 -If you have this image in full resolution upload this one, otherwise change the file name please.",
 2153+If you have this image in full resolution upload this one, otherwise change the filename please.",
21542154 'fileexists-forbidden' => 'A file with this name already exists, and cannot be overwritten.
21552155 If you still want to upload your file, please go back and use a new name.
21562156 [[File:$1|thumb|center|$1]]',
@@ -2190,7 +2190,7 @@
21912191 'filename-prefix-blacklist' => ' #<!-- leave this line exactly as it is --> <pre>
21922192 # Syntax is as follows:
21932193 # * Everything from a "#" character to the end of the line is a comment
2194 -# * Every non-blank line is a prefix for typical file names assigned automatically by digital cameras
 2194+# * Every non-blank line is a prefix for typical filenames assigned automatically by digital cameras
21952195 CIMG # Casio
21962196 DSC_ # Nikon
21972197 DSCF # Fuji
@@ -2560,8 +2560,8 @@
25612561 'pubmedurl' => '//www.ncbi.nlm.nih.gov/pubmed/$1?dopt=Abstract', # do not translate or duplicate this message to other languages
25622562
25632563 # Special:Log
2564 -'specialloguserlabel' => 'User:',
2565 -'speciallogtitlelabel' => 'Title:',
 2564+'specialloguserlabel' => 'Performer:',
 2565+'speciallogtitlelabel' => 'Target (title or user):',
25662566 'log' => 'Logs',
25672567 'all-logs-page' => 'All public logs',
25682568 'alllogstext' => 'Combined display of all available logs of {{SITENAME}}.
@@ -2608,8 +2608,9 @@
26092609 'linksearch-pat' => 'Search pattern:',
26102610 'linksearch-ns' => 'Namespace:',
26112611 'linksearch-ok' => 'Search',
2612 -'linksearch-text' => 'Wildcards such as "*.wikipedia.org" may be used.<br />
2613 -Supported protocols: <tt>$1</tt>',
 2612+'linksearch-text' => 'Wildcards such as "*.wikipedia.org" may be used.
 2613+Needs at least a top-level domain, for example "*.org".<br />
 2614+Supported protocols: <tt>$1</tt> (do not add any of these in your search).',
26142615 'linksearch-line' => '$1 is linked from $2',
26152616 'linksearch-error' => 'Wildcards may appear only at the start of the hostname.',
26162617
@@ -3248,7 +3249,7 @@
32493250 'imagenocrossnamespace' => 'Cannot move file to non-file namespace',
32503251 'nonfile-cannot-move-to-file' => 'Cannot move non-file to file namespace',
32513252 'imagetypemismatch' => 'The new file extension does not match its type',
3252 -'imageinvalidfilename' => 'The target file name is invalid',
 3253+'imageinvalidfilename' => 'The target filename is invalid',
32533254 'fix-double-redirects' => 'Update any redirects that point to the original title',
32543255 'move-leave-redirect' => 'Leave a redirect behind',
32553256 'protectedpagemovewarning' => "'''Warning:''' This page has been protected so that only users with administrator privileges can move it.
@@ -3257,7 +3258,7 @@
32583259 The latest log entry is provided below for reference:",
32593260 'move-over-sharedrepo' => '== File exists ==
32603261 [[:$1]] exists on a shared repository. Moving a file to this title will override the shared file.',
3261 -'file-exists-sharedrepo' => 'The file name chosen is already in use on a shared repository.
 3262+'file-exists-sharedrepo' => 'The filename chosen is already in use on a shared repository.
32623263 Please choose another name.',
32633264
32643265 # Export
@@ -4587,4 +4588,40 @@
45884589 'sqlite-has-fts' => '$1 with full-text search support',
45894590 'sqlite-no-fts' => '$1 without full-text search support',
45904591
 4592+# API errors
 4593+'api-error-http' => 'Internal error: Unable to connect to server.',
 4594+'api-error-ok-but-empty' => 'Internal error: No response from server.',
 4595+'api-error-unclassified' => 'An unknown error occurred.',
 4596+'api-error-unknown-code' => 'Unknown error: "$1"',
 4597+'api-error-uploaddisabled' => 'Uploading is disabled on this wiki.',
 4598+'api-error-nomodule' => 'Internal error: No upload module set.',
 4599+'api-error-mustbeposted' => 'Internal error: Request requires HTTP POST.',
 4600+'api-error-badaccess-groups' => 'You are not permitted to upload files to this wiki.',
 4601+'api-error-stashfailed' => 'Internal error: Server failed to store temporary file.',
 4602+'api-error-missingresult' => 'Internal error: Could not determine if the copy succeeded.',
 4603+'api-error-missingparam' => 'Internal error: Missing parameters on request.',
 4604+'api-error-invalid-file-key' => 'Internal error: File was not found in temporary storage.',
 4605+'api-error-copyuploaddisabled' => 'Uploading by URL is disabled on this server.',
 4606+'api-error-mustbeloggedin' => 'You must be logged in to upload files.',
 4607+'api-error-empty-file' => 'The file you submitted was empty.',
 4608+'api-error-file-too-large' => 'The file you submitted was too large.',
 4609+'api-error-filetype-missing' => 'The filename is missing an extension.',
 4610+'api-error-filetype-banned' => 'This type of file is banned.',
 4611+'api-error-filename-tooshort' => 'The filename is too short.',
 4612+'api-error-illegal-filename' => 'The filename is not allowed.',
 4613+'api-error-verification-error' => 'This file might be corrupt, or have the wrong extension.',
 4614+'api-error-hookaborted' => 'The modification you tried to make was aborted by an extension.',
 4615+'api-error-unknown-error' => 'Internal error: Something went wrong when trying to upload your file.',
 4616+'api-error-internal-error' => 'Internal error: Something went wrong with processing your upload on the wiki.',
 4617+'api-error-overwrite' => 'Overwriting an existing file is not allowed.',
 4618+'api-error-badtoken' => 'Internal error: Bad token.',
 4619+'api-error-fetchfileerror' => 'Internal error: Something went wrong while fetching the file.',
 4620+'api-error-duplicate' => 'There {{PLURAL:$1|is [$2 another file]|are [$2 some other files]}} already on the site with the same content.',
 4621+'api-error-duplicate-popup-title' => 'Duplicate {{PLURAL:$1|file|files}}',
 4622+'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.',
 4623+'api-error-duplicate-archive-popup-title' => 'Duplicate {{PLURAL:$1|file|files}} that have already been deleted',
 4624+'api-error-unknown-warning' => 'Unknown warning: $1',
 4625+'api-error-timeout' => 'The server did not respond within the expected time.',
 4626+'api-error-noimageinfo' => 'The upload succeeded, but the server did not give us any information about the file.',
 4627+
45914628 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r108453Follow-up r108432: Remove leading space in line 1. Spotted by Niklas.siebrand18:45, 9 January 2012
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
r107067Use ⌘ in for Mac keyboard shortcuts...hashar13:42, 22 December 2011
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