jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. ......................................................................
Localisation updates from https://translatewiki.net. Change-Id: Ic4a641e79ec03aeeb2179f37b22d9d1f9b50a471 --- M languages/messages/MessagesEn.php 1 file changed, 25 insertions(+), 27 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 459a1b6..7f5cc88 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -602,7 +602,7 @@ /* The sidebar for MonoBook is generated from this message, lines that do not begin with * or ** are discarded, furthermore lines that do begin with ** and -do not contain | are also discarded, but do not depend on this behaviour for +do not contain | are also discarded, but do not depend on this behavior for future releases. Also note that since each list value is wrapped in a unique XHTML id it should only appear once and include characters that are legal XHTML id names. @@ -748,7 +748,7 @@ 'noindex-category' => 'Noindexed pages', 'broken-file-category' => 'Pages with broken file links', -'linkprefix' => '/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD', # only translate this message to other languages if you have to change it +'linkprefix' => '/^((?>.*(?<![a-zA-Z\\x80-\\xff])))(.+)$/sD', # only translate this message to other languages if you have to change it 'about' => 'About', 'article' => 'Content page', @@ -1038,7 +1038,7 @@ Note that some pages may continue to be displayed as if you were still logged in, until you clear your browser cache.", 'welcomecreation' => '== Welcome, $1! == Your account has been created. -Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].', +You can change your {{SITENAME}} [[Special:Preferences|preferences]] if you wish.', 'yourname' => 'Username:', 'yourpassword' => 'Password:', 'yourpasswordagain' => 'Retype password:', @@ -1110,7 +1110,7 @@ 'passwordsent' => 'A new password has been sent to the email address registered for "$1". Please log in again after you receive it.', 'blocked-mailpassword' => 'Your IP address is blocked from editing, and so is not allowed to use the password recovery function to prevent abuse.', -'eauthentsent' => 'A confirmation email has been sent to the nominated email address. +'eauthentsent' => 'A confirmation email has been sent to the specified email address. Before any other email is sent to the account, you will have to follow the instructions in the email, to confirm that the account is actually yours.', 'throttled-mailpassword' => 'A password reset email has already been sent, within the last {{PLURAL:$1|hour|$1 hours}}. To prevent abuse, only one password reset email will be sent per {{PLURAL:$1|hour|$1 hours}}.', @@ -1123,8 +1123,8 @@ 'mailerror' => 'Error sending mail: $1', 'acct_creation_throttle_hit' => 'Visitors to this wiki using your IP address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which is the maximum allowed in this time period. As a result, visitors using this IP address cannot create any more accounts at the moment.', -'emailauthenticated' => 'Your email address was authenticated on $2 at $3.', -'emailnotauthenticated' => 'Your email address is not yet authenticated. +'emailauthenticated' => 'Your email address was confirmed on $2 at $3.', +'emailnotauthenticated' => 'Your email address is not yet confirmed. No email will be sent for any of the following features.', 'noemailprefs' => 'Specify an email address in your preferences for these features to work.', 'emailconfirmlink' => 'Confirm your email address', @@ -1270,23 +1270,23 @@ 'summary-preview' => 'Summary preview:', 'subject-preview' => 'Subject/headline preview:', 'blockedtitle' => 'User is blocked', -'blockedtext' => '\'\'\'Your username or IP address has been blocked.\'\'\' +'blockedtext' => "'''Your username or IP address has been blocked.''' The block was made by $1. -The reason given is \'\'$2\'\'. +The reason given is ''$2''. * Start of block: $8 * Expiry of block: $6 * Intended blockee: $7 You can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block. -You cannot use the "email this user" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it. +You cannot use the \"email this user\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it. Your current IP address is $3, and the block ID is #$5. -Please include all above details in any queries you make.', -'autoblockedtext' => 'Your IP address has been automatically blocked because it was used by another user, who was blocked by $1. +Please include all above details in any queries you make.", +'autoblockedtext' => "Your IP address has been automatically blocked because it was used by another user, who was blocked by $1. The reason given is: -:\'\'$2\'\' +:''$2'' * Start of block: $8 * Expiry of block: $6 @@ -1294,10 +1294,10 @@ You may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block. -Note that you may not use the "email this user" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it. +Note that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it. Your current IP address is $3, and the block ID is #$5. -Please include all above details in any queries you make.', +Please include all above details in any queries you make.", 'blockednoreason' => 'no reason given', 'whitelistedittext' => 'You have to $1 to edit pages.', 'confirmedittext' => 'You must confirm your email address before editing pages. @@ -1556,17 +1556,17 @@ 'revdelete-suppress-text' => "Suppression should '''only''' be used for the following cases: * Potentially libelous information * Inappropriate personal information -*: ''home addresses and telephone numbers, social security numbers, etc.''", +*: ''home addresses and telephone numbers, national identification numbers, etc.''", 'revdelete-legend' => 'Set visibility restrictions', -'revdelete-hide-text' => 'Hide revision text', +'revdelete-hide-text' => 'Revision text', 'revdelete-hide-image' => 'Hide file content', 'revdelete-hide-name' => 'Hide action and target', -'revdelete-hide-comment' => 'Hide edit summary', -'revdelete-hide-user' => "Hide editor's username/IP address", +'revdelete-hide-comment' => 'Edit summary', +'revdelete-hide-user' => "Editor's username/IP address", 'revdelete-hide-restricted' => 'Suppress data from administrators as well as others', 'revdelete-radio-same' => '(do not change)', -'revdelete-radio-set' => 'Yes', -'revdelete-radio-unset' => 'No', +'revdelete-radio-set' => 'Hidden', +'revdelete-radio-unset' => 'Visible', 'revdelete-suppress' => 'Suppress data from administrators as well as others', 'revdelete-unsuppress' => 'Remove restrictions on restored revisions', 'revdelete-log' => 'Reason:', @@ -2801,9 +2801,9 @@ mail: $PAGEEDITOR_EMAIL wiki: $PAGEEDITOR_WIKI -There will be no other notifications in case of further activity unless you visit this page. You could also reset the notification flags for all your watched pages on your watchlist. +There will be no other notifications in case of further activity unless you visit this page while logged in. You could also reset the notification flags for all your watched pages on your watchlist. - Your friendly {{SITENAME}} notification system +Your friendly {{SITENAME}} notification system -- To change your email notification settings, visit @@ -3335,7 +3335,7 @@ 'allmessagesdefault' => 'Default message text', 'allmessagescurrent' => 'Current message text', 'allmessagestext' => 'This is a list of system messages available in the MediaWiki namespace. -Please visit [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [//translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.', +Please visit [https://www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [//translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.', 'allmessagesnotsupportedDB' => "This page cannot be used because '''\$wgUseDatabaseMessages''' has been disabled.", 'allmessages-filter-legend' => 'Filter', 'allmessages-filter' => 'Filter by customization state:', @@ -3696,7 +3696,7 @@ 'file-info-size-pages' => '$1 × $2 pixels, file size: $3, MIME type: $4, $5 {{PLURAL:$5|page|pages}}', 'file-nohires' => 'No higher resolution available.', 'svg-long-desc' => 'SVG file, nominally $1 × $2 pixels, file size: $3', -'show-big-image' => 'Full resolution', +'show-big-image' => 'Original file', 'show-big-image-preview' => 'Size of this preview: $1.', 'show-big-image-other' => 'Other {{PLURAL:$2|resolution|resolutions}}: $1.', 'show-big-image-size' => '$1 × $2 pixels', @@ -3739,8 +3739,6 @@ /* Short names for language variants used for language conversion links. -To disable showing a particular link, set it to 'disable', e.g. -'variantname-zh-sg' => 'disable', Variants for Chinese language */ 'variantname-zh-hans' => 'hans', # only translate this message to other languages if you have to change it @@ -4252,7 +4250,7 @@ # External editor support 'edit-externally' => 'Edit this file using an external application', -'edit-externally-help' => '(See the [//www.mediawiki.org/wiki/Manual:External_editors setup instructions] for more information)', +'edit-externally-help' => '(See the [https://www.mediawiki.org/wiki/Manual:External_editors setup instructions] for more information)', # 'all' in various places, this might be different for inflected languages 'watchlistall2' => 'all', -- To view, visit https://gerrit.wikimedia.org/r/96725 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4a641e79ec03aeeb2179f37b22d9d1f9b50a471 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_19 Gerrit-Owner: Siebrand <siebr...@wikimedia.org> Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
