| Index: trunk/phase3/CREDITS |
| — | — | @@ -43,6 +43,7 @@ |
| 44 | 44 | * Jeremy Baron |
| 45 | 45 | * Louperivois |
| 46 | 46 | * Max Semenik |
| | 47 | +* Michael De La Rue |
| 47 | 48 | * Mike Horvath |
| 48 | 49 | * Mormegil |
| 49 | 50 | * RememberTheDot |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -891,7 +891,7 @@ |
| 892 | 892 | 'logout' => 'Log out', |
| 893 | 893 | 'userlogout' => 'Log out', |
| 894 | 894 | 'notloggedin' => 'Not logged in', |
| 895 | | -'nologin' => "Don't have a login? $1.", |
| | 895 | +'nologin' => "Don't have an account? $1.", |
| 896 | 896 | 'nologinlink' => 'Create an account', |
| 897 | 897 | 'createaccount' => 'Create account', |
| 898 | 898 | 'gotaccount' => 'Already have an account? $1.', |
| — | — | @@ -915,7 +915,7 @@ |
| 916 | 916 | 'prefs-help-realname' => 'Real name is optional. |
| 917 | 917 | If you choose to provide it, this will be used for giving you attribution for your work.', |
| 918 | 918 | 'loginerror' => 'Login error', |
| 919 | | -'prefs-help-email' => 'E-mail address is optional, but it enables others to contact you through your user or user_talk page without needing to reveal your identity.', |
| | 919 | +'prefs-help-email' => 'E-mail address is optional, but allows your password to be emailed to you if you forget it. You can also choose to let others to contact you through your user or user_talk page without needing to reveal your identity.', |
| 920 | 920 | 'prefs-help-email-required' => 'E-mail address is required.', |
| 921 | 921 | 'nocookiesnew' => 'The user account was created, but you are not logged in. |
| 922 | 922 | {{SITENAME}} uses cookies to log in users. |
| — | — | @@ -938,7 +938,7 @@ |
| 939 | 939 | Please try again.', |
| 940 | 940 | 'passwordtooshort' => 'Your password is invalid or too short. |
| 941 | 941 | It must have at least {{PLURAL:$1|1 character|$1 characters}} and be different from your username.', |
| 942 | | -'mailmypassword' => 'E-mail password', |
| | 942 | +'mailmypassword' => 'E-mail new password', |
| 943 | 943 | 'passwordremindertitle' => 'New temporary password for {{SITENAME}}', |
| 944 | 944 | 'passwordremindertext' => 'Someone (probably you, from IP address $1) |
| 945 | 945 | requested that we send you a new password for {{SITENAME}} ($4). |
| — | — | @@ -1099,7 +1099,7 @@ |
| 1100 | 1100 | Please check if you want to create/edit this page.', |
| 1101 | 1101 | 'clearyourcache' => "'''Note - After saving, you may have to bypass your browser's cache to see the changes.''' '''Mozilla / Firefox / Safari:''' hold ''Shift'' while clicking ''Reload,'' or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Macintosh); '''Konqueror: '''click ''Reload'' or press ''F5;'' '''Opera:''' clear the cache in ''Tools → Preferences;'' '''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh,'' or press ''Ctrl-F5.''", |
| 1102 | 1102 | 'usercssjsyoucanpreview' => "<strong>Tip:</strong> Use the 'Show preview' button to test your new CSS/JS before saving.", |
| 1103 | | -'usercsspreview' => "'''Remember that you are only previewing your user CSS, it has not yet been saved!'''", |
| | 1103 | +'usercsspreview' => "'''Remember that you are only previewing your user CSS. It has not yet been saved!'''", |
| 1104 | 1104 | 'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''", |
| 1105 | 1105 | 'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\". |
| 1106 | 1106 | 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.", |
| — | — | @@ -1214,8 +1214,8 @@ |
| 1215 | 1215 | 'revision-info' => 'Revision as of $1 by $2', |
| 1216 | 1216 | 'revision-info-current' => '-', # do not translate or duplicate this message to other languages |
| 1217 | 1217 | 'revision-nav' => '($1) $2 | $3 ($4) | $5 ($6)', # do not translate or duplicate this message to other languages |
| 1218 | | -'previousrevision' => '←Older revision', |
| 1219 | | -'nextrevision' => 'Newer revision→', |
| | 1218 | +'previousrevision' => '← Older revision', |
| | 1219 | +'nextrevision' => 'Newer revision →', |
| 1220 | 1220 | 'currentrevisionlink' => 'Current revision', |
| 1221 | 1221 | 'cur' => 'cur', |
| 1222 | 1222 | 'next' => 'next', |
| — | — | @@ -1731,10 +1731,10 @@ |
| 1732 | 1732 | 'file-thumbnail-no' => 'The filename begins with <strong><tt>$1</tt></strong>. |
| 1733 | 1733 | It seems to be an image of reduced size <i>(thumbnail)</i>. |
| 1734 | 1734 | If you have this image in full resolution upload this one, otherwise change the file name please.', |
| 1735 | | -'fileexists-forbidden' => 'A file with this name exists already; |
| 1736 | | -please go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]', |
| 1737 | | -'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository; |
| 1738 | | -please go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]', |
| | 1735 | +'fileexists-forbidden' => 'A file with this name exists already. |
| | 1736 | +If you still want to upload your file, please go back and use a new name. [[Image:$1|thumb|center|$1]]', |
| | 1737 | +'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository. |
| | 1738 | +If you still want to upload your file, please go back and use a new name. [[Image:$1|thumb|center|$1]]', |
| 1739 | 1739 | 'file-exists-duplicate' => 'This file is a duplicate of the following {{PLURAL:$1|file|files}}:', |
| 1740 | 1740 | 'successfulupload' => 'Successful upload', |
| 1741 | 1741 | 'uploadwarning' => 'Upload warning', |
| — | — | @@ -1846,8 +1846,8 @@ |
| 1847 | 1847 | 'shareduploadduplicate-linktext' => 'another file', |
| 1848 | 1848 | 'shareduploadconflict' => 'This file has the same name as $1 from the shared repository.', |
| 1849 | 1849 | 'shareduploadconflict-linktext' => 'another file', |
| 1850 | | -'noimage' => 'No file by this name exists, you can $1.', |
| 1851 | | -'noimage-linktext' => 'upload it', |
| | 1850 | +'noimage' => 'No file by this name exists, but you can $1.', |
| | 1851 | +'noimage-linktext' => 'upload one', |
| 1852 | 1852 | 'uploadnewversion-linktext' => 'Upload a new version of this file', |
| 1853 | 1853 | 'imagepage-searchdupe' => 'Search for duplicate files', |
| 1854 | 1854 | |
| — | — | @@ -2029,7 +2029,7 @@ |
| 2030 | 2030 | 'move' => 'Move', |
| 2031 | 2031 | 'movethispage' => 'Move this page', |
| 2032 | 2032 | 'unusedimagestext' => 'Please note that other web sites may link to a file with a direct URL, and so may still be listed here despite being in active use.', |
| 2033 | | -'unusedcategoriestext' => 'The following category pages exist although no other page or category make use of them.', |
| | 2033 | +'unusedcategoriestext' => 'The following category pages exist, although no other page or category makes use of them.', |
| 2034 | 2034 | 'notargettitle' => 'No target', |
| 2035 | 2035 | 'notargettext' => 'You have not specified a target page or user to perform this function on.', |
| 2036 | 2036 | 'nopagetitle' => 'No such target page', |
| — | — | @@ -2056,7 +2056,7 @@ |
| 2057 | 2057 | 'log' => 'Logs', |
| 2058 | 2058 | 'all-logs-page' => 'All logs', |
| 2059 | 2059 | 'alllogstext' => 'Combined display of all available logs of {{SITENAME}}. |
| 2060 | | -You can narrow down the view by selecting a log type, the user name, or the affected page.', |
| | 2060 | +You can narrow down the view by selecting a log type, the user name (case-sensitive), or the affected page (also case-sensitive).', |
| 2061 | 2061 | 'logempty' => 'No matching items in log.', |
| 2062 | 2062 | 'log-title-wildcard' => 'Search titles starting with this text', |
| 2063 | 2063 | |
| — | — | @@ -2114,7 +2114,7 @@ |
| 2115 | 2115 | 'emailuser' => 'E-mail this user', |
| 2116 | 2116 | 'emailpage' => 'E-mail user', |
| 2117 | 2117 | 'emailpagetext' => 'If this user has entered a valid e-mail address in his or her user preferences, the form below will send a single message. |
| 2118 | | -The e-mail address you entered in [[Special:Preferences|your user preferences]] will appear as the "From" address of the e-mail, so the recipient will be able to reply.', |
| | 2118 | +The e-mail address you entered in [[Special:Preferences|your user preferences]] will appear as the "From" address of the e-mail, so the recipient will be able to reply directly to you.', |
| 2119 | 2119 | 'usermailererror' => 'Mail object returned error:', |
| 2120 | 2120 | 'defemailsubject' => '{{SITENAME}} e-mail', |
| 2121 | 2121 | 'noemailtitle' => 'No e-mail address', |
| — | — | @@ -2319,7 +2319,7 @@ |
| 2320 | 2320 | 'undeletepagetext' => 'The following pages have been deleted but are still in the archive and can be restored. |
| 2321 | 2321 | The archive may be periodically cleaned out.', |
| 2322 | 2322 | 'undelete-fieldset-title' => 'Restore revisions', |
| 2323 | | -'undeleteextrahelp' => "To restore the entire page, leave all checkboxes deselected and click '''''Restore'''''. |
| | 2323 | +'undeleteextrahelp' => "To restore the page's entire history, leave all checkboxes deselected and click '''''Restore'''''. |
| 2324 | 2324 | To perform a selective restoration, check the boxes corresponding to the revisions to be restored, and click '''''Restore'''''. |
| 2325 | 2325 | Clicking '''''Reset''''' will clear the comment field and all checkboxes.", |
| 2326 | 2326 | 'undeleterevisions' => '$1 {{PLURAL:$1|revision|revisions}} archived', |
| — | — | @@ -2787,7 +2787,7 @@ |
| 2788 | 2788 | 'tooltip-diff' => 'Show which changes you made to the text.', |
| 2789 | 2789 | 'tooltip-compareselectedversions' => 'See the differences between the two selected versions of this page.', |
| 2790 | 2790 | 'tooltip-watch' => 'Add this page to your watchlist', |
| 2791 | | -'tooltip-recreate' => 'Recreate the page despite it having been deleted', |
| | 2791 | +'tooltip-recreate' => 'Recreate the page even though it has been deleted', |
| 2792 | 2792 | 'tooltip-upload' => 'Start upload', |
| 2793 | 2793 | 'tooltip-rollback' => '"Rollback" reverts edit(s) to this page of the last contributor in one click.', |
| 2794 | 2794 | 'tooltip-undo' => '"Undo" reverts this edit and opens the edit form in preview mode. Allows adding a reason in the summary.', |
| — | — | @@ -2832,7 +2832,7 @@ |
| 2833 | 2833 | # Spam protection |
| 2834 | 2834 | 'spamprotectiontitle' => 'Spam protection filter', |
| 2835 | 2835 | 'spamprotectiontext' => 'The page you wanted to save was blocked by the spam filter. |
| 2836 | | -This is probably caused by a link to an external site.', |
| | 2836 | +This is probably caused by a link to a blacklisted external site.', |
| 2837 | 2837 | 'spamprotectionmatch' => 'The following text is what triggered our spam filter: $1', |
| 2838 | 2838 | 'spambot_username' => 'MediaWiki spam cleanup', |
| 2839 | 2839 | 'spam_reverting' => 'Reverting to last version not containing links to $1', |
| — | — | @@ -2885,8 +2885,8 @@ |
| 2886 | 2886 | 'filedelete-archive-read-only' => 'The archive directory "$1" is not writable by the webserver.', |
| 2887 | 2887 | |
| 2888 | 2888 | # Browsing diffs |
| 2889 | | -'previousdiff' => '← Previous diff', |
| 2890 | | -'nextdiff' => 'Next diff →', |
| | 2889 | +'previousdiff' => '← Older edit', |
| | 2890 | +'nextdiff' => 'Newer edit →', |
| 2891 | 2891 | |
| 2892 | 2892 | # Visual comparison |
| 2893 | 2893 | 'visual-comparison' => 'Visual comparison', |
| — | — | @@ -3300,8 +3300,8 @@ |
| 3301 | 3301 | 'confirmemail_sent' => 'Confirmation e-mail sent.', |
| 3302 | 3302 | 'confirmemail_oncreate' => 'A confirmation code was sent to your e-mail address. |
| 3303 | 3303 | This code is not required to log in, but you will need to provide it before enabling any e-mail-based features in the wiki.', |
| 3304 | | -'confirmemail_sendfailed' => 'Could not send confirmation mail. |
| 3305 | | -Check address for invalid characters. |
| | 3304 | +'confirmemail_sendfailed' => '{{SITENAME}} could not send your confirmation mail. |
| | 3305 | +Please check your email address for invalid characters. |
| 3306 | 3306 | |
| 3307 | 3307 | Mailer returned: $1', |
| 3308 | 3308 | 'confirmemail_invalid' => 'Invalid confirmation code. |
| — | — | @@ -3345,7 +3345,7 @@ |
| 3346 | 3346 | 'trackbackdeleteok' => 'The trackback was successfully deleted.', |
| 3347 | 3347 | |
| 3348 | 3348 | # Delete conflict |
| 3349 | | -'deletedwhileediting' => 'Warning: This page has been deleted after you started editing!', |
| | 3349 | +'deletedwhileediting' => "'''Warning''': This page was deleted after you started editing!", |
| 3350 | 3350 | 'confirmrecreate' => "User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason: |
| 3351 | 3351 | : ''$2'' |
| 3352 | 3352 | Please confirm that you really want to recreate this page.", |