Index: branches/REL1_13/phase3/languages/messages/MessagesEn.php |
— | — | @@ -883,7 +883,7 @@ |
884 | 884 | 'loginproblem' => '<b>There has been a problem with your login.</b><br />Try again!', |
885 | 885 | 'login' => 'Log in', |
886 | 886 | '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}}.', |
888 | 888 | 'userlogin' => 'Log in / create account', |
889 | 889 | 'logout' => 'Log out', |
890 | 890 | 'userlogout' => 'Log out', |
— | — | @@ -1047,7 +1047,7 @@ |
1048 | 1048 | You can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block. |
1049 | 1049 | 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. |
1050 | 1050 | 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.", |
1052 | 1052 | 'autoblockedtext' => 'Your IP address has been automatically blocked because it was used by another user, who was blocked by $1. |
1053 | 1053 | The reason given is this: |
1054 | 1054 | |
— | — | @@ -1055,17 +1055,18 @@ |
1056 | 1056 | |
1057 | 1057 | * Start of block: $8 |
1058 | 1058 | * Expiry of block: $6 |
| 1059 | +* Intended blockee: $7 |
1059 | 1060 | |
1060 | 1061 | You may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block. |
1061 | 1062 | |
1062 | 1063 | 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. |
1063 | 1064 | |
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.', |
1066 | 1067 | 'blockednoreason' => 'no reason given', |
1067 | 1068 | 'blockedoriginalsource' => "The source of '''$1''' is shown below:", |
1068 | 1069 | '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', |
1070 | 1071 | 'whitelistedittext' => 'You have to $1 to edit pages.', |
1071 | 1072 | 'confirmedittitle' => 'E-mail confirmation required to edit', |
1072 | 1073 | 'confirmedittext' => 'You must confirm your e-mail address before editing pages. |
— | — | @@ -1326,7 +1327,7 @@ |
1327 | 1328 | # Search results |
1328 | 1329 | 'searchresults' => 'Search results', |
1329 | 1330 | '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"]])', |
1331 | 1332 | 'searchsubtitleinvalid' => "You searched for '''$1'''", |
1332 | 1333 | 'noexactmatch' => "'''There is no page titled \"\$1\".''' |
1333 | 1334 | You can [[:\$1|create this page]].", |
— | — | @@ -1560,7 +1561,7 @@ |
1561 | 1562 | # Recent changes |
1562 | 1563 | 'nchanges' => '$1 {{PLURAL:$1|change|changes}}', |
1563 | 1564 | '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 |
1565 | 1566 | 'recentchangestext' => 'Track the most recent changes to the wiki on this page.', |
1566 | 1567 | 'recentchanges-feed-description' => 'Track the most recent changes to the wiki in this feed.', |
1567 | 1568 | '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 @@ |
1610 | 1611 | 'uploaderror' => 'Upload error', |
1611 | 1612 | 'upload-summary' => '', # do not translate or duplicate this message to other languages |
1612 | 1613 | '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]]. |
1614 | 1615 | |
1615 | 1616 | To include a file in a page, use a link in one of the following forms: |
1616 | 1617 | * '''<tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki></tt>''' to use the full version of the file |
— | — | @@ -2180,9 +2181,9 @@ |
2181 | 2182 | 'protectlogpage' => 'Protection log', |
2182 | 2183 | 'protectlogtext' => 'Below is a list of page locks and unlocks. |
2183 | 2184 | 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]]"', |
2187 | 2188 | 'protect-title' => 'Change protection level for "$1"', |
2188 | 2189 | 'protect-backlink' => '← $1', # only translate this message to other languages if you have to change it |
2189 | 2190 | 'protect-legend' => 'Confirm protection', |
— | — | @@ -2303,7 +2304,7 @@ |
2304 | 2305 | |
2305 | 2306 | # What links here |
2306 | 2307 | 'whatlinkshere' => 'What links here', |
2307 | | -'whatlinkshere-title' => 'Pages that link to $1', |
| 2308 | +'whatlinkshere-title' => 'Pages that link to "$1"', |
2308 | 2309 | 'whatlinkshere-summary' => '', # do not translate or duplicate this message to other languages |
2309 | 2310 | 'whatlinkshere-page' => 'Page:', |
2310 | 2311 | 'whatlinkshere-barrow' => '>', # only translate this message to other languages if you have to change it |
— | — | @@ -2367,7 +2368,7 @@ |
2368 | 2369 | 'ipusubmit' => 'Unblock this address', |
2369 | 2370 | 'unblocked' => '[[User:$1|$1]] has been unblocked', |
2370 | 2371 | 'unblocked-id' => 'Block $1 has been removed', |
2371 | | -'ipblocklist' => 'List of blocked IP addresses and usernames', |
| 2372 | +'ipblocklist' => 'Blocked IP addresses and usernames', |
2372 | 2373 | 'ipblocklist-legend' => 'Find a blocked user', |
2373 | 2374 | 'ipblocklist-username' => 'Username or IP address:', |
2374 | 2375 | 'ipblocklist-summary' => '', # do not translate or duplicate this message to other languages |
— | — | @@ -2444,8 +2445,8 @@ |
2445 | 2446 | 'move-page-legend' => 'Move page', |
2446 | 2447 | 'movepagetext' => "Using the form below will rename a page, moving all of its history to the new name. |
2447 | 2448 | 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]]. |
2450 | 2451 | You are responsible for making sure that links continue to point where they are supposed to go. |
2451 | 2452 | |
2452 | 2453 | 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 @@ |
2480 | 2481 | 'movepage-page-moved' => 'The page $1 has been moved to $2.', |
2481 | 2482 | 'movepage-page-unmoved' => 'The page $1 could not be moved to $2.', |
2482 | 2483 | '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', |
2485 | 2486 | 'movelogpage' => 'Move log', |
2486 | 2487 | 'movelogpagetext' => 'Below is a list of pages moved.', |
2487 | 2488 | 'movereason' => 'Reason:', |
2488 | 2489 | 'revertmove' => 'revert', |
2489 | 2490 | 'delete_and_move' => 'Delete and move', |
2490 | 2491 | 'delete_and_move_text' => '==Deletion required== |
2491 | | -The destination page "[[$1]]" already exists. |
| 2492 | +The destination page "[[:$1]]" already exists. |
2492 | 2493 | Do you want to delete it to make way for the move?', |
2493 | 2494 | 'delete_and_move_confirm' => 'Yes, delete the page', |
2494 | 2495 | 'delete_and_move_reason' => 'Deleted to make way for move', |
— | — | @@ -2575,7 +2576,7 @@ |
2576 | 2577 | # Import log |
2577 | 2578 | 'importlogpage' => 'Import log', |
2578 | 2579 | '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', |
2580 | 2581 | 'import-logentry-upload-detail' => '$1 {{PLURAL:$1|revision|revisions}}', |
2581 | 2582 | 'import-logentry-interwiki' => 'transwikied $1', |
2582 | 2583 | 'import-logentry-interwiki-detail' => '$1 {{PLURAL:$1|revision|revisions}} from $2', |
— | — | @@ -3172,7 +3173,7 @@ |
3173 | 3174 | |
3174 | 3175 | # External editor support |
3175 | 3176 | '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.', |
3177 | 3178 | |
3178 | 3179 | # 'all' in various places, this might be different for inflected languages |
3179 | 3180 | 'recentchangesall' => 'all', |
— | — | @@ -3248,7 +3249,7 @@ |
3249 | 3250 | 'unit-pixel' => 'px', # only translate this message to other languages if you have to change it |
3250 | 3251 | |
3251 | 3252 | # HTML dump |
3252 | | -'redirectingto' => 'Redirecting to [[$1]]...', |
| 3253 | +'redirectingto' => 'Redirecting to [[:$1]]...', |
3253 | 3254 | |
3254 | 3255 | # action=purge |
3255 | 3256 | 'confirm_purge' => 'Clear the cache of this page? |
— | — | @@ -3290,7 +3291,7 @@ |
3291 | 3292 | # Auto-summaries |
3292 | 3293 | 'autosumm-blank' => 'Removing all content from page', |
3293 | 3294 | 'autosumm-replace' => "Replacing page with '$1'", |
3294 | | -'autoredircomment' => 'Redirecting to [[$1]]', |
| 3295 | +'autoredircomment' => 'Redirecting to [[:$1]]', |
3295 | 3296 | 'autosumm-new' => 'New page: $1', |
3296 | 3297 | |
3297 | 3298 | # Autoblock whitelist |