jenkins-bot has submitted this change and it was merged. Change subject: Terminology unified ......................................................................
Terminology unified Changed 'merge' to 'link' in strings to get a more consistent terminology. The string lables have been left as is. Affected strings: * googlelogin-form-merge-title * googlelogin-form-merge Also replaced '->' with 'from' to make i18n easier in * googlelogin-form-unlink Discussion: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Googlelogin-form-merge-title/en Change-Id: Ia5d9eccf5d1d94fffaf11d261a3eed352f6bb22b --- M i18n/en.json 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Siebrand: Looks good to me, but someone else must approve Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 0816910..80b4f47 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -18,12 +18,12 @@ "googlelogin-form-chooseown": "Choose own", "googlelogin-form-chooseown-error": "Please let us know your desired username or take one of our suggestions.", "googlelogin-form-choosename-help": "\"Own name\" is only observed, if you choose \"{{int:googlelogin-form-chooseown}}\".", - "googlelogin-form-merge-title": "Merge user account", + "googlelogin-form-merge-title": "Link user account", "googlelogin-form-logout": "Login with another Google account", "googlelogin-form-backlink": "Back to Google login", "googlelogin-form-create": "Create account", - "googlelogin-form-merge": "Merge Google to wiki account", - "googlelogin-form-unlink": "Unlink Google -> wiki account", + "googlelogin-form-merge": "Link Google to wiki account", + "googlelogin-form-unlink": "Unlink Google from wiki account", "googlelogin-email": "Email address", "googlelogin-googleuser": "Google user", "googlelogin-information-title": "Account information", -- To view, visit https://gerrit.wikimedia.org/r/147394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5d9eccf5d1d94fffaf11d261a3eed352f6bb22b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GoogleLogin Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.pro...@gmail.com> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de> 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
