r35229 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r35228‎ | r35229 | r35230 >
Date:15:08, 23 May 2008
Author:ialex
Status:old
Tags:
Comment:
Update messages.inc and rebuild MessagesEn.php
Modified paths:
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
@@ -555,6 +555,7 @@
556556 'nocreate-loggedin',
557557 'permissionserrors',
558558 'permissionserrorstext',
 559+ 'permissionserrorstext-withaction',
559560 'recreate-deleted-warn',
560561 ),
561562 'parserwarnings' => array(
@@ -574,6 +575,7 @@
575576 'cantcreateaccount' => array(
576577 'cantcreateaccounttitle',
577578 'cantcreateaccount-text',
 579+ 'cantcreateaccount-nonblock-text',
578580 ),
579581 'history' => array(
580582 'viewpagelogs',
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -985,26 +985,26 @@
986986 'hr_tip' => 'Horizontal line (use sparingly)',
987987
988988 # Edit pages
989 -'summary' => 'Summary',
990 -'subject' => 'Subject/headline',
991 -'minoredit' => 'This is a minor edit',
992 -'watchthis' => 'Watch this page',
993 -'savearticle' => 'Save page',
994 -'preview' => 'Preview',
995 -'showpreview' => 'Show preview',
996 -'showlivepreview' => 'Live preview',
997 -'showdiff' => 'Show changes',
998 -'anoneditwarning' => "'''Warning:''' You are not logged in.
 989+'summary' => 'Summary',
 990+'subject' => 'Subject/headline',
 991+'minoredit' => 'This is a minor edit',
 992+'watchthis' => 'Watch this page',
 993+'savearticle' => 'Save page',
 994+'preview' => 'Preview',
 995+'showpreview' => 'Show preview',
 996+'showlivepreview' => 'Live preview',
 997+'showdiff' => 'Show changes',
 998+'anoneditwarning' => "'''Warning:''' You are not logged in.
999999 Your IP address will be recorded in this page's edit history.",
1000 -'missingsummary' => "'''Reminder:''' You have not provided an edit summary.
 1000+'missingsummary' => "'''Reminder:''' You have not provided an edit summary.
10011001 If you click Save again, your edit will be saved without one.",
1002 -'missingcommenttext' => 'Please enter a comment below.',
1003 -'missingcommentheader' => "'''Reminder:''' You have not provided a subject/headline for this comment.
 1002+'missingcommenttext' => 'Please enter a comment below.',
 1003+'missingcommentheader' => "'''Reminder:''' You have not provided a subject/headline for this comment.
10041004 If you click Save again, your edit will be saved without one.",
1005 -'summary-preview' => 'Summary preview',
1006 -'subject-preview' => 'Subject/headline preview',
1007 -'blockedtitle' => 'User is blocked',
1008 -'blockedtext' => "<big>'''Your user name or IP address has been blocked.'''</big>
 1005+'summary-preview' => 'Summary preview',
 1006+'subject-preview' => 'Subject/headline preview',
 1007+'blockedtitle' => 'User is blocked',
 1008+'blockedtext' => "<big>'''Your user name or IP address has been blocked.'''</big>
10091009
10101010 The block was made by $1. The reason given is ''$2''.
10111011
@@ -1015,7 +1015,7 @@
10161016 You can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.
10171017 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.
10181018 Your current IP address is $3, and the block ID is #$5. Please include either or both of these in any queries.",
1019 -'autoblockedtext' => 'Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.
 1019+'autoblockedtext' => 'Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.
10201020 The reason given is this:
10211021
10221022 :\'\'$2\'\'
@@ -1029,109 +1029,109 @@
10301030
10311031 Your block ID is $5.
10321032 Please include this ID in any queries you make.',
1033 -'blockednoreason' => 'no reason given',
1034 -'blockedoriginalsource' => "The source of '''$1''' is shown below:",
1035 -'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:",
1036 -'whitelistedittitle' => 'Login required to edit',
1037 -'whitelistedittext' => 'You have to $1 to edit pages.',
1038 -'whitelistreadtitle' => 'Login required to read',
1039 -'whitelistreadtext' => 'You have to [[Special:Userlogin|login]] to read pages.',
1040 -'whitelistacctitle' => 'You are not allowed to create an account',
1041 -'whitelistacctext' => 'To be allowed to create accounts in {{SITENAME}} you have to [[Special:Userlogin|log]] in and have the appropriate permissions.',
1042 -'confirmedittitle' => 'E-mail confirmation required to edit',
1043 -'confirmedittext' => 'You must confirm your e-mail address before editing pages.
 1033+'blockednoreason' => 'no reason given',
 1034+'blockedoriginalsource' => "The source of '''$1''' is shown below:",
 1035+'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:",
 1036+'whitelistedittitle' => 'Login required to edit',
 1037+'whitelistedittext' => 'You have to $1 to edit pages.',
 1038+'whitelistreadtitle' => 'Login required to read',
 1039+'whitelistreadtext' => 'You have to [[Special:Userlogin|login]] to read pages.',
 1040+'whitelistacctitle' => 'You are not allowed to create an account',
 1041+'whitelistacctext' => 'To be allowed to create accounts in {{SITENAME}} you have to [[Special:Userlogin|log]] in and have the appropriate permissions.',
 1042+'confirmedittitle' => 'E-mail confirmation required to edit',
 1043+'confirmedittext' => 'You must confirm your e-mail address before editing pages.
10441044 Please set and validate your e-mail address through your [[Special:Preferences|user preferences]].',
1045 -'nosuchsectiontitle' => 'No such section',
1046 -'nosuchsectiontext' => 'You tried to edit a section that does not exist.
 1045+'nosuchsectiontitle' => 'No such section',
 1046+'nosuchsectiontext' => 'You tried to edit a section that does not exist.
10471047 Since there is no section $1, there is no place to save your edit.',
1048 -'loginreqtitle' => 'Login Required',
1049 -'loginreqlink' => 'log in',
1050 -'loginreqpagetext' => 'You must $1 to view other pages.',
1051 -'accmailtitle' => 'Password sent.',
1052 -'accmailtext' => 'The password for "$1" has been sent to $2.',
1053 -'newarticle' => '(New)',
1054 -'newarticletext' => "You have followed a link to a page that does not exist yet.
 1048+'loginreqtitle' => 'Login Required',
 1049+'loginreqlink' => 'log in',
 1050+'loginreqpagetext' => 'You must $1 to view other pages.',
 1051+'accmailtitle' => 'Password sent.',
 1052+'accmailtext' => 'The password for "$1" has been sent to $2.',
 1053+'newarticle' => '(New)',
 1054+'newarticletext' => "You have followed a link to a page that does not exist yet.
10551055 To create the page, start typing in the box below (see the [[{{MediaWiki:Helppage}}|help page]] for more info).
10561056 If you are here by mistake, just click your browser's '''back''' button.",
1057 -'newarticletextanon' => '{{int:newarticletext}}', # do not translate or duplicate this message to other languages
1058 -'talkpagetext' => '<!-- MediaWiki:talkpagetext -->', # do not translate or duplicate this message to other languages
1059 -'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical IP address to identify him/her.
 1057+'newarticletextanon' => '{{int:newarticletext}}', # do not translate or duplicate this message to other languages
 1058+'talkpagetext' => '<!-- MediaWiki:talkpagetext -->', # do not translate or duplicate this message to other languages
 1059+'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical IP address to identify him/her.
10601060 Such an IP address can be shared by several users.
10611061 If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.''",
1062 -'noarticletext' => 'There is currently no text in this page, you can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].',
1063 -'noarticletextanon' => '{{int:noarticletext}}', # do not translate or duplicate this message to other languages
1064 -'userpage-userdoesnotexist' => 'User account "$1" is not registered. Please check if you want to create/edit this page.',
1065 -'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools→Preferences''.",
1066 -'usercssjsyoucanpreview' => "<strong>Tip:</strong> Use the 'Show preview' button to test your new CSS/JS before saving.",
1067 -'usercsspreview' => "'''Remember that you are only previewing your user CSS, it has not yet been saved!'''",
1068 -'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''",
1069 -'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\".
 1062+'noarticletext' => 'There is currently no text in this page, you can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].',
 1063+'noarticletextanon' => '{{int:noarticletext}}', # do not translate or duplicate this message to other languages
 1064+'userpage-userdoesnotexist' => 'User account "$1" is not registered. Please check if you want to create/edit this page.',
 1065+'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools→Preferences''.",
 1066+'usercssjsyoucanpreview' => "<strong>Tip:</strong> Use the 'Show preview' button to test your new CSS/JS before saving.",
 1067+'usercsspreview' => "'''Remember that you are only previewing your user CSS, it has not yet been saved!'''",
 1068+'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''",
 1069+'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\".
10701070 Remember that custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/monobook.css as opposed to {{ns:user}}:Foo/Monobook.css.",
1071 -'updated' => '(Updated)',
1072 -'note' => '<strong>Note:</strong>',
1073 -'previewnote' => '<strong>This is only a preview;
 1071+'updated' => '(Updated)',
 1072+'note' => '<strong>Note:</strong>',
 1073+'previewnote' => '<strong>This is only a preview;
10741074 changes have not yet been saved!</strong>',
1075 -'previewconflict' => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.',
1076 -'session_fail_preview' => '<strong>Sorry! We could not process your edit due to a loss of session data.
 1075+'previewconflict' => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.',
 1076+'session_fail_preview' => '<strong>Sorry! We could not process your edit due to a loss of session data.
10771077 Please try again. If it still does not work, try logging out and logging back in.</strong>',
1078 -'session_fail_preview_html' => "<strong>Sorry! We could not process your edit due to a loss of session data.</strong>
 1078+'session_fail_preview_html' => "<strong>Sorry! We could not process your edit due to a loss of session data.</strong>
10791079
10801080 ''Because {{SITENAME}} has raw HTML enabled, the preview is hidden as a precaution against JavaScript attacks.''
10811081
10821082 <strong>If this is a legitimate edit attempt, please try again. If it still does not work, try logging out and logging back in.</strong>",
1083 -'token_suffix_mismatch' => '<strong>Your edit has been rejected because your client mangled the punctuation characters in the edit token.
 1083+'token_suffix_mismatch' => '<strong>Your edit has been rejected because your client mangled the punctuation characters in the edit token.
10841084 The edit has been rejected to prevent corruption of the page text.
10851085 This sometimes happens when you are using a buggy web-based anonymous proxy service.</strong>',
1086 -'editing' => 'Editing $1',
1087 -'editingsection' => 'Editing $1 (section)',
1088 -'editingcomment' => 'Editing $1 (comment)',
1089 -'editconflict' => 'Edit conflict: $1',
1090 -'explainconflict' => "Someone else has changed this page since you started editing it.
 1086+'editing' => 'Editing $1',
 1087+'editingsection' => 'Editing $1 (section)',
 1088+'editingcomment' => 'Editing $1 (comment)',
 1089+'editconflict' => 'Edit conflict: $1',
 1090+'explainconflict' => "Someone else has changed this page since you started editing it.
10911091 The upper text area contains the page text as it currently exists.
10921092 Your changes are shown in the lower text area.
10931093 You will have to merge your changes into the existing text.
10941094 '''Only''' the text in the upper text area will be saved when you press \"Save page\".",
1095 -'yourtext' => 'Your text',
1096 -'storedversion' => 'Stored version',
1097 -'nonunicodebrowser' => '<strong>WARNING: Your browser is not unicode compliant.
 1095+'yourtext' => 'Your text',
 1096+'storedversion' => 'Stored version',
 1097+'nonunicodebrowser' => '<strong>WARNING: Your browser is not unicode compliant.
10981098 A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.</strong>',
1099 -'editingold' => '<strong>WARNING: You are editing an out-of-date revision of this page.
 1099+'editingold' => '<strong>WARNING: You are editing an out-of-date revision of this page.
11001100 If you save it, any changes made since this revision will be lost.</strong>',
1101 -'yourdiff' => 'Differences',
1102 -'copyrightwarning' => 'Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details).
 1101+'yourdiff' => 'Differences',
 1102+'copyrightwarning' => 'Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details).
11031103 If you do not want your writing to be edited mercilessly and redistributed at will, then do not submit it here.<br />
11041104 You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource.
11051105 <strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>',
1106 -'copyrightwarning2' => 'Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors.
 1106+'copyrightwarning2' => 'Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors.
11071107 If you do not want your writing to be edited mercilessly, then do not submit it here.<br />
11081108 You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource (see $1 for details).
11091109 <strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>',
1110 -'longpagewarning' => '<strong>WARNING: This page is $1 kilobytes long;
 1110+'longpagewarning' => '<strong>WARNING: This page is $1 kilobytes long;
11111111 some browsers may have problems editing pages approaching or longer than 32kb.
11121112 Please consider breaking the page into smaller sections.</strong>',
1113 -'longpageerror' => '<strong>ERROR: The text you have submitted is $1 kilobytes long, which is longer than the maximum of $2 kilobytes.
 1113+'longpageerror' => '<strong>ERROR: The text you have submitted is $1 kilobytes long, which is longer than the maximum of $2 kilobytes.
11141114 It cannot be saved.</strong>',
1115 -'readonlywarning' => '<strong>WARNING: The database has been locked for maintenance, so you will not be able to save your edits right now.
 1115+'readonlywarning' => '<strong>WARNING: The database has been locked for maintenance, so you will not be able to save your edits right now.
11161116 You may wish to cut-n-paste the text into a text file and save it for later.</strong>',
1117 -'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it.</strong>',
1118 -'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.",
1119 -'cascadeprotectedwarning' => "'''Warning:''' This page has been locked so that only users with sysop privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:",
1120 -'titleprotectedwarning' => '<strong>WARNING: This page has been locked so that only some users can create it.</strong>',
1121 -'templatesused' => 'Templates used on this page:',
1122 -'templatesusedpreview' => 'Templates used in this preview:',
1123 -'templatesusedsection' => 'Templates used in this section:',
1124 -'template-protected' => '(protected)',
1125 -'template-semiprotected' => '(semi-protected)',
1126 -'hiddencategories' => 'This page is a member of {{PLURAL:$1|1 hidden category|$1 hidden categories}}:',
1127 -'edittools' => '<!-- Text here will be shown below edit and upload forms. -->', # only translate this message to other languages if you have to change it
1128 -'nocreatetitle' => 'Page creation limited',
1129 -'nocreatetext' => '{{SITENAME}} has restricted the ability to create new pages.
 1117+'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it.</strong>',
 1118+'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.",
 1119+'cascadeprotectedwarning' => "'''Warning:''' This page has been locked so that only users with sysop privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:",
 1120+'titleprotectedwarning' => '<strong>WARNING: This page has been locked so that only some users can create it.</strong>',
 1121+'templatesused' => 'Templates used on this page:',
 1122+'templatesusedpreview' => 'Templates used in this preview:',
 1123+'templatesusedsection' => 'Templates used in this section:',
 1124+'template-protected' => '(protected)',
 1125+'template-semiprotected' => '(semi-protected)',
 1126+'hiddencategories' => 'This page is a member of {{PLURAL:$1|1 hidden category|$1 hidden categories}}:',
 1127+'edittools' => '<!-- Text here will be shown below edit and upload forms. -->', # only translate this message to other languages if you have to change it
 1128+'nocreatetitle' => 'Page creation limited',
 1129+'nocreatetext' => '{{SITENAME}} has restricted the ability to create new pages.
11301130 You can go back and edit an existing page, or [[Special:Userlogin|log in or create an account]].',
1131 -'nocreate-loggedin' => 'You do not have permission to create new pages on {{SITENAME}}.',
1132 -'permissionserrors' => 'Permissions Errors',
1133 -'permissionserrorstext' => 'You do not have permission to do that, for the following {{PLURAL:$1|reason|reasons}}:',
1134 -'permissionserrorstext-withaction' => 'You do not have permission to $2, for the following {{PLURAL:$1|reason|reasons}}:',
1135 -'recreate-deleted-warn' => "'''Warning: You are recreating a page that was previously deleted.'''
 1131+'nocreate-loggedin' => 'You do not have permission to create new pages on {{SITENAME}}.',
 1132+'permissionserrors' => 'Permissions Errors',
 1133+'permissionserrorstext' => 'You do not have permission to do that, for the following {{PLURAL:$1|reason|reasons}}:',
 1134+'permissionserrorstext-withaction' => 'You do not have permission to $2, for the following {{PLURAL:$1|reason|reasons}}:',
 1135+'recreate-deleted-warn' => "'''Warning: You are recreating a page that was previously deleted.'''
11361136
11371137 You should consider whether it is appropriate to continue editing this page.
11381138 The deletion log for this page is provided here for convenience:",
@@ -1155,8 +1155,8 @@
11561156 'undo-summary' => 'Undo revision $1 by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]])',
11571157
11581158 # Account creation failure
1159 -'cantcreateaccounttitle' => 'Cannot create account',
1160 -'cantcreateaccount-text' => "Account creation from this IP address ('''$1''') has been blocked by [[User:$3|$3]].
 1159+'cantcreateaccounttitle' => 'Cannot create account',
 1160+'cantcreateaccount-text' => "Account creation from this IP address ('''$1''') has been blocked by [[User:$3|$3]].
11611161
11621162 The reason given by $3 is ''$2''",
11631163 'cantcreateaccount-nonblock-text' => '', # do not translate or duplicate this message to other languages

Status & tagging log