http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94689
Revision: 94689
Author: siebrand
Date: 2011-08-16 21:16:18 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
Merge compatible trunk messages to 1.17wmf1 so that LocalisationUpdate can
fetch translations again for some 25 messages.
Modified Paths:
--------------
branches/wmf/1.17wmf1/languages/messages/MessagesEn.php
Modified: branches/wmf/1.17wmf1/languages/messages/MessagesEn.php
===================================================================
--- branches/wmf/1.17wmf1/languages/messages/MessagesEn.php 2011-08-16
20:55:39 UTC (rev 94688)
+++ branches/wmf/1.17wmf1/languages/messages/MessagesEn.php 2011-08-16
21:16:18 UTC (rev 94689)
@@ -789,7 +789,7 @@
'vector-action-move' => 'Move',
'vector-action-protect' => 'Protect',
'vector-action-undelete' => 'Undelete',
-'vector-action-unprotect' => 'Unprotect',
+'vector-action-unprotect' => 'Change protection',
'vector-simplesearch-preference' => 'Enable enhanced search suggestions
(Vector skin only)',
'vector-view-create' => 'Create',
'vector-view-edit' => 'Edit',
@@ -825,8 +825,8 @@
'protect' => 'Protect',
'protect_change' => 'change',
'protectthispage' => 'Protect this page',
-'unprotect' => 'Unprotect',
-'unprotectthispage' => 'Unprotect this page',
+'unprotect' => 'Change protection',
+'unprotectthispage' => 'Change protection of this page',
'newpage' => 'New page',
'talkpage' => 'Discuss this page',
'talkpagelinktext' => 'Talk',
@@ -1078,7 +1078,7 @@
'nosuchuser' => 'There is no user by the name "$1".
Usernames are case sensitive.
Check your spelling, or [[Special:UserLogin/signup|create a new account]].',
-'nosuchusershort' => 'There is no user by the name
"<nowiki>$1</nowiki>".
+'nosuchusershort' => 'There is no user by the name "$1".
Check your spelling.',
'nouserspecified' => 'You have to specify a username.',
'login-userblocked' => 'This user is blocked. Login not allowed.',
@@ -1146,7 +1146,7 @@
# E-mail sending
'pear-mail-error' => '$1', # do not translate or duplicate this message
to other languages
'php-mail-error' => '$1', # do not translate or duplicate this message
to other languages
-'php-mail-error-unknown' => "Unknown error in PHP's mail() function",
+'php-mail-error-unknown' => "Unknown error in PHP's mail() function.",
# Password reset dialog
'resetpass' => 'Change password',
@@ -1279,11 +1279,12 @@
'userpage-userdoesnotexist-view' => 'User account "$1" is not registered.',
'blocked-notice-logextract' => 'This user is currently blocked.
The latest block log entry is provided below for reference:',
-'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''.",
+'clearyourcache' => "'''Note:''' After saving, you may have
to bypass your browser's cache to see the changes.
+* '''Firefox / Safari:''' hold ''Shift'' while clicking ''Reload'', or press
either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Mac)
+* '''Google Chrome:''' press ''Ctrl-Shift-R'' (''Command-Shift-R'' on a Mac)
+* '''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh'', or press
''Ctrl-F5''
+* '''Konqueror:''' click ''Reload'' or press ''F5''
+* '''Opera:''' clear the cache in ''Tools → Preferences''",
'usercssyoucanpreview' => "'''Tip:''' Use the
\"{{int:showpreview}}\" button to test your new CSS before saving.",
'userjsyoucanpreview' => "'''Tip:''' Use the
\"{{int:showpreview}}\" button to test your new JavaScript before saving.",
'usercsspreview' => "'''Remember that you are only
previewing your user CSS.'''
@@ -1450,7 +1451,7 @@
Try [[Special:Search|searching on the wiki]] for relevant new pages.',
# Revision deletion
-'rev-deleted-comment' => '(comment removed)',
+'rev-deleted-comment' => '(edit summary removed)',
'rev-deleted-user' => '(username removed)',
'rev-deleted-event' => '(log action removed)',
'rev-deleted-user-contribs' => '[username or IP address removed - edit
hidden from contributions]',
@@ -1675,16 +1676,16 @@
You can search via Google in the meantime.
Note that their indexes of {{SITENAME}} content may be out of date.',
'googlesearch' => '<form method="get"
action="http://www.google.com/search"; id="googlesearch">
- <input type="hidden" name="domains" value="{{SERVER}}" />
- <input type="hidden" name="num" value="50" />
- <input type="hidden" name="ie" value="$2" />
- <input type="hidden" name="oe" value="$2" />
+ <input type="hidden" name="domains" value="{{SERVER}}" />
+ <input type="hidden" name="num" value="50" />
+ <input type="hidden" name="ie" value="$2" />
+ <input type="hidden" name="oe" value="$2" />
- <input type="text" name="q" size="31" maxlength="255" value="$1" />
- <input type="submit" name="btnG" value="$3" />
+ <input type="text" name="q" size="31" maxlength="255" value="$1" />
+ <input type="submit" name="btnG" value="$3" />
<div>
- <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}"
checked="checked" /><label for="gwiki">{{SITENAME}}</label>
- <input type="radio" name="sitesearch" id="gWWW" value="" /><label
for="gWWW">WWW</label>
+ <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}"
checked="checked" /><label for="gwiki">{{SITENAME}}</label>
+ <input type="radio" name="sitesearch" id="gWWW" value="" /><label
for="gWWW">WWW</label>
</div>
</form>', # do not translate or duplicate this message to other languages
@@ -2116,7 +2117,7 @@
If you still want to upload your file, please go back and use a new name.
[[File:$1|thumb|center|$1]]',
'file-exists-duplicate' => 'This file is a duplicate of the following
{{PLURAL:$1|file|files}}:',
-'file-deleted-duplicate' => "A file identical to this file ([[$1]]) has
previously been deleted.
+'file-deleted-duplicate' => "A file identical to this file ([[:$1]]) has
previously been deleted.
You should check that file's deletion history before proceeding to re-upload
it.",
'uploadwarning' => 'Upload warning',
'uploadwarning-text' => 'Please modify the file description below and
try again.',
@@ -2189,8 +2190,8 @@
'uploadstash-summary' => 'This page provides access to files which are
uploaded (or in the process of uploading) but are not yet published to the
wiki. These files are not visible to anyone but the user who uploaded them. See
the documentation for the upload API.',
'uploadstash-clear' => 'Clear stashed files',
'uploadstash-nofiles' => 'You have no stashed files.',
-'uploadstash-badtoken' => 'We could not perform that action, perhaps
because your editing credentials expired. Try again.',
-'uploadstash-errclear' => 'We could not clear the files.',
+'uploadstash-badtoken' => 'Performing of that action was unsuccessful,
perhaps because your editing credentials expired. Try again.',
+'uploadstash-errclear' => 'Clearing the files was unsuccessful.',
'uploadstash-refresh' => 'Refresh the list of files',
# img_auth script messages
@@ -2734,7 +2735,7 @@
Please confirm that you intend to do this, that you understand the
consequences, and that you are doing this in accordance with
[[{{MediaWiki:Policy-url}}|the policy]].',
'actioncomplete' => 'Action complete',
'actionfailed' => 'Action failed',
-'deletedtext' => '"<nowiki>$1</nowiki>" has been deleted.
+'deletedtext' => '"$1" has been deleted.
See $2 for a record of recent deletions.',
'deletedarticle' => 'deleted "[[$1]]"',
'suppressedarticle' => 'suppressed "[[$1]]"',
@@ -2781,11 +2782,11 @@
# Protect
'protectlogpage' => 'Protection log',
-'protectlogtext' => 'Below is a list of page protections and page
unprotections.
+'protectlogtext' => 'Below is a list of changes to page
protections.
See the [[Special:ProtectedPages|protected pages list]] for the list of
currently operational page protections.',
'protectedarticle' => 'protected "[[$1]]"',
'modifiedarticleprotection' => 'changed protection level for "[[$1]]"',
-'unprotectedarticle' => 'unprotected "[[$1]]"',
+'unprotectedarticle' => 'removed protection from "[[$1]]"',
'movedarticleprotection' => 'moved protection settings from "[[$2]]" to
"[[$1]]"',
'protect-title' => 'Change protection level for "$1"',
'prot_1movedto2' => '[[$1]] moved to [[$2]]',
@@ -2796,7 +2797,7 @@
'protect_expiry_invalid' => 'Expiry time is invalid.',
'protect_expiry_old' => 'Expiry time is in the past.',
'protect-unchain-permissions' => 'Unlock further protect options',
-'protect-text' => "You may view and change the protection level
here for the page '''<nowiki>$1</nowiki>'''.",
+'protect-text' => "You may view and change the protection level
here for the page '''$1'''.",
'protect-locked-blocked' => "You cannot change protection levels while
blocked.
Here are the current settings for the page '''$1''':",
'protect-locked-dblock' => "Protection levels cannot be changed due to
an active database lock.
@@ -2852,8 +2853,7 @@
The archive may be periodically cleaned out.',
'undelete-fieldset-title' => 'Restore revisions',
'undeleteextrahelp' => "To restore the page's entire history, leave
all checkboxes deselected and click '''''{{int:undeletebtn}}'''''.
-To perform a selective restoration, check the boxes corresponding to the
revisions to be restored, and click '''''{{int:undeletebtn}}'''''.
-Clicking '''''{{int:undeletereset}}''''' will clear the comment field and all
checkboxes.",
+To perform a selective restoration, check the boxes corresponding to the
revisions to be restored, and click '''''{{int:undeletebtn}}'''''.",
'undeleterevisions' => '$1 {{PLURAL:$1|revision|revisions}}
archived',
'undeletehistory' => 'If you restore the page, all revisions will
be restored to the history.
If a new page with the same name has been created since the deletion, the
restored revisions will appear in the prior history.',
@@ -2945,7 +2945,7 @@
'nolinkshere-ns' => "No pages link to '''[[:$1]]''' in the chosen
namespace.",
'isredirect' => 'redirect page',
'istemplate' => 'transclusion',
-'isimage' => 'image link',
+'isimage' => 'file link',
'whatlinkshere-prev' => '{{PLURAL:$1|previous|previous $1}}',
'whatlinkshere-next' => '{{PLURAL:$1|next|next $1}}',
'whatlinkshere-links' => '← links',
@@ -3382,7 +3382,7 @@
You can view its source',
'tooltip-ca-history' => 'Past revisions of this page',
'tooltip-ca-protect' => 'Protect this page',
-'tooltip-ca-unprotect' => 'Unprotect this page',
+'tooltip-ca-unprotect' => 'Change protection of this page',
'tooltip-ca-delete' => 'Delete this page',
'tooltip-ca-undelete' => 'Restore the edits done to this page
before it was deleted',
'tooltip-ca-move' => 'Move this page',
@@ -3698,8 +3698,8 @@
'exif-colorspace' => 'Color space',
'exif-componentsconfiguration' => 'Meaning of each component',
'exif-compressedbitsperpixel' => 'Image compression mode',
-'exif-pixelydimension' => 'Valid image width',
-'exif-pixelxdimension' => 'Valid image height',
+'exif-pixelydimension' => 'Image width',
+'exif-pixelxdimension' => 'Image height',
'exif-makernote' => 'Manufacturer notes',
'exif-usercomment' => 'User comments',
'exif-relatedsoundfile' => 'Related audio file',
@@ -3716,10 +3716,10 @@
'exif-spectralsensitivity' => 'Spectral sensitivity',
'exif-isospeedratings' => 'ISO speed rating',
'exif-oecf' => 'Optoelectronic conversion factor',
-'exif-shutterspeedvalue' => 'Shutter speed',
-'exif-aperturevalue' => 'Aperture',
-'exif-brightnessvalue' => 'Brightness',
-'exif-exposurebiasvalue' => 'Exposure bias',
+'exif-shutterspeedvalue' => 'APEX shutter speed',
+'exif-aperturevalue' => 'APEX aperture',
+'exif-brightnessvalue' => 'APEX brightness',
+'exif-exposurebiasvalue' => 'APEX exposure bias',
'exif-maxaperturevalue' => 'Maximum land aperture',
'exif-subjectdistance' => 'Subject distance',
'exif-meteringmode' => 'Metering mode',
@@ -3839,9 +3839,9 @@
'exif-meteringmode-0' => 'Unknown',
'exif-meteringmode-1' => 'Average',
-'exif-meteringmode-2' => 'CenterWeightedAverage',
+'exif-meteringmode-2' => 'Center weighted average',
'exif-meteringmode-3' => 'Spot',
-'exif-meteringmode-4' => 'MultiSpot',
+'exif-meteringmode-4' => 'Multi-Spot',
'exif-meteringmode-5' => 'Pattern',
'exif-meteringmode-6' => 'Partial',
'exif-meteringmode-255' => 'Other',
@@ -3890,7 +3890,7 @@
'exif-sensingmethod-7' => 'Trilinear sensor',
'exif-sensingmethod-8' => 'Color sequential linear sensor',
-'exif-filesource-3' => 'DSC', # only translate this message to other languages
if you have to change it
+'exif-filesource-3' => 'Digital still camera',
'exif-scenetype-1' => 'A directly photographed image',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
