Index: trunk/phase3/maintenance/language/messages.inc |
— | — | @@ -248,6 +248,8 @@ |
249 | 249 | 'youhavenewmessages', |
250 | 250 | 'newmessageslink', |
251 | 251 | 'newmessagesdifflink', |
| 252 | + 'youhavenewmessagesmulti', |
| 253 | + 'newtalkseperator', |
252 | 254 | 'editsection', |
253 | 255 | 'editsection-brackets', |
254 | 256 | 'editold', |
— | — | @@ -397,6 +399,8 @@ |
398 | 400 | 'invalidemailaddress', |
399 | 401 | 'accountcreated', |
400 | 402 | 'accountcreatedtext', |
| 403 | + 'loginlanguagelabel', |
| 404 | + 'loginlanguagelinks', |
401 | 405 | ), |
402 | 406 | 'resetpass' => array( |
403 | 407 | 'resetpass', |
— | — | @@ -845,7 +849,6 @@ |
846 | 850 | 'imagelist', |
847 | 851 | 'imagelist-summary', |
848 | 852 | 'imagelisttext', |
849 | | - 'imagelistforuser', |
850 | 853 | 'getimagelist', |
851 | 854 | 'ilsubmit', |
852 | 855 | 'showlast', |
— | — | @@ -1105,7 +1108,6 @@ |
1106 | 1109 | 'watchlistfor', |
1107 | 1110 | 'nowatchlist', |
1108 | 1111 | 'watchlistanontext', |
1109 | | - 'watchlistcount', |
1110 | 1112 | 'watchnologin', |
1111 | 1113 | 'watchnologintext', |
1112 | 1114 | 'addedwatch', |
— | — | @@ -2097,10 +2099,6 @@ |
2098 | 2100 | 'confirm_purge', |
2099 | 2101 | 'confirm_purge_button', |
2100 | 2102 | ), |
2101 | | - 'newmessagesmulti' => array( |
2102 | | - 'youhavenewmessagesmulti', |
2103 | | - 'newtalkseperator', |
2104 | | - ), |
2105 | 2103 | 'search2' => array( |
2106 | 2104 | 'searchcontaining', |
2107 | 2105 | 'searchnamed', |
— | — | @@ -2110,10 +2108,6 @@ |
2111 | 2109 | 'catseparator' => array( |
2112 | 2110 | 'catseparator', |
2113 | 2111 | ), |
2114 | | - 'loginlanguage' => array( |
2115 | | - 'loginlanguagelabel', |
2116 | | - 'loginlanguagelinks', |
2117 | | - ), |
2118 | 2112 | 'imgmulti' => array( |
2119 | 2113 | 'imgmultipageprev', |
2120 | 2114 | 'imgmultipagenext', |
— | — | @@ -2341,10 +2335,8 @@ |
2342 | 2336 | 'unit-pixel' => '', |
2343 | 2337 | 'htmldump' => 'HTML dump', |
2344 | 2338 | 'purge' => 'action=purge', |
2345 | | - 'newmessagesmulti' => '', |
2346 | | - 'search2' => '', |
| 2339 | + 'search2' => 'AJAX search', |
2347 | 2340 | 'catseparator' => 'Separator for categories in page lists', |
2348 | | - 'loginlanguage' => '', |
2349 | 2341 | 'imgmulti' => 'Multipage image navigation', |
2350 | 2342 | 'tablepager' => 'Table pager', |
2351 | 2343 | 'autosumm' => 'Auto-summaries', |
Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -682,30 +682,32 @@ |
683 | 683 | 'versionrequired' => 'Version $1 of MediaWiki required', |
684 | 684 | 'versionrequiredtext' => 'Version $1 of MediaWiki is required to use this page. See [[Special:Version|version page]].', |
685 | 685 | |
686 | | -'ok' => 'OK', |
687 | | -'sitetitle' => '{{SITENAME}}', # don't translate or duplicate this message to other languages |
688 | | -'pagetitle' => '$1 - {{SITENAME}}', |
689 | | -'sitesubtitle' => '', # don't translate or duplicate this message to other languages |
690 | | -'retrievedfrom' => 'Retrieved from "$1"', |
691 | | -'youhavenewmessages' => 'You have $1 ($2).', |
692 | | -'newmessageslink' => 'new messages', |
693 | | -'newmessagesdifflink' => 'last change', |
694 | | -'editsection' => 'edit', |
695 | | -'editsection-brackets' => '[$1]', # only translate this message to other languages if you have to change it |
696 | | -'editold' => 'edit', |
697 | | -'editsectionhint' => 'Edit section: $1', |
698 | | -'toc' => 'Contents', |
699 | | -'showtoc' => 'show', |
700 | | -'hidetoc' => 'hide', |
701 | | -'thisisdeleted' => 'View or restore $1?', |
702 | | -'viewdeleted' => 'View $1?', |
703 | | -'restorelink' => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}', |
704 | | -'feedlinks' => 'Feed:', |
705 | | -'feed-invalid' => 'Invalid subscription feed type.', |
706 | | -'feed-atom' => 'Atom', # only translate this message to other languages if you have to change it |
707 | | -'feed-rss' => 'RSS', # only translate this message to other languages if you have to change it |
708 | | -'sitenotice' => '-', # the equivalent to wgSiteNotice; don't translate or duplicate this message to other languages |
709 | | -'anonnotice' => '-', # don't translate or duplicate this message to other languages |
| 686 | +'ok' => 'OK', |
| 687 | +'sitetitle' => '{{SITENAME}}', # don't translate or duplicate this message to other languages |
| 688 | +'pagetitle' => '$1 - {{SITENAME}}', |
| 689 | +'sitesubtitle' => '', # don't translate or duplicate this message to other languages |
| 690 | +'retrievedfrom' => 'Retrieved from "$1"', |
| 691 | +'youhavenewmessages' => 'You have $1 ($2).', |
| 692 | +'newmessageslink' => 'new messages', |
| 693 | +'newmessagesdifflink' => 'last change', |
| 694 | +'youhavenewmessagesmulti' => 'You have new messages on $1', |
| 695 | +'newtalkseperator' => ',_', # don't translate or duplicate this message to other languages |
| 696 | +'editsection' => 'edit', |
| 697 | +'editsection-brackets' => '[$1]', # only translate this message to other languages if you have to change it |
| 698 | +'editold' => 'edit', |
| 699 | +'editsectionhint' => 'Edit section: $1', |
| 700 | +'toc' => 'Contents', |
| 701 | +'showtoc' => 'show', |
| 702 | +'hidetoc' => 'hide', |
| 703 | +'thisisdeleted' => 'View or restore $1?', |
| 704 | +'viewdeleted' => 'View $1?', |
| 705 | +'restorelink' => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}', |
| 706 | +'feedlinks' => 'Feed:', |
| 707 | +'feed-invalid' => 'Invalid subscription feed type.', |
| 708 | +'feed-atom' => 'Atom', # only translate this message to other languages if you have to change it |
| 709 | +'feed-rss' => 'RSS', # only translate this message to other languages if you have to change it |
| 710 | +'sitenotice' => '-', # the equivalent to wgSiteNotice; don't translate or duplicate this message to other languages |
| 711 | +'anonnotice' => '-', # don't translate or duplicate this message to other languages |
710 | 712 | |
711 | 713 | # Short words for each namespace, by default used in the 'article' tab in monobook |
712 | 714 | 'nstab-main' => 'Article', |
— | — | @@ -884,6 +886,14 @@ |
885 | 887 | format. Please enter a well-formatted address or empty that field.', |
886 | 888 | 'accountcreated' => 'Account created', |
887 | 889 | 'accountcreatedtext' => 'The user account for $1 has been created.', |
| 890 | +'loginlanguagelabel' => 'Language: $1', |
| 891 | +'loginlanguagelinks' => '* Deutsch|de |
| 892 | +* English|en |
| 893 | +* Esperanto|eo |
| 894 | +* Français|fr |
| 895 | +* Español|es |
| 896 | +* Italiano|it |
| 897 | +* Nederlands|nl', # don't translate or duplicate this message to other languages |
888 | 898 | |
889 | 899 | # Password reset dialog |
890 | 900 | 'resetpass' => 'Reset account password', |
— | — | @@ -1442,7 +1452,6 @@ |
1443 | 1453 | 'imagelist' => 'File list', |
1444 | 1454 | 'imagelist-summary' => '', # only translate this message to other languages if you have to change it |
1445 | 1455 | 'imagelisttext' => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.", |
1446 | | -'imagelistforuser' => 'This shows only images uploaded by $1.', |
1447 | 1456 | 'getimagelist' => 'fetching file list', |
1448 | 1457 | 'ilsubmit' => 'Search', |
1449 | 1458 | 'showlast' => 'Show last $1 files sorted $2.', |
— | — | @@ -1719,7 +1728,6 @@ |
1720 | 1729 | 'watchlistfor' => "(for '''$1''')", |
1721 | 1730 | 'nowatchlist' => 'You have no items on your watchlist.', |
1722 | 1731 | 'watchlistanontext' => 'Please $1 to view or edit items on your watchlist.', |
1723 | | -'watchlistcount' => "'''You have {{PLURAL:$1|$1 item|$1 items}} on your watchlist, including talk pages.'''", |
1724 | 1732 | 'watchnologin' => 'Not logged in', |
1725 | 1733 | 'watchnologintext' => 'You must be [[Special:Userlogin|logged in]] to modify your watchlist.', |
1726 | 1734 | 'addedwatch' => 'Added to watchlist', |
— | — | @@ -2838,9 +2846,7 @@ |
2839 | 2847 | $1', |
2840 | 2848 | 'confirm_purge_button' => 'OK', |
2841 | 2849 | |
2842 | | -'youhavenewmessagesmulti' => 'You have new messages on $1', |
2843 | | -'newtalkseperator' => ',_', # don't translate or duplicate this message to other languages |
2844 | | - |
| 2850 | +# AJAX search |
2845 | 2851 | 'searchcontaining' => "Search for articles containing ''$1''.", |
2846 | 2852 | 'searchnamed' => "Search for articles named ''$1''.", |
2847 | 2853 | 'articletitles' => "Articles starting with ''$1''", |
— | — | @@ -2849,15 +2855,6 @@ |
2850 | 2856 | # Separator for categories in page lists |
2851 | 2857 | 'catseparator' => '|', # don't translate or duplicate this message to other languages |
2852 | 2858 | |
2853 | | -'loginlanguagelabel' => 'Language: $1', |
2854 | | -'loginlanguagelinks' => '* Deutsch|de |
2855 | | -* English|en |
2856 | | -* Esperanto|eo |
2857 | | -* Français|fr |
2858 | | -* Español|es |
2859 | | -* Italiano|it |
2860 | | -* Nederlands|nl', # don't translate or duplicate this message to other languages |
2861 | | - |
2862 | 2859 | # Multipage image navigation |
2863 | 2860 | 'imgmultipageprev' => '← previous page', |
2864 | 2861 | 'imgmultipagenext' => 'next page →', |