jenkins-bot has submitted this change and it was merged.
Change subject: Update messages.inc and rebuild MessagesEn.php
......................................................................
Update messages.inc and rebuild MessagesEn.php
Change-Id: Id700531dec4289840afec36848a8206320180705
---
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
2 files changed, 17 insertions(+), 16 deletions(-)
Approvals:
Matmarex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 3bf18ca..b525465 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1137,7 +1137,7 @@
'helplogin-url' => 'Help:Logging in',
'userlogin-helplink' => '[[{{MediaWiki:helplogin-url}}|Help with
logging in]]',
'createacct-join' => 'Enter your information below.',
-'createacct-another-join' => 'Enter the new account\'s information
below.',
+'createacct-another-join' => "Enter the new account's information
below.",
'createacct-emailrequired' => 'Email address',
'createacct-emailoptional' => 'Email address (optional)',
'createacct-email-ph' => 'Enter your email address',
@@ -1606,11 +1606,11 @@
'converter-manual-rule-error' => 'Error detected in manual
language conversion rule',
# "Undo" feature
-'undo-success' => 'The edit can be undone.
+'undo-success' => 'The edit can be undone.
Please check the comparison below to verify that this is what you want to do,
and then save the changes below to finish undoing the edit.',
-'undo-failure' => 'The edit could not be undone due to conflicting
intermediate edits.',
-'undo-norev' => 'The edit could not be undone because it does not exist or
was deleted.',
-'undo-summary' => 'Undo revision $1 by [[Special:Contributions/$2|$2]] ([[User
talk:$2|talk]])',
+'undo-failure' => 'The edit could not be undone due to
conflicting intermediate edits.',
+'undo-norev' => 'The edit could not be undone because it
does not exist or was deleted.',
+'undo-summary' => 'Undo revision $1 by
[[Special:Contributions/$2|$2]] ([[User talk:$2|talk]])',
'undo-summary-username-hidden' => 'Undo revision $1 by a hidden user',
# Account creation failure
@@ -1934,9 +1934,9 @@
'recentchangesdays-max' => 'Maximum $1 {{PLURAL:$1|day|days}}',
'recentchangescount' => 'Number of edits to show by default:',
'prefs-help-recentchangescount' => 'This includes recent changes, page
histories, and logs.',
-'prefs-help-watchlist-token2' => "This is the secret key to the web feed of
your watchlist.
+'prefs-help-watchlist-token2' => 'This is the secret key to the web feed of
your watchlist.
Anyone who knows it will be able to read your watchlist, so do not share it.
-[[Special:ResetTokens|Click here if you need to reset it]].",
+[[Special:ResetTokens|Click here if you need to reset it]].',
'savedprefs' => 'Your preferences have been saved.',
'timezonelegend' => 'Time zone:',
'localtime' => 'Local time:',
@@ -2184,8 +2184,8 @@
'action-userrights-interwiki' => 'edit user rights of users on other wikis',
'action-siteadmin' => 'lock or unlock the database',
'action-sendemail' => 'send emails',
-'action-viewmywatchlist' => 'view your watchlist',
'action-editmywatchlist' => 'edit your watchlist',
+'action-viewmywatchlist' => 'view your watchlist',
'action-viewmyprivateinfo' => 'view your private information',
'action-editmyprivateinfo' => 'edit your private information',
@@ -2232,14 +2232,14 @@
'rc-old-title' => 'originally created as "$1"',
# Recent changes linked
-'recentchangeslinked' => 'Related changes',
-'recentchangeslinked-feed' => 'Related changes',
-'recentchangeslinked-toolbox' => 'Related changes',
-'recentchangeslinked-title' => 'Changes related to "$1"',
-'recentchangeslinked-summary' => "This is a list of changes made recently to
pages linked from a specified page (or to members of a specified category).
+'recentchangeslinked' => 'Related changes',
+'recentchangeslinked-feed' => 'Related changes',
+'recentchangeslinked-toolbox' => 'Related changes',
+'recentchangeslinked-title' => 'Changes related to "$1"',
+'recentchangeslinked-summary' => "This is a list of changes made recently to
pages linked from a specified page (or to members of a specified category).
Pages on [[Special:Watchlist|your watchlist]] are '''bold'''.",
-'recentchangeslinked-page' => 'Page name:',
-'recentchangeslinked-to' => 'Show changes to pages linked to the given
page instead',
+'recentchangeslinked-page' => 'Page name:',
+'recentchangeslinked-to' => 'Show changes to pages linked to the given
page instead',
# Upload
'upload' => 'Upload file',
@@ -2745,8 +2745,8 @@
'mostrevisions-summary' => '', # do not translate or duplicate this
message to other languages
'prefixindex' => 'All pages with prefix',
'prefixindex-namespace' => 'All pages with prefix ($1 namespace)',
-'prefixindex-strip' => 'Strip prefix in list',
'prefixindex-summary' => '', # do not translate or duplicate this
message to other languages
+'prefixindex-strip' => 'Strip prefix in list',
'shortpages' => 'Short pages',
'shortpages-summary' => '', # do not translate or duplicate this
message to other languages
'longpages' => 'Long pages',
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 7adcdeb..be96d6e 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3980,6 +3980,7 @@
'resetpass' => 'Change password dialog',
'passwordreset' => 'Special:PasswordReset',
'changeemail' => 'Special:ChangeEmail',
+ 'resettokens' => 'Special:ResetTokens',
'toolbar' => 'Edit page toolbar',
'edit' => 'Edit pages',
'parserwarnings' => 'Parser/template warnings',
--
To view, visit https://gerrit.wikimedia.org/r/75841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id700531dec4289840afec36848a8206320180705
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex <[email protected]>
Gerrit-Reviewer: IAlex <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
