r46871 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r46870‎ | r46871 | r46872 >
Date:18:25, 5 February 2009
Author:siebrand
Status:ok (Comments)
Tags:
Comment:
(bug 6702) Default system messages updated/improved. Processed patches 5327 and 5328 by Michael De La Rue, with comments from Simetrical, and some of my own findings.
* 'nosuchactiontext' clarified
* replace <strong> with wikiML (''')
* replace <i> with wikiML ('')
Modified paths:
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -779,7 +779,9 @@
780780
781781 # Main script and global functions
782782 'nosuchaction' => 'No such action',
783 -'nosuchactiontext' => 'The action specified by the URL is not recognized by the wiki',
 783+'nosuchactiontext' => 'The action specified by the URL is invalid.
 784+You might have mistyped the URL, or followed an incorrect link.
 785+This might also indicate a bug in {{SITENAME}}.',
784786 'nosuchspecialpage' => 'No such special page',
785787 'nospecialpagetext' => "<big>'''You have requested an invalid special page.'''</big>
786788
@@ -859,19 +861,19 @@
860862 'customcssjsprotected' => "You do not have permission to edit this page, because it contains another user's personal settings.",
861863 'ns-specialprotected' => 'Special pages cannot be edited.',
862864 'titleprotected' => 'This title has been protected from creation by [[User:$1|$1]].
863 -The reason given is "<i>$2</i>".',
 865+The reason given is "\'\'$2\'\'".',
864866
865867 # Virus scanner
866 -'virus-badscanner' => 'Bad configuration: unknown virus scanner: <i>$1</i>',
 868+'virus-badscanner' => "Bad configuration: unknown virus scanner: ''$1''",
867869 'virus-scanfailed' => 'scan failed (code $1)',
868870 'virus-unknownscanner' => 'unknown antivirus:',
869871
870872 # Login and logout pages
871873 'logouttitle' => 'User logout',
872 -'logouttext' => '<strong>You are now logged out.</strong>
 874+'logouttext' => "'''You are now logged out.'''
873875
874876 You can continue to use {{SITENAME}} anonymously, or you can [[Special:UserLogin|log in again]] as the same or as a different user.
875 -Note that some pages may continue to be displayed as if you were still logged in, until you clear your browser cache.',
 877+Note that some pages may continue to be displayed as if you were still logged in, until you clear your browser cache.",
876878 'welcomecreation' => '== Welcome, $1! ==
877879 Your account has been created.
878880 Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
@@ -1009,7 +1011,7 @@
10101012 'resetpass_forbidden' => 'Passwords cannot be changed',
10111013 'resetpass-no-info' => 'You must be logged in to access this page directly.',
10121014 'resetpass-submit-loggedin' => 'Change password',
1013 -'resetpass-wrong-oldpass' => 'Invalid temporary or current password.
 1015+'resetpass-wrong-oldpass' => 'Invalid temporary or current password.
10141016 You may have already successfully changed your password or requested a new temporary password.',
10151017 'resetpass-temp-password' => 'Temporary password:',
10161018
@@ -1120,7 +1122,7 @@
11211123 '''Konqueror: '''click ''Reload'' or press ''F5'';
11221124 '''Opera:''' clear the cache in ''Tools → Preferences'';
11231125 '''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh,'' or press ''Ctrl-F5''.",
1124 -'usercssjsyoucanpreview' => "<strong>Tip:</strong> Use the 'Show preview' button to test your new CSS/JS before saving.",
 1126+'usercssjsyoucanpreview' => "'''Tip:''' Use the 'Show preview' button to test your new CSS/JS before saving.",
11251127 'usercsspreview' => "'''Remember that you are only previewing your user CSS.'''
11261128 '''It has not yet been saved!'''",
11271129 'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript.'''
@@ -1128,22 +1130,22 @@
11291131 'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\".
11301132 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.",
11311133 'updated' => '(Updated)',
1132 -'note' => '<strong>Note:</strong>',
1133 -'previewnote' => '<strong>Remember that this is only a preview.
1134 -Your changes have not yet been saved!</strong>',
 1134+'note' => "'''Note:'''",
 1135+'previewnote' => "'''Remember that this is only a preview.
 1136+Your changes have not yet been saved!'''",
11351137 'previewconflict' => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.',
1136 -'session_fail_preview' => '<strong>Sorry! We could not process your edit due to a loss of session data.
 1138+'session_fail_preview' => "'''Sorry! We could not process your edit due to a loss of session data.
11371139 Please try again.
1138 -If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.</strong>',
1139 -'session_fail_preview_html' => "<strong>Sorry! We could not process your edit due to a loss of session data.</strong>
 1140+If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.'''",
 1141+'session_fail_preview_html' => "'''Sorry! We could not process your edit due to a loss of session data.'''
11401142
11411143 ''Because {{SITENAME}} has raw HTML enabled, the preview is hidden as a precaution against JavaScript attacks.''
11421144
1143 -<strong>If this is a legitimate edit attempt, please try again.
1144 -If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.</strong>",
1145 -'token_suffix_mismatch' => '<strong>Your edit has been rejected because your client mangled the punctuation characters in the edit token.
 1145+'''If this is a legitimate edit attempt, please try again.
 1146+If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.'''",
 1147+'token_suffix_mismatch' => "'''Your edit has been rejected because your client mangled the punctuation characters in the edit token.
11461148 The edit has been rejected to prevent corruption of the page text.
1147 -This sometimes happens when you are using a buggy web-based anonymous proxy service.</strong>',
 1149+This sometimes happens when you are using a buggy web-based anonymous proxy service.'''",
11481150 'editing' => 'Editing $1',
11491151 'editingsection' => 'Editing $1 (section)',
11501152 'editingcomment' => 'Editing $1 (new section)',
@@ -1155,32 +1157,32 @@
11561158 '''Only''' the text in the upper text area will be saved when you press \"Save page\".",
11571159 'yourtext' => 'Your text',
11581160 'storedversion' => 'Stored version',
1159 -'nonunicodebrowser' => '<strong>WARNING: Your browser is not unicode compliant.
1160 -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>',
1161 -'editingold' => '<strong>WARNING: You are editing an out-of-date revision of this page.
1162 -If you save it, any changes made since this revision will be lost.</strong>',
 1161+'nonunicodebrowser' => "'''WARNING: Your browser is not unicode compliant.
 1162+A workaround is in place to allow you to safely edit pages: non-ASCII characters will appear in the edit box as hexadecimal codes.'''",
 1163+'editingold' => "'''WARNING: You are editing an out-of-date revision of this page.
 1164+If you save it, any changes made since this revision will be lost.'''",
11631165 'yourdiff' => 'Differences',
1164 -'copyrightwarning' => 'Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details).
 1166+'copyrightwarning' => "Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details).
11651167 If you do not want your writing to be edited mercilessly and redistributed at will, then do not submit it here.<br />
11661168 You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource.
1167 -<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>',
1168 -'copyrightwarning2' => 'Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors.
 1169+'''DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!'''",
 1170+'copyrightwarning2' => "Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors.
11691171 If you do not want your writing to be edited mercilessly, then do not submit it here.<br />
11701172 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).
1171 -<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>',
1172 -'longpagewarning' => '<strong>WARNING: This page is $1 kilobytes long;
 1173+'''DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!'''",
 1174+'longpagewarning' => "'''WARNING: This page is $1 kilobytes long;
11731175 some browsers may have problems editing pages approaching or longer than 32kb.
1174 -Please consider breaking the page into smaller sections.</strong>',
1175 -'longpageerror' => '<strong>ERROR: The text you have submitted is $1 kilobytes long, which is longer than the maximum of $2 kilobytes.
1176 -It cannot be saved.</strong>',
1177 -'readonlywarning' => '<strong>WARNING: The database has been locked for maintenance, so you will not be able to save your edits right now.
1178 -You may wish to cut-n-paste the text into a text file and save it for later.</strong>
 1176+Please consider breaking the page into smaller sections.'''",
 1177+'longpageerror' => "'''ERROR: The text you have submitted is $1 kilobytes long, which is longer than the maximum of $2 kilobytes.
 1178+It cannot be saved.'''",
 1179+'readonlywarning' => "'''WARNING: The database has been locked for maintenance, so you will not be able to save your edits right now.
 1180+You may wish to cut-n-paste the text into a text file and save it for later.'''
11791181
1180 -The administrator who locked it offered this explanation: $1',
1181 -'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with administrator privileges can edit it.</strong>',
 1182+The administrator who locked it offered this explanation: $1",
 1183+'protectedpagewarning' => "'''WARNING: This page has been locked so that only users with administrator privileges can edit it.'''",
11821184 'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.",
11831185 'cascadeprotectedwarning' => "'''Warning:''' This page has been locked so that only users with administrator privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:",
1184 -'titleprotectedwarning' => '<strong>WARNING: This page has been locked so that only some users can create it.</strong>',
 1186+'titleprotectedwarning' => "'''WARNING: This page has been locked so that only some users can create it.'''",
11851187 'templatesused' => 'Templates used on this page:',
11861188 'templatesusedpreview' => 'Templates used in this preview:',
11871189 'templatesusedsection' => 'Templates used in this section:',
@@ -1827,21 +1829,21 @@
18281830 'emptyfile' => 'The file you uploaded seems to be empty.
18291831 This might be due to a typo in the file name.
18301832 Please check whether you really want to upload this file.',
1831 -'fileexists' => 'A file with this name exists already, please check <strong><tt>$1</tt></strong> if you are not sure if you want to change it.',
1832 -'filepageexists' => 'The description page for this file has already been created at <strong><tt>$1</tt></strong>, but no file with this name currently exists.
 1833+'fileexists' => "A file with this name exists already, please check '''<tt>$1</tt>''' if you are not sure if you want to change it.",
 1834+'filepageexists' => "The description page for this file has already been created at '''<tt>$1</tt>''', but no file with this name currently exists.
18331835 The summary you enter will not appear on the description page.
1834 -To make your summary appear there, you will need to manually edit it',
1835 -'fileexists-extension' => 'A file with a similar name exists:<br />
1836 -Name of the uploading file: <strong><tt>$1</tt></strong><br />
1837 -Name of the existing file: <strong><tt>$2</tt></strong><br />
1838 -Please choose a different name.',
 1836+To make your summary appear there, you will need to manually edit it",
 1837+'fileexists-extension' => "A file with a similar name exists:<br />
 1838+Name of the uploading file: '''<tt>$1</tt>'''<br />
 1839+Name of the existing file: '''<tt>$2</tt>'''<br />
 1840+Please choose a different name.",
18391841 'fileexists-thumb' => "<center>'''Existing file'''</center>",
1840 -'fileexists-thumbnail-yes' => 'The file seems to be an image of reduced size <i>(thumbnail)</i>.
1841 -Please check the file <strong><tt>$1</tt></strong>.<br />
1842 -If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.',
1843 -'file-thumbnail-no' => 'The filename begins with <strong><tt>$1</tt></strong>.
1844 -It seems to be an image of reduced size <i>(thumbnail)</i>.
1845 -If you have this image in full resolution upload this one, otherwise change the file name please.',
 1842+'fileexists-thumbnail-yes' => "The file seems to be an image of reduced size ''(thumbnail)''.
 1843+Please check the file '''<tt>$1</tt>'''.<br />
 1844+If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.",
 1845+'file-thumbnail-no' => "The filename begins with '''<tt>$1</tt>'''.
 1846+It seems to be an image of reduced size ''(thumbnail)''.
 1847+If you have this image in full resolution upload this one, otherwise change the file name please.",
18461848 'fileexists-forbidden' => 'A file with this name already exists, and cannot be overwritten.
18471849 If you still want to upload your file, please go back and use a new name. [[File:$1|thumb|center|$1]]',
18481850 'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository.
@@ -1870,8 +1872,8 @@
18711873
18721874 You should consider whether it is appropriate to continue uploading this file.
18731875 The deletion log for this file is provided here for convenience:",
1874 -'filename-bad-prefix' => 'The name of the file you are uploading begins with <strong>"$1"</strong>, which is a non-descriptive name typically assigned automatically by digital cameras.
1875 -Please choose a more descriptive name for your file.',
 1876+'filename-bad-prefix' => "The name of the file you are uploading begins with '''\"\$1\"''', which is a non-descriptive name typically assigned automatically by digital cameras.
 1877+Please choose a more descriptive name for your file.",
18761878 'filename-prefix-blacklist' => ' #<!-- leave this line exactly as it is --> <pre>
18771879 # Syntax is as follows:
18781880 # * Everything from a "#" character to the end of the line is a comment
@@ -2397,7 +2399,7 @@
23982400 someone else has edited or rolled back the page already.
23992401
24002402 The last edit to the page was by [[User:$3|$3]] ([[User talk:$3|Talk]] | [[Special:Contributions/$3|{{int:contribslink}}]]).',
2401 -'editcomment' => 'The edit summary was: "<i>$1</i>".', # only shown if there is an edit comment
 2403+'editcomment' => "The edit summary was: \"''\$1''\".", # only shown if there is an edit comment
24022404 'revertpage' => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from
24032405 'rollback-success' => 'Reverted edits by $1;
24042406 changed back to last version by $2.',
@@ -2422,13 +2424,13 @@
24232425 'protect_expiry_invalid' => 'Expiry time is invalid.',
24242426 'protect_expiry_old' => 'Expiry time is in the past.',
24252427 'protect-unchain' => 'Unlock move permissions',
2426 -'protect-text' => 'You may view and change the protection level here for the page <strong><nowiki>$1</nowiki></strong>.',
2427 -'protect-locked-blocked' => 'You cannot change protection levels while blocked.
2428 -Here are the current settings for the page <strong>$1</strong>:',
2429 -'protect-locked-dblock' => 'Protection levels cannot be changed due to an active database lock.
2430 -Here are the current settings for the page <strong>$1</strong>:',
2431 -'protect-locked-access' => 'Your account does not have permission to change page protection levels.
2432 -Here are the current settings for the page <strong>$1</strong>:',
 2428+'protect-text' => "You may view and change the protection level here for the page '''<nowiki>$1</nowiki>'''.",
 2429+'protect-locked-blocked' => "You cannot change protection levels while blocked.
 2430+Here are the current settings for the page '''$1''':",
 2431+'protect-locked-dblock' => "Protection levels cannot be changed due to an active database lock.
 2432+Here are the current settings for the page '''$1''':",
 2433+'protect-locked-access' => "Your account does not have permission to change page protection levels.
 2434+Here are the current settings for the page '''$1''':",
24332435 'protect-cascadeon' => "This page is currently protected because it is included in the following {{PLURAL:$1|page, which has|pages, which have}} cascading protection turned on.
24342436 You can change this page's protection level, but it will not affect the cascading protection.",
24352437 'protect-default' => 'Allow all users',

Follow-up revisions

RevisionCommit summaryAuthorDate
r46872Update RELEASE-NOTES for r46871.siebrand18:26, 5 February 2009
r46873Localisation updates for core messages from translatewiki.net...siebrand19:26, 5 February 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r40508(bug 6702) Improve some default system messagessimetrical22:11, 5 September 2008
r40760(bug 6702) Improve default English messages...simetrical21:08, 12 September 2008
r40829Add signup link to nosuchusertext...simetrical19:42, 14 September 2008

Comments

#Comment by Aaron Schulz (talk | contribs)   04:01, 6 February 2009

Looks OK

Status & tagging log