r38916 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r38915‎ | r38916 | r38917 >
Date:16:47, 8 August 2008
Author:siebrand
Status:old
Tags:
Comment:
Backport compatible recent changes to MessagesEn.php (up to r38903)
Modified paths:
  • /branches/REL1_13/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: branches/REL1_13/phase3/languages/messages/MessagesEn.php
@@ -883,7 +883,7 @@
884884 'loginproblem' => '<b>There has been a problem with your login.</b><br />Try again!',
885885 'login' => 'Log in',
886886 'nav-login-createaccount' => 'Log in / create account',
887 -'loginprompt' => 'You must have cookies enabled to [[Special:UserLogin|log in to {{SITENAME}}]].',
 887+'loginprompt' => 'You must have cookies enabled to log in to {{SITENAME}}.',
888888 'userlogin' => 'Log in / create account',
889889 'logout' => 'Log out',
890890 'userlogout' => 'Log out',
@@ -1047,7 +1047,7 @@
10481048 You can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.
10491049 You cannot use the 'e-mail this user' feature unless a valid e-mail address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.
10501050 Your current IP address is $3, and the block ID is #$5.
1051 -Please include either or both of these in any queries.",
 1051+Please include all above details in any queries you make.",
10521052 'autoblockedtext' => 'Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.
10531053 The reason given is this:
10541054
@@ -1055,17 +1055,18 @@
10561056
10571057 * Start of block: $8
10581058 * Expiry of block: $6
 1059+* Intended blockee: $7
10591060
10601061 You may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block.
10611062
10621063 Note that you may not use the "e-mail this user" feature unless you have a valid e-mail address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it.
10631064
1064 -Your block ID is $5.
1065 -Please include this ID in any queries you make.',
 1065+Your current IP address is $3, and the block ID is #$5.
 1066+Please include all above details in any queries you make.',
10661067 'blockednoreason' => 'no reason given',
10671068 'blockedoriginalsource' => "The source of '''$1''' is shown below:",
10681069 'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:",
1069 -'whitelistedittitle' => '[[Special:UserLogin|Login required]] to edit',
 1070+'whitelistedittitle' => 'Login required to edit',
10701071 'whitelistedittext' => 'You have to $1 to edit pages.',
10711072 'confirmedittitle' => 'E-mail confirmation required to edit',
10721073 'confirmedittext' => 'You must confirm your e-mail address before editing pages.
@@ -1326,7 +1327,7 @@
13271328 # Search results
13281329 'searchresults' => 'Search results',
13291330 'searchresulttext' => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:Helppage}}|{{int:help}}]].',
1330 -'searchsubtitle' => 'You searched for \'\'\'[[:$1]]\'\'\' ([[Special:PrefixIndex/$1|all pages starting with "$1"]] | [[Special:WhatLinksHere/$1|all pages that link to "$1"]])',
 1331+'searchsubtitle' => 'You searched for \'\'\'[[:$1]]\'\'\' ([[Special:Prefixindex/$1|all pages starting with "$1"]] | [[Special:WhatLinksHere/$1|all pages that link to "$1"]])',
13311332 'searchsubtitleinvalid' => "You searched for '''$1'''",
13321333 'noexactmatch' => "'''There is no page titled \"\$1\".'''
13331334 You can [[:\$1|create this page]].",
@@ -1560,7 +1561,7 @@
15611562 # Recent changes
15621563 'nchanges' => '$1 {{PLURAL:$1|change|changes}}',
15631564 'recentchanges' => 'Recent changes',
1564 -'recentchanges-url' => 'Special:RecentChanges', # do not translate or duplicate this message to other languages
 1565+'recentchanges-url' => 'Special:Recentchanges', # do not translate or duplicate this message to other languages
15651566 'recentchangestext' => 'Track the most recent changes to the wiki on this page.',
15661567 'recentchanges-feed-description' => 'Track the most recent changes to the wiki in this feed.',
15671568 'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $5, $4.",
@@ -1609,7 +1610,7 @@
16101611 'uploaderror' => 'Upload error',
16111612 'upload-summary' => '', # do not translate or duplicate this message to other languages
16121613 'uploadtext' => "Use the form below to upload files.
1613 -To view or search previously uploaded files go to the [[Special:ImageList|list of uploaded files]], uploads and deletions are also logged in the [[Special:Log/upload|upload log]].
 1614+To view or search previously uploaded files go to the [[Special:ImageList|list of uploaded files]], (re)uploads are also logged in the [[Special:Log/upload|upload log]], deletions in the [[Special:Log/delete|deletion log]].
16141615
16151616 To include a file in a page, use a link in one of the following forms:
16161617 * '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' to use the full version of the file
@@ -2180,9 +2181,9 @@
21812182 'protectlogpage' => 'Protection log',
21822183 'protectlogtext' => 'Below is a list of page locks and unlocks.
21832184 See the [[Special:ProtectedPages|protected pages list]] for the list of currently operational page protections.',
2184 -'protectedarticle' => 'protected "[[$1]]"',
2185 -'modifiedarticleprotection' => 'changed protection level for "[[$1]]"',
2186 -'unprotectedarticle' => 'unprotected "[[$1]]"',
 2185+'protectedarticle' => 'protected "[[:$1]]"',
 2186+'modifiedarticleprotection' => 'changed protection level for "[[:$1]]"',
 2187+'unprotectedarticle' => 'unprotected "[[:$1]]"',
21872188 'protect-title' => 'Change protection level for "$1"',
21882189 'protect-backlink' => '← $1', # only translate this message to other languages if you have to change it
21892190 'protect-legend' => 'Confirm protection',
@@ -2303,7 +2304,7 @@
23042305
23052306 # What links here
23062307 'whatlinkshere' => 'What links here',
2307 -'whatlinkshere-title' => 'Pages that link to $1',
 2308+'whatlinkshere-title' => 'Pages that link to "$1"',
23082309 'whatlinkshere-summary' => '', # do not translate or duplicate this message to other languages
23092310 'whatlinkshere-page' => 'Page:',
23102311 'whatlinkshere-barrow' => '>', # only translate this message to other languages if you have to change it
@@ -2367,7 +2368,7 @@
23682369 'ipusubmit' => 'Unblock this address',
23692370 'unblocked' => '[[User:$1|$1]] has been unblocked',
23702371 'unblocked-id' => 'Block $1 has been removed',
2371 -'ipblocklist' => 'List of blocked IP addresses and usernames',
 2372+'ipblocklist' => 'Blocked IP addresses and usernames',
23722373 'ipblocklist-legend' => 'Find a blocked user',
23732374 'ipblocklist-username' => 'Username or IP address:',
23742375 'ipblocklist-summary' => '', # do not translate or duplicate this message to other languages
@@ -2444,8 +2445,8 @@
24452446 'move-page-legend' => 'Move page',
24462447 'movepagetext' => "Using the form below will rename a page, moving all of its history to the new name.
24472448 The old title will become a redirect page to the new title.
2448 -Links to the old page title will not be changed;
2449 -be sure to check for [[Special:DoubleRedirects|double]] or [[Special:BrokenRedirects|broken redirects]].
 2449+You can update redirects that point to the original title automatically.
 2450+If you choose not to, be sure to check for [[Special:DoubleRedirects|double]] or [[Special:BrokenRedirects|broken redirects]].
24502451 You are responsible for making sure that links continue to point where they are supposed to go.
24512452
24522453 Note that the page will '''not''' be moved if there is already a page at the new title, unless it is empty or a redirect and has no past edit history.
@@ -2479,15 +2480,15 @@
24802481 'movepage-page-moved' => 'The page $1 has been moved to $2.',
24812482 'movepage-page-unmoved' => 'The page $1 could not be moved to $2.',
24822483 'movepage-max-pages' => 'The maximum of $1 {{PLURAL:$1|page|pages}} has been moved and no more will be moved automatically.',
2483 -'1movedto2' => '[[$1]] moved to [[$2]]',
2484 -'1movedto2_redir' => '[[$1]] moved to [[$2]] over redirect',
 2484+'1movedto2' => '[[:$1]] moved to [[:$2]]',
 2485+'1movedto2_redir' => '[[:$1]] moved to [[:$2]] over redirect',
24852486 'movelogpage' => 'Move log',
24862487 'movelogpagetext' => 'Below is a list of pages moved.',
24872488 'movereason' => 'Reason:',
24882489 'revertmove' => 'revert',
24892490 'delete_and_move' => 'Delete and move',
24902491 'delete_and_move_text' => '==Deletion required==
2491 -The destination page "[[$1]]" already exists.
 2492+The destination page "[[:$1]]" already exists.
24922493 Do you want to delete it to make way for the move?',
24932494 'delete_and_move_confirm' => 'Yes, delete the page',
24942495 'delete_and_move_reason' => 'Deleted to make way for move',
@@ -2575,7 +2576,7 @@
25762577 # Import log
25772578 'importlogpage' => 'Import log',
25782579 'importlogpagetext' => 'Administrative imports of pages with edit history from other wikis.',
2579 -'import-logentry-upload' => 'imported [[$1]] by file upload',
 2580+'import-logentry-upload' => 'imported [[:$1]] by file upload',
25802581 'import-logentry-upload-detail' => '$1 {{PLURAL:$1|revision|revisions}}',
25812582 'import-logentry-interwiki' => 'transwikied $1',
25822583 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revision|revisions}} from $2',
@@ -3172,7 +3173,7 @@
31733174
31743175 # External editor support
31753176 'edit-externally' => 'Edit this file using an external application',
3176 -'edit-externally-help' => 'See the [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions] for more information.',
 3177+'edit-externally-help' => 'See the [http://www.mediawiki.org/wiki/Manual:External_editors setup instructions] for more information.',
31773178
31783179 # 'all' in various places, this might be different for inflected languages
31793180 'recentchangesall' => 'all',
@@ -3248,7 +3249,7 @@
32493250 'unit-pixel' => 'px', # only translate this message to other languages if you have to change it
32503251
32513252 # HTML dump
3252 -'redirectingto' => 'Redirecting to [[$1]]...',
 3253+'redirectingto' => 'Redirecting to [[:$1]]...',
32533254
32543255 # action=purge
32553256 'confirm_purge' => 'Clear the cache of this page?
@@ -3290,7 +3291,7 @@
32913292 # Auto-summaries
32923293 'autosumm-blank' => 'Removing all content from page',
32933294 'autosumm-replace' => "Replacing page with '$1'",
3294 -'autoredircomment' => 'Redirecting to [[$1]]',
 3295+'autoredircomment' => 'Redirecting to [[:$1]]',
32953296 'autosumm-new' => 'New page: $1',
32963297
32973298 # Autoblock whitelist

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r38903(rationale by Purodha) To some extent at least, category pages, and media pag...siebrand15:02, 8 August 2008

Status & tagging log