Index: branches/REL1_18/phase3/languages/messages/MessagesEn.php |
— | — | @@ -1,4 +1,4 @@ |
2 | | -<?php |
| 2 | + <?php |
3 | 3 | /** |
4 | 4 | * This is the default English localisation file |
5 | 5 | * |
— | — | @@ -1316,8 +1316,8 @@ |
1317 | 1317 | 'blocked-notice-logextract' => 'This user is currently blocked. |
1318 | 1318 | The latest block log entry is provided below for reference:', |
1319 | 1319 | '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) |
1322 | 1322 | * '''Internet Explorer:''' Hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5'' |
1323 | 1323 | * '''Konqueror:''' Click ''Reload'' or press ''F5'' |
1324 | 1324 | * '''Opera:''' Clear the cache in ''Tools → Preferences''", |
— | — | @@ -2103,10 +2103,10 @@ |
2104 | 2104 | 'uploadedfiles' => 'Uploaded files', |
2105 | 2105 | 'ignorewarning' => 'Ignore warning and save file anyway', |
2106 | 2106 | 'ignorewarnings' => 'Ignore any warnings', |
2107 | | -'minlength1' => 'File names must be at least one letter.', |
| 2107 | +'minlength1' => 'Filenames must be at least one letter.', |
2108 | 2108 | 'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles. |
2109 | 2109 | 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".', |
2111 | 2111 | 'filetype-mime-mismatch' => 'File extension ".$1" does not match the detected MIME type of the file ($2).', |
2112 | 2112 | 'filetype-badmime' => 'Files of the MIME type "$1" are not allowed to be uploaded.', |
2113 | 2113 | '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 @@ |
2121 | 2121 | 'filename-tooshort' => 'The filename is too short.', |
2122 | 2122 | 'filetype-banned' => 'This type of file is banned.', |
2123 | 2123 | '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.', |
2125 | 2125 | 'illegal-filename' => 'The filename is not allowed.', |
2126 | 2126 | 'overwrite' => 'Overwriting an existing file is not allowed.', |
2127 | 2127 | 'unknown-error' => 'An unknown error occured.', |
— | — | @@ -2130,7 +2130,7 @@ |
2131 | 2131 | this file is $2.', |
2132 | 2132 | 'largefileserver' => 'This file is bigger than the server is configured to allow.', |
2133 | 2133 | '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. |
2135 | 2135 | Please check whether you really want to upload this file.', |
2136 | 2136 | 'windows-nonascii-filename' => 'This wiki does not support filenames with special characters.', |
2137 | 2137 | '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 @@ |
2150 | 2150 | If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.", |
2151 | 2151 | 'file-thumbnail-no' => "The filename begins with '''<tt>$1</tt>'''. |
2152 | 2152 | 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.", |
2154 | 2154 | 'fileexists-forbidden' => 'A file with this name already exists, and cannot be overwritten. |
2155 | 2155 | If you still want to upload your file, please go back and use a new name. |
2156 | 2156 | [[File:$1|thumb|center|$1]]', |
— | — | @@ -2190,7 +2190,7 @@ |
2191 | 2191 | 'filename-prefix-blacklist' => ' #<!-- leave this line exactly as it is --> <pre> |
2192 | 2192 | # Syntax is as follows: |
2193 | 2193 | # * 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 |
2195 | 2195 | CIMG # Casio |
2196 | 2196 | DSC_ # Nikon |
2197 | 2197 | DSCF # Fuji |
— | — | @@ -2560,8 +2560,8 @@ |
2561 | 2561 | 'pubmedurl' => '//www.ncbi.nlm.nih.gov/pubmed/$1?dopt=Abstract', # do not translate or duplicate this message to other languages |
2562 | 2562 | |
2563 | 2563 | # Special:Log |
2564 | | -'specialloguserlabel' => 'User:', |
2565 | | -'speciallogtitlelabel' => 'Title:', |
| 2564 | +'specialloguserlabel' => 'Performer:', |
| 2565 | +'speciallogtitlelabel' => 'Target (title or user):', |
2566 | 2566 | 'log' => 'Logs', |
2567 | 2567 | 'all-logs-page' => 'All public logs', |
2568 | 2568 | 'alllogstext' => 'Combined display of all available logs of {{SITENAME}}. |
— | — | @@ -2608,8 +2608,9 @@ |
2609 | 2609 | 'linksearch-pat' => 'Search pattern:', |
2610 | 2610 | 'linksearch-ns' => 'Namespace:', |
2611 | 2611 | '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).', |
2614 | 2615 | 'linksearch-line' => '$1 is linked from $2', |
2615 | 2616 | 'linksearch-error' => 'Wildcards may appear only at the start of the hostname.', |
2616 | 2617 | |
— | — | @@ -3248,7 +3249,7 @@ |
3249 | 3250 | 'imagenocrossnamespace' => 'Cannot move file to non-file namespace', |
3250 | 3251 | 'nonfile-cannot-move-to-file' => 'Cannot move non-file to file namespace', |
3251 | 3252 | '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', |
3253 | 3254 | 'fix-double-redirects' => 'Update any redirects that point to the original title', |
3254 | 3255 | 'move-leave-redirect' => 'Leave a redirect behind', |
3255 | 3256 | 'protectedpagemovewarning' => "'''Warning:''' This page has been protected so that only users with administrator privileges can move it. |
— | — | @@ -3257,7 +3258,7 @@ |
3258 | 3259 | The latest log entry is provided below for reference:", |
3259 | 3260 | 'move-over-sharedrepo' => '== File exists == |
3260 | 3261 | [[:$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. |
3262 | 3263 | Please choose another name.', |
3263 | 3264 | |
3264 | 3265 | # Export |
— | — | @@ -4587,4 +4588,40 @@ |
4588 | 4589 | 'sqlite-has-fts' => '$1 with full-text search support', |
4589 | 4590 | 'sqlite-no-fts' => '$1 without full-text search support', |
4590 | 4591 | |
| 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 | + |
4591 | 4628 | ); |