jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381298 )
Change subject: Standardize with other MediaWiki log messages
......................................................................
Standardize with other MediaWiki log messages
Also remove {{GENDER:}} since the account no longer exists, trying to
look up the gender won't work.
Bug: T177013
Change-Id: I99208c1cf3ba724db53430efbb7639d84fd0fb4d
---
M i18n/en.json
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Matěj Suchánek: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 87affa0..f764d74 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,17 +15,17 @@
"usermerge-deleteolduser": "Delete old user",
"usermerge-submit": "Merge user",
"usermerge-badtoken": "Invalid edit token.",
- "usermerge-userdeleted": "{{GENDER:$1|$1}} ($2) has been deleted.",
- "usermerge-userdeleted-log": "Deleted user: $2 ($3)",
- "usermerge-success": "Merge from {{GENDER:$1|$1}} ($2) to
{{GENDER:$3|$3}} ($4) is complete.",
- "usermerge-success-log": "User {{GENDER:$2|$2}} ($3) merged to
{{GENDER:$4|$4}} ($5)",
+ "usermerge-userdeleted": "$1 ($2) has been deleted.",
+ "usermerge-userdeleted-log": "deleted the user account \"$2\" ($3)",
+ "usermerge-success": "Merge from $1 ($2) to $3 ($4) is complete.",
+ "usermerge-success-log": "merged the account \"$2\" ($3) into
\"[[User:$4|$4]]\" ($5)",
"usermerge-logpage": "User merge log",
"usermerge-logpagetext": "This is a log of user merge actions.",
"usermerge-noselfdelete": "You cannot delete or merge from
{{GENDER:$1|yourself}}!",
- "usermerge-protectedgroup": "Unable to merge from {{GENDER:$1|user}}:
User is in a protected group.",
+ "usermerge-protectedgroup": "Unable to merge from {{GENDER:$1|user}}:
user is in a protected group.",
"right-usermerge": "Merge users",
"action-usermerge": "merge users",
- "usermerge-autopagedelete": "Automatically deleted when merging users",
+ "usermerge-autopagedelete": "Automatically deleted page while merging
users",
"usermerge-page-unmoved": "The page $1 could not be moved to $2.",
- "usermerge-move-log": "Automatically moved page while merging the user
\"[[User:$1|$1]]\" to \"[[User:$2|{{GENDER:$2|$2}}]]\""
+ "usermerge-move-log": "Automatically moved page while merging the
account \"$1\" to \"[[User:$2|$2]]\""
}
--
To view, visit https://gerrit.wikimedia.org/r/381298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99208c1cf3ba724db53430efbb7639d84fd0fb4d
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio <maure...@tools.wmflabs.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: MarcoAurelio <maure...@tools.wmflabs.org>
Gerrit-Reviewer: Matěj Suchánek <matejsuchane...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
