Siebrand has submitted this change and it was merged.
Change subject: Backport compatible message changes from master.
......................................................................
Backport compatible message changes from master.
Change-Id: I7e0b22377ba300e655536461b750941b6ce4b00d
---
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
2 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
Siebrand: Verified
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 6260f23..1d5b4be 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1143,7 +1143,7 @@
and you no longer wish to change it, you may ignore this message and
continue using your old password.',
'noemail' => 'There is no email address recorded for user
"$1".',
-'noemailcreate' => 'You need to provide a valid email address',
+'noemailcreate' => 'You need to provide a valid email address.',
'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.',
@@ -2415,8 +2415,8 @@
'nolicense' => 'None selected',
'licenses' => '-', # do not translate or duplicate this message to
other languages
'license-nopreview' => '(Preview not available)',
-'upload_source_url' => ' (a valid, publicly accessible URL)',
-'upload_source_file' => ' (a file on your computer)',
+'upload_source_url' => '(a valid, publicly accessible URL)',
+'upload_source_file' => '(a file on your computer)',
# Special:ListFiles
'listfiles-summary' => 'This special page shows all uploaded files.
@@ -3916,8 +3916,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
@@ -5002,7 +5000,7 @@
'duration-centuries' => '$1 {{PLURAL:$1|century|centuries}}',
'duration-millennia' => '$1 {{PLURAL:$1|millennium|millennia}}',
-#Rotation
+# Image rotation
'rotate-comment' => 'Image rotated by $1 {{PLURAL:$1|degree|degrees}}
clockwise',
);
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 7c16df6..d201f28 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3998,8 +3998,6 @@
'video-info' => 'Video information, used by
Language::formatTimePeriod() to format lengths in the above messages',
'badimagelist' => 'Bad image list',
'variantname-zh' => "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-gan' => 'Variants for Gan language',
'variantname-sr' => 'Variants for Serbian language',
--
To view, visit https://gerrit.wikimedia.org/r/61430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e0b22377ba300e655536461b750941b6ce4b00d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_21
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
