Wikinaut has uploaded a new change for review. https://gerrit.wikimedia.org/r/78033
Change subject: harmonization of spelling (usernames); added qqq text ...................................................................... harmonization of spelling (usernames); added qqq text as follow-up to https://gerrit.wikimedia.org/r/#/c/77980/ Change-Id: I8a2b95b5d1e3bacb3a3eba5992b37f0c39f65552 --- M UserMerge.i18n.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge refs/changes/33/78033/1 diff --git a/UserMerge.i18n.php b/UserMerge.i18n.php index c77d341..40ec3ed 100644 --- a/UserMerge.i18n.php +++ b/UserMerge.i18n.php @@ -16,7 +16,7 @@ 'usermerge-nonewuser' => 'Empty new username. Assuming merge to "{{GENDER:$1|$1}}".<br /> Click "{{int:usermerge-submit}}" to accept.', 'usermerge-noolduser' => 'Empty old username.', - 'usermerge-same-old-and-new-user' => 'The old and new user names need to be distinct.', + 'usermerge-same-old-and-new-user' => 'The old and new usernames need to be distinct.', 'usermerge-fieldset' => 'Usernames to merge', 'usermerge-olduser' => 'Old user (merge from):', 'usermerge-newuser' => 'New user (merge to):', @@ -59,6 +59,7 @@ 'usermerge-nonewuser' => '{{doc-important|Do not translate <code><nowiki>{{int:usermerge-submit}}</nowiki></code>.}} Used as error message. Parameters: * $1 - username "Anonymous" (hard-coded)', + 'usermerge-same-old-and-new-user' => 'Used as error message if the names of the users to be merged are equal which is not allowed, because it does not make sense.', 'usermerge-submit' => '{{Identical|Merge user}}', 'usermerge-badtoken' => 'Used as error message if the Edit Token is invalid.', 'usermerge-userdeleted' => 'Status message. Parameters: -- To view, visit https://gerrit.wikimedia.org/r/78033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a2b95b5d1e3bacb3a3eba5992b37f0c39f65552 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserMerge Gerrit-Branch: master Gerrit-Owner: Wikinaut <[email protected]> Gerrit-Reviewer: Wikinaut <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
