Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -799,7 +799,7 @@ |
800 | 800 | "$1" |
801 | 801 | from within function "$2". |
802 | 802 | MySQL returned error "$3: $4"', |
803 | | -'noconnect' => 'Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server.<br /> |
| 803 | +'noconnect' => 'The wiki is experiencing some technical difficulties, and cannot contact the database server.<br /> |
804 | 804 | $1', |
805 | 805 | 'nodb' => 'Could not select database $1', |
806 | 806 | 'cachederror' => 'The following is a cached copy of the requested page, and may not be up to date.', |
— | — | @@ -834,7 +834,7 @@ |
835 | 835 | 'badtitle' => 'Bad title', |
836 | 836 | 'badtitletext' => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title. |
837 | 837 | It may contain one or more characters which cannot be used in titles.', |
838 | | -'perfdisabled' => 'Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.', |
| 838 | +'perfdisabled' => 'This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.', |
839 | 839 | 'perfcached' => 'The following data is cached and may not be up to date.', |
840 | 840 | 'perfcachedts' => 'The following data is cached, and was last updated $1.', |
841 | 841 | 'querypage-no-updates' => 'Updates for this page are currently disabled. |
— | — | @@ -899,7 +899,7 @@ |
900 | 900 | 'createaccountmail' => 'by e-mail', |
901 | 901 | 'badretype' => 'The passwords you entered do not match.', |
902 | 902 | 'userexists' => 'Username entered already in use. |
903 | | -Please choose a different name.', |
| 903 | +Choose a different name.', |
904 | 904 | 'youremail' => 'E-mail:', |
905 | 905 | 'username' => 'Username:', |
906 | 906 | 'uid' => 'User ID:', |
— | — | @@ -908,14 +908,16 @@ |
909 | 909 | 'yourlanguage' => 'Language:', |
910 | 910 | 'yourvariant' => 'Variant:', # only translate this message to other languages if you have to change it |
911 | 911 | 'yournick' => 'Signature:', |
912 | | -'badsig' => 'Invalid raw signature; check HTML tags.', |
| 912 | +'badsig' => 'Invalid raw signature. |
| 913 | +Check HTML tags.', |
913 | 914 | 'badsiglength' => 'The signature is too long. |
914 | 915 | It must be under $1 {{PLURAL:$1|character|characters}}.', |
915 | 916 | 'email' => 'E-mail', |
916 | 917 | 'prefs-help-realname' => 'Real name is optional. |
917 | 918 | If you choose to provide it, this will be used for giving you attribution for your work.', |
918 | 919 | 'loginerror' => 'Login error', |
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 | +'prefs-help-email' => 'E-mail address is optional, but allows your password to be emailed to you if you forget it. |
| 921 | +You can also choose to let others to contact you through your user or user_talk page without needing to reveal your identity.', |
920 | 922 | 'prefs-help-email-required' => 'E-mail address is required.', |
921 | 923 | 'nocookiesnew' => 'The user account was created, but you are not logged in. |
922 | 924 | {{SITENAME}} uses cookies to log in users. |
— | — | @@ -958,7 +960,7 @@ |
959 | 961 | 'loginend' => '', # do not translate or duplicate this message to other languages |
960 | 962 | 'signupend' => '{{int:loginend}}', # do not translate or duplicate this message to other languages |
961 | 963 | 'mailerror' => 'Error sending mail: $1', |
962 | | -'acct_creation_throttle_hit' => 'Sorry, you have already created $1 accounts. |
| 964 | +'acct_creation_throttle_hit' => 'You have already created $1 accounts. |
963 | 965 | You cannot make any more.', |
964 | 966 | 'emailauthenticated' => 'Your e-mail address was authenticated on $1.', |
965 | 967 | 'emailnotauthenticated' => 'Your e-mail address is not yet authenticated. |
— | — | @@ -966,7 +968,7 @@ |
967 | 969 | 'noemailprefs' => 'Specify an e-mail address for these features to work.', |
968 | 970 | 'emailconfirmlink' => 'Confirm your e-mail address', |
969 | 971 | 'invalidemailaddress' => 'The e-mail address cannot be accepted as it appears to have an invalid format. |
970 | | -Please enter a well-formatted address or empty that field.', |
| 972 | +Enter a well-formatted address or empty that field.', |
971 | 973 | 'accountcreated' => 'Account created', |
972 | 974 | 'accountcreatedtext' => 'The user account for $1 has been created.', |
973 | 975 | 'createaccount-title' => 'Account creation for {{SITENAME}}', |
— | — | @@ -974,7 +976,8 @@ |
975 | 977 | You should log in and change your password now. |
976 | 978 | |
977 | 979 | You may ignore this message, if this account was created in error.', |
978 | | -'login-throttled' => "You have made too many recent attempts on this account's password. Please wait before trying again.", |
| 980 | +'login-throttled' => "You have made too many recent attempts on this account's password. |
| 981 | +Please wait before trying again.", |
979 | 982 | 'loginlanguagelabel' => 'Language: $1', |
980 | 983 | 'loginlanguagelinks' => '* Deutsch|de |
981 | 984 | * English|en |
— | — | @@ -1097,9 +1100,10 @@ |
1098 | 1101 | 'noarticletextanon' => '{{int:noarticletext}}', # do not translate or duplicate this message to other languages |
1099 | 1102 | 'userpage-userdoesnotexist' => 'User account "$1" is not registered. |
1100 | 1103 | Please check if you want to create/edit this page.', |
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.''", |
| 1104 | +'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 | 1105 | '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!'''", |
| 1106 | +'usercsspreview' => "'''Remember that you are only previewing your user CSS. |
| 1107 | +It has not yet been saved!'''", |
1104 | 1108 | 'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''", |
1105 | 1109 | 'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\". |
1106 | 1110 | 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.", |
— | — | @@ -1108,10 +1112,10 @@ |
1109 | 1113 | 'previewnote' => '<strong>This is only a preview; |
1110 | 1114 | changes have not yet been saved!</strong>', |
1111 | 1115 | 'previewconflict' => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.', |
1112 | | -'session_fail_preview' => '<strong>Sorry! We could not process your edit due to a loss of session data. |
| 1116 | +'session_fail_preview' => '<strong>We could not process your edit due to a loss of session data. |
1113 | 1117 | Please try again. |
1114 | 1118 | If it still does not work, try [[Special:UserLogout|logging out]] and logging back in.</strong>', |
1115 | | -'session_fail_preview_html' => "<strong>Sorry! We could not process your edit due to a loss of session data.</strong> |
| 1119 | +'session_fail_preview_html' => "<strong>We could not process your edit due to a loss of session data.</strong> |
1116 | 1120 | |
1117 | 1121 | ''Because {{SITENAME}} has raw HTML enabled, the preview is hidden as a precaution against JavaScript attacks.'' |
1118 | 1122 | |
— | — | @@ -2790,7 +2794,8 @@ |
2791 | 2795 | 'tooltip-recreate' => 'Recreate the page even though it has been deleted', |
2792 | 2796 | 'tooltip-upload' => 'Start upload', |
2793 | 2797 | 'tooltip-rollback' => '"Rollback" reverts edit(s) to this page of the last contributor in one click.', |
2794 | | -'tooltip-undo' => '"Undo" reverts this edit and opens the edit form in preview mode. Allows adding a reason in the summary.', |
| 2798 | +'tooltip-undo' => '"Undo" reverts this edit and opens the edit form in preview mode. |
| 2799 | +Allows adding a reason in the summary.', |
2795 | 2800 | |
2796 | 2801 | # Stylesheets |
2797 | 2802 | 'common.css' => '/* CSS placed here will be applied to all skins */', # only translate this message to other languages if you have to change it |
— | — | @@ -3331,8 +3336,8 @@ |
3332 | 3337 | |
3333 | 3338 | # Scary transclusion |
3334 | 3339 | 'scarytranscludedisabled' => '[Interwiki transcluding is disabled]', |
3335 | | -'scarytranscludefailed' => '[Template fetch failed for $1; sorry]', |
3336 | | -'scarytranscludetoolong' => '[URL is too long; sorry]', |
| 3340 | +'scarytranscludefailed' => '[Template fetch failed for $1]', |
| 3341 | +'scarytranscludetoolong' => '[URL is too long]', |
3337 | 3342 | |
3338 | 3343 | # Trackbacks |
3339 | 3344 | 'trackbackbox' => '<div id="mw_trackbacks">Trackbacks for this page:<br /> |