| Index: branches/REL1_17/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -648,7 +648,7 @@ |
| 649 | 649 | 'tog-enotifminoredits' => 'E-mail me also for minor edits of pages', |
| 650 | 650 | 'tog-enotifrevealaddr' => 'Reveal my e-mail address in notification e-mails', |
| 651 | 651 | 'tog-shownumberswatching' => 'Show the number of watching users', |
| 652 | | -'tog-oldsig' => 'Preview of existing signature:', |
| | 652 | +'tog-oldsig' => 'Existing signature:', |
| 653 | 653 | 'tog-fancysig' => 'Treat signature as wikitext (without an automatic link)', |
| 654 | 654 | 'tog-externaleditor' => 'Use external editor by default (for experts only, needs special settings on your computer. [http://www.mediawiki.org/wiki/Manual:External_editors More information.])', |
| 655 | 655 | 'tog-externaldiff' => 'Use external diff by default (for experts only, needs special settings on your computer. [http://www.mediawiki.org/wiki/Manual:External_editors More information.])', |
| — | — | @@ -1279,11 +1279,12 @@ |
| 1280 | 1280 | 'userpage-userdoesnotexist-view' => 'User account "$1" is not registered.', |
| 1281 | 1281 | 'blocked-notice-logextract' => 'This user is currently blocked. |
| 1282 | 1282 | The latest block log entry is provided below for reference:', |
| 1283 | | -'clearyourcache' => "'''Note: After saving, you may have to bypass your browser's cache to see the changes.''' |
| 1284 | | -'''Mozilla / Firefox / Safari:''' hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Macintosh); |
| 1285 | | -'''Konqueror: '''click ''Reload'' or press ''F5''; |
| 1286 | | -'''Opera:''' clear the cache in ''Tools → Preferences''; |
| 1287 | | -'''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh,'' or press ''Ctrl-F5''.", |
| | 1283 | +'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. |
| | 1284 | +* '''Firefox / Safari:''' hold ''Shift'' while clicking ''Reload'', or press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Mac) |
| | 1285 | +* '''Google Chrome:''' press ''Ctrl-Shift-R'' (''Command-Shift-R'' on a Mac) |
| | 1286 | +* '''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5'' |
| | 1287 | +* '''Konqueror:''' click ''Reload'' or press ''F5'' |
| | 1288 | +* '''Opera:''' clear the cache in ''Tools → Preferences''", |
| 1288 | 1289 | 'usercssyoucanpreview' => "'''Tip:''' Use the \"{{int:showpreview}}\" button to test your new CSS before saving.", |
| 1289 | 1290 | 'userjsyoucanpreview' => "'''Tip:''' Use the \"{{int:showpreview}}\" button to test your new JavaScript before saving.", |
| 1290 | 1291 | 'usercsspreview' => "'''Remember that you are only previewing your user CSS.''' |
| — | — | @@ -1784,7 +1785,7 @@ |
| 1785 | 1786 | 'prefs-registration-date-time' => '$1', # only translate this message to other languages if you have to change it |
| 1786 | 1787 | 'yourrealname' => 'Real name:', |
| 1787 | 1788 | 'yourlanguage' => 'Language:', |
| 1788 | | -'yourvariant' => 'Variant:', # only translate this message to other languages if you have to change it |
| | 1789 | +'yourvariant' => 'Content language variant:', |
| 1789 | 1790 | 'yournick' => 'New signature:', |
| 1790 | 1791 | 'prefs-help-signature' => 'Comments on talk pages should be signed with "<nowiki>~~~~</nowiki>" which will be converted into your signature and a timestamp.', |
| 1791 | 1792 | 'badsig' => 'Invalid raw signature. |
| — | — | @@ -1792,7 +1793,7 @@ |
| 1793 | 1794 | 'badsiglength' => 'Your signature is too long. |
| 1794 | 1795 | It must not be more than $1 {{PLURAL:$1|character|characters}} long.', |
| 1795 | 1796 | 'yourgender' => 'Gender:', |
| 1796 | | -'gender-unknown' => 'Unspecified', |
| | 1797 | +'gender-unknown' => 'Undisclosed', |
| 1797 | 1798 | 'gender-male' => 'Male', |
| 1798 | 1799 | 'gender-female' => 'Female', |
| 1799 | 1800 | 'prefs-help-gender' => 'Optional: used for gender-correct addressing by the software. |
| — | — | @@ -1841,7 +1842,7 @@ |
| 1842 | 1843 | 'userrights-no-interwiki' => 'You do not have permission to edit user rights on other wikis.', |
| 1843 | 1844 | 'userrights-nodatabase' => 'Database $1 does not exist or is not local.', |
| 1844 | 1845 | 'userrights-nologin' => 'You must [[Special:UserLogin|log in]] with an administrator account to assign user rights.', |
| 1845 | | -'userrights-notallowed' => 'Your account does not have permission to assign user rights.', |
| | 1846 | +'userrights-notallowed' => 'Your account does not have permission to add or remove user rights.', |
| 1846 | 1847 | 'userrights-changeable-col' => 'Groups you can change', |
| 1847 | 1848 | 'userrights-unchangeable-col' => 'Groups you cannot change', |
| 1848 | 1849 | 'userrights-irreversible-marker' => '$1*', # only translate this message to other languages if you have to change it |
| — | — | @@ -2969,7 +2970,7 @@ |
| 2970 | 2971 | 'ipbenableautoblock' => 'Automatically block the last IP address used by this user, and any subsequent IP addresses they try to edit from', |
| 2971 | 2972 | 'ipbsubmit' => 'Block this user', |
| 2972 | 2973 | 'ipbother' => 'Other time:', |
| 2973 | | -'ipboptions' => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite', |
| | 2974 | +'ipboptions' => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,indefinite:infinite', |
| 2974 | 2975 | 'ipbotheroption' => 'other', |
| 2975 | 2976 | 'ipbotherreason' => 'Other/additional reason:', |
| 2976 | 2977 | 'ipbhidename' => 'Hide username from edits and lists', |
| — | — | @@ -3043,8 +3044,7 @@ |
| 3044 | 3045 | $1 is already blocked. |
| 3045 | 3046 | Do you want to change the settings?', |
| 3046 | 3047 | 'ipb-otherblocks-header' => 'Other {{PLURAL:$1|block|blocks}}', |
| 3047 | | -'ipb_cant_unblock' => 'Error: Block ID $1 not found. |
| 3048 | | -It may have been unblocked already.', |
| | 3048 | +'ipb_cant_unblock' => 'Error: Block ID $1 not found. It may have been unblocked already.', |
| 3049 | 3049 | 'ipb_blocked_as_range' => 'Error: The IP address $1 is not blocked directly and cannot be unblocked. |
| 3050 | 3050 | It is, however, blocked as part of the range $2, which can be unblocked.', |
| 3051 | 3051 | 'ip_range_invalid' => 'Invalid IP range.', |
| — | — | @@ -3792,9 +3792,9 @@ |
| 3793 | 3793 | 'exif-orientation-3' => 'Rotated 180°', |
| 3794 | 3794 | 'exif-orientation-4' => 'Flipped vertically', |
| 3795 | 3795 | 'exif-orientation-5' => 'Rotated 90° CCW and flipped vertically', |
| 3796 | | -'exif-orientation-6' => 'Rotated 90° CW', |
| | 3796 | +'exif-orientation-6' => 'Rotated 90° CCW', |
| 3797 | 3797 | 'exif-orientation-7' => 'Rotated 90° CW and flipped vertically', |
| 3798 | | -'exif-orientation-8' => 'Rotated 90° CCW', |
| | 3798 | +'exif-orientation-8' => 'Rotated 90° CW', |
| 3799 | 3799 | |
| 3800 | 3800 | 'exif-planarconfiguration-1' => 'chunky format', |
| 3801 | 3801 | 'exif-planarconfiguration-2' => 'planar format', |