summaryrefslogtreecommitdiff
path: root/languages/messages/MessagesEn.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-01-12 13:42:29 +0100
committerPierre Schmitz <pierre@archlinux.de>2012-01-12 13:42:29 +0100
commitba0fc4fa20067528effd4802e53ceeb959640825 (patch)
tree4f62217349d3afa39dbba3f7e19dac0aecb344f6 /languages/messages/MessagesEn.php
parentca32f08966f1b51fcb19460f0996bb0c4048e6fe (diff)
Update to MediaWiki 1.18.1
Diffstat (limited to 'languages/messages/MessagesEn.php')
-rw-r--r--languages/messages/MessagesEn.php29
1 files changed, 15 insertions, 14 deletions
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 635243c1..39394aad 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1316,8 +1316,8 @@ Please check if you want to create/edit this page.',
'blocked-notice-logextract' => 'This user is currently blocked.
The latest block log entry is provided below for reference:',
'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes.
-* '''Firefox / Safari:''' Hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Mac)
-* '''Google Chrome:''' Press ''Ctrl-Shift-R'' (''Command-Shift-R'' on a Mac)
+* '''Firefox / Safari:''' Hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''⌘-R'' on a Mac)
+* '''Google Chrome:''' Press ''Ctrl-Shift-R'' (''⌘-Shift-R'' on a Mac)
* '''Internet Explorer:''' Hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''
* '''Konqueror:''' Click ''Reload'' or press ''F5''
* '''Opera:''' Clear the cache in ''Tools → Preferences''",
@@ -2103,10 +2103,10 @@ See the [[Special:NewFiles|gallery of new files]] for a more visual overview.',
'uploadedfiles' => 'Uploaded files',
'ignorewarning' => 'Ignore warning and save file anyway',
'ignorewarnings' => 'Ignore any warnings',
-'minlength1' => 'File names must be at least one letter.',
+'minlength1' => 'Filenames must be at least one letter.',
'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles.
Please rename the file and try uploading it again.',
-'badfilename' => 'File name has been changed to "$1".',
+'badfilename' => 'Filename has been changed to "$1".',
'filetype-mime-mismatch' => 'File extension ".$1" does not match the detected MIME type of the file ($2).',
'filetype-badmime' => 'Files of the MIME type "$1" are not allowed to be uploaded.',
'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 @@ Permitted {{PLURAL:$3|file type is|file types are}} $2.',
'filename-tooshort' => 'The filename is too short.',
'filetype-banned' => 'This type of file is banned.',
'verification-error' => 'This file did not pass file verification.',
-'hookaborted' => 'The modification you tried to make was aborted by an extension hook.',
+'hookaborted' => 'The modification you tried to make was aborted by an extension.',
'illegal-filename' => 'The filename is not allowed.',
'overwrite' => 'Overwriting an existing file is not allowed.',
'unknown-error' => 'An unknown error occured.',
@@ -2130,7 +2130,7 @@ Permitted {{PLURAL:$3|file type is|file types are}} $2.',
this file is $2.',
'largefileserver' => 'This file is bigger than the server is configured to allow.',
'emptyfile' => 'The file you uploaded seems to be empty.
-This might be due to a typo in the file name.
+This might be due to a typo in the filename.
Please check whether you really want to upload this file.',
'windows-nonascii-filename' => 'This wiki does not support filenames with special characters.',
'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 @@ Please check the file '''<tt>[[:$1]]</tt>'''.
If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.",
'file-thumbnail-no' => "The filename begins with '''<tt>$1</tt>'''.
It seems to be an image of reduced size ''(thumbnail)''.
-If you have this image in full resolution upload this one, otherwise change the file name please.",
+If you have this image in full resolution upload this one, otherwise change the filename please.",
'fileexists-forbidden' => 'A file with this name already exists, and cannot be overwritten.
If you still want to upload your file, please go back and use a new name.
[[File:$1|thumb|center|$1]]',
@@ -2190,7 +2190,7 @@ Please choose a more descriptive name for your file.",
'filename-prefix-blacklist' => ' #<!-- leave this line exactly as it is --> <pre>
# Syntax is as follows:
# * Everything from a "#" character to the end of the line is a comment
-# * Every non-blank line is a prefix for typical file names assigned automatically by digital cameras
+# * Every non-blank line is a prefix for typical filenames assigned automatically by digital cameras
CIMG # Casio
DSC_ # Nikon
DSCF # Fuji
@@ -2560,8 +2560,8 @@ Please note that other web sites may link to a file with a direct URL, and so ma
'pubmedurl' => '//www.ncbi.nlm.nih.gov/pubmed/$1?dopt=Abstract', # do not translate or duplicate this message to other languages
# Special:Log
-'specialloguserlabel' => 'User:',
-'speciallogtitlelabel' => 'Title:',
+'specialloguserlabel' => 'Performer:',
+'speciallogtitlelabel' => 'Target (title or user):',
'log' => 'Logs',
'all-logs-page' => 'All public logs',
'alllogstext' => 'Combined display of all available logs of {{SITENAME}}.
@@ -2608,8 +2608,9 @@ Also see [[Special:WantedCategories|wanted categories]].',
'linksearch-pat' => 'Search pattern:',
'linksearch-ns' => 'Namespace:',
'linksearch-ok' => 'Search',
-'linksearch-text' => 'Wildcards such as "*.wikipedia.org" may be used.<br />
-Supported protocols: <tt>$1</tt>',
+'linksearch-text' => 'Wildcards such as "*.wikipedia.org" may be used.
+Needs at least a top-level domain, for example "*.org".<br />
+Supported protocols: <tt>$1</tt> (do not add any of these in your search).',
'linksearch-line' => '$1 is linked from $2',
'linksearch-error' => 'Wildcards may appear only at the start of the hostname.',
@@ -3248,7 +3249,7 @@ cannot move a page over itself.',
'imagenocrossnamespace' => 'Cannot move file to non-file namespace',
'nonfile-cannot-move-to-file' => 'Cannot move non-file to file namespace',
'imagetypemismatch' => 'The new file extension does not match its type',
-'imageinvalidfilename' => 'The target file name is invalid',
+'imageinvalidfilename' => 'The target filename is invalid',
'fix-double-redirects' => 'Update any redirects that point to the original title',
'move-leave-redirect' => 'Leave a redirect behind',
'protectedpagemovewarning' => "'''Warning:''' This page has been protected so that only users with administrator privileges can move it.
@@ -3257,7 +3258,7 @@ The latest log entry is provided below for reference:",
The latest log entry is provided below for reference:",
'move-over-sharedrepo' => '== File exists ==
[[:$1]] exists on a shared repository. Moving a file to this title will override the shared file.',
-'file-exists-sharedrepo' => 'The file name chosen is already in use on a shared repository.
+'file-exists-sharedrepo' => 'The filename chosen is already in use on a shared repository.
Please choose another name.',
# Export