r108644 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108643‎ | r108644 | r108645 >
Date:18:35, 11 January 2012
Author:siebrand
Status:resolved
Tags:
Comment:
Backport compatible updates from trunk.
Modified paths:
  • /branches/REL1_17/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: branches/REL1_17/phase3/languages/messages/MessagesEn.php
@@ -621,7 +621,7 @@
622622
623623 # User preference toggles
624624 'tog-underline' => 'Link underlining:',
625 -'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>)',
 625+'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: Like this<a href="" class="internal">?</a>)',
626626 'tog-justify' => 'Justify paragraphs',
627627 'tog-hideminor' => 'Hide minor edits in recent changes',
628628 'tog-hidepatrolled' => 'Hide patrolled edits in recent changes',
@@ -1280,8 +1280,8 @@
12811281 'blocked-notice-logextract' => 'This user is currently blocked.
12821282 The latest block log entry is provided below for reference:',
12831283 'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes.
1284 -* '''Firefox / Safari:''' Hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Mac)
1285 -* '''Google Chrome:''' Press ''Ctrl-Shift-R'' (''Command-Shift-R'' on a Mac)
 1284+* '''Firefox / Safari:''' Hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''⌘-R'' on a Mac)
 1285+* '''Google Chrome:''' Press ''Ctrl-Shift-R'' (''⌘-Shift-R'' on a Mac)
12861286 * '''Internet Explorer:''' Hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''
12871287 * '''Konqueror:''' Click ''Reload'' or press ''F5''
12881288 * '''Opera:''' Clear the cache in ''Tools → Preferences''",
@@ -2064,10 +2064,10 @@
20652065 'uploadedfiles' => 'Uploaded files',
20662066 'ignorewarning' => 'Ignore warning and save file anyway',
20672067 'ignorewarnings' => 'Ignore any warnings',
2068 -'minlength1' => 'File names must be at least one letter.',
 2068+'minlength1' => 'Filenames must be at least one letter.',
20692069 'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles.
20702070 Please rename the file and try uploading it again.',
2071 -'badfilename' => 'File name has been changed to "$1".',
 2071+'badfilename' => 'Filename has been changed to "$1".',
20722072 'filetype-mime-mismatch' => 'File extension does not match MIME type.',
20732073 'filetype-badmime' => 'Files of the MIME type "$1" are not allowed to be uploaded.',
20742074 '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.',
@@ -2081,7 +2081,7 @@
20822082 'filename-tooshort' => 'The filename is too short.',
20832083 'filetype-banned' => 'This type of file is banned.',
20842084 'verification-error' => 'This file did not pass file verification.',
2085 -'hookaborted' => 'The modification you tried to make was aborted by an extension hook.',
 2085+'hookaborted' => 'The modification you tried to make was aborted by an extension.',
20862086 'illegal-filename' => 'The filename is not allowed.',
20872087 'overwrite' => 'Overwriting an existing file is not allowed.',
20882088 'unknown-error' => 'An unknown error occured.',
@@ -2091,7 +2091,7 @@
20922092 this file is $2.',
20932093 'largefileserver' => 'This file is bigger than the server is configured to allow.',
20942094 'emptyfile' => 'The file you uploaded seems to be empty.
2095 -This might be due to a typo in the file name.
 2095+This might be due to a typo in the filename.
20962096 Please check whether you really want to upload this file.',
20972097 'fileexists' => "A file with this name exists already, please check '''<tt>[[:$1]]</tt>''' if you are not sure if you want to change it.
20982098 [[$1|thumb]]",
@@ -2109,7 +2109,7 @@
21102110 If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.",
21112111 'file-thumbnail-no' => "The filename begins with '''<tt>$1</tt>'''.
21122112 It seems to be an image of reduced size ''(thumbnail)''.
2113 -If you have this image in full resolution upload this one, otherwise change the file name please.",
 2113+If you have this image in full resolution upload this one, otherwise change the filename please.",
21142114 'fileexists-forbidden' => 'A file with this name already exists, and cannot be overwritten.
21152115 If you still want to upload your file, please go back and use a new name.
21162116 [[File:$1|thumb|center|$1]]',
@@ -2152,7 +2152,7 @@
21532153 'filename-prefix-blacklist' => ' #<!-- leave this line exactly as it is --> <pre>
21542154 # Syntax is as follows:
21552155 # * Everything from a "#" character to the end of the line is a comment
2156 -# * Every non-blank line is a prefix for typical file names assigned automatically by digital cameras
 2156+# * Every non-blank line is a prefix for typical filenames assigned automatically by digital cameras
21572157 CIMG # Casio
21582158 DSC_ # Nikon
21592159 DSCF # Fuji
@@ -2233,8 +2233,7 @@
22342234
22352235 # Special:ListFiles
22362236 'listfiles-summary' => 'This special page shows all uploaded files.
2237 -By default the last uploaded files are shown at top of the list.
2238 -A click on a column header changes the sorting.',
 2237+When filtered by user, only files where that user uploaded the most recent version of the file are shown.',
22392238 'listfiles_search_for' => 'Search for media name:',
22402239 'imgfile' => 'file',
22412240 'listfiles' => 'File list',
@@ -2263,7 +2262,7 @@
22642263 'filehist-filesize' => 'File size',
22652264 'filehist-comment' => 'Comment',
22662265 'filehist-missing' => 'File missing',
2267 -'imagelinks' => 'File links',
 2266+'imagelinks' => 'File usage',
22682267 'linkstoimage' => 'The following {{PLURAL:$1|page links|$1 pages link}} to this file:',
22692268 'linkstoimage-more' => 'More than $1 {{PLURAL:$1|page links|pages link}} to this file.
22702269 The following list shows the {{PLURAL:$1|first page link|first $1 page links}} to this file only.
@@ -2371,7 +2370,7 @@
23722371 'statistics-mostpopular' => 'Most viewed pages',
23732372 'statistics-footer' => '', # do not translate or duplicate this message to other languages
23742373
2375 -'disambiguations' => 'Disambiguation pages',
 2374+'disambiguations' => 'Pages linking to disambiguation pages',
23762375 'disambiguations-summary' => '', # do not translate or duplicate this message to other languages
23772376 'disambiguationspage' => 'Template:disambig',
23782377 'disambiguations-text' => "The following pages link to a '''disambiguation page'''.
@@ -2504,8 +2503,8 @@
25052504 'pubmedurl' => 'http://www.ncbi.nlm.nih.gov/pubmed/$1?dopt=Abstract', # do not translate or duplicate this message to other languages
25062505
25072506 # Special:Log
2508 -'specialloguserlabel' => 'User:',
2509 -'speciallogtitlelabel' => 'Title:',
 2507+'specialloguserlabel' => 'Performer:',
 2508+'speciallogtitlelabel' => 'Target (title or user):',
25102509 'log' => 'Logs',
25112510 'all-logs-page' => 'All public logs',
25122511 'alllogstext' => 'Combined display of all available logs of {{SITENAME}}.
@@ -2548,12 +2547,13 @@
25492548 'sp-deletedcontributions-contribs' => 'contributions',
25502549
25512550 # Special:LinkSearch
2552 -'linksearch' => 'External links',
 2551+'linksearch' => 'External links search',
25532552 'linksearch-pat' => 'Search pattern:',
25542553 'linksearch-ns' => 'Namespace:',
25552554 'linksearch-ok' => 'Search',
2556 -'linksearch-text' => 'Wildcards such as "*.wikipedia.org" may be used.<br />
2557 -Supported protocols: <tt>$1</tt>',
 2555+'linksearch-text' => 'Wildcards such as "*.wikipedia.org" may be used.
 2556+Needs at least a top-level domain, for example "*.org".<br />
 2557+Supported protocols: <tt>$1</tt> (do not add any of these in your search).',
25582558 'linksearch-line' => '$1 is linked from $2',
25592559 'linksearch-error' => 'Wildcards may appear only at the start of the hostname.',
25602560
@@ -2841,8 +2841,7 @@
28422842 The archive may be periodically cleaned out.',
28432843 'undelete-fieldset-title' => 'Restore revisions',
28442844 'undeleteextrahelp' => "To restore the page's entire history, leave all checkboxes deselected and click '''''{{int:undeletebtn}}'''''.
2845 -To perform a selective restoration, check the boxes corresponding to the revisions to be restored, and click '''''{{int:undeletebtn}}'''''.
2846 -Clicking '''''{{int:undeletereset}}''''' will clear the comment field and all checkboxes.",
 2845+To perform a selective restoration, check the boxes corresponding to the revisions to be restored, and click '''''{{int:undeletebtn}}'''''.",
28472846 'undeleterevisions' => '$1 {{PLURAL:$1|revision|revisions}} archived',
28482847 'undeletehistory' => 'If you restore the page, all revisions will be restored to the history.
28492848 If a new page with the same name has been created since the deletion, the restored revisions will appear in the prior history.',
@@ -3053,7 +3052,7 @@
30543053 'proxyblocker' => 'Proxy blocker',
30553054 'proxyblocker-disabled' => 'This function is disabled.',
30563055 'proxyblockreason' => 'Your IP address has been blocked because it is an open proxy.
3057 -Please contact your Internet service provider or tech support and inform them of this serious security problem.',
 3056+Please contact your Internet service provider or technical support of your organization and inform them of this serious security problem.',
30583057 'proxyblocksuccess' => 'Done.',
30593058 'sorbs' => 'DNSBL', # only translate this message to other languages if you have to change it
30603059 'sorbsreason' => 'Your IP address is listed as an open proxy in the DNSBL used by {{SITENAME}}.',
@@ -3172,7 +3171,7 @@
31733172 'imagenocrossnamespace' => 'Cannot move file to non-file namespace',
31743173 'nonfile-cannot-move-to-file' => 'Cannot move non-file to file namespace',
31753174 'imagetypemismatch' => 'The new file extension does not match its type',
3176 -'imageinvalidfilename' => 'The target file name is invalid',
 3175+'imageinvalidfilename' => 'The target filename is invalid',
31773176 'fix-double-redirects' => 'Update any redirects that point to the original title',
31783177 'move-leave-redirect' => 'Leave a redirect behind',
31793178 'protectedpagemovewarning' => "'''Warning:''' This page has been protected so that only users with administrator privileges can move it.
@@ -3181,7 +3180,7 @@
31823181 The latest log entry is provided below for reference:",
31833182 'move-over-sharedrepo' => '== File exists ==
31843183 [[:$1]] exists on a shared repository. Moving a file to this title will override the shared file.',
3185 -'file-exists-sharedrepo' => 'The file name chosen is already in use on a shared repository.
 3184+'file-exists-sharedrepo' => 'The filename chosen is already in use on a shared repository.
31863185 Please choose another name.',
31873186
31883187 # Export
@@ -3230,7 +3229,7 @@
32313230 'thumbnail_invalid_params' => 'Invalid thumbnail parameters',
32323231 'thumbnail_dest_directory' => 'Unable to create destination directory',
32333232 'thumbnail_image-type' => 'Image type not supported',
3234 -'thumbnail_gd-library' => 'Incomplete GD library configuration: missing function $1',
 3233+'thumbnail_gd-library' => 'Incomplete GD library configuration: Missing function $1',
32353234 'thumbnail_image-missing' => 'File seems to be missing: $1',
32363235
32373236 # Special:Import
@@ -4260,7 +4259,7 @@
42614260 'filepath-page' => 'File:',
42624261 'filepath-submit' => 'Go',
42634262 'filepath-summary' => 'This special page returns the complete path for a file.
4264 -Images are shown in full resolution, other file types are started with their associated program directly.
 4263+Images are shown in full resolution, other file types are started with their associated program directly.',
42654264
42664265 Enter the file name without the "{{ns:file}}:" prefix.',
42674266

Follow-up revisions

RevisionCommit summaryAuthorDate
r108647Fix syntax error in r108645.siebrand18:41, 11 January 2012

Status & tagging log