CSteipp has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280671
Change subject: Fix i18n merge errors
......................................................................
Fix i18n merge errors
Address comments by Raimond Spekking on
I39859cc59f1811de42b72f6167d332ea48812f97
Change-Id: Ib17f1a2f0e70e5fd286d7ea441b13f79da3743c5
---
M i18n/en.json
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth
refs/changes/71/280671/1
diff --git a/i18n/en.json b/i18n/en.json
index da3e6cf..ea88e39 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,7 +17,7 @@
"oathauth-verify": "Verify two-factor token",
"openstackmanager-scratchtokens": "The following list is a list of
one-time use scratch tokens. These tokens can only be used once, and are for
emergency use. Please write these down and keep them in a secure location. If
you lose your phone, these tokens are the only way to rescue your account.
These tokens will never be shown again.",
"oathauth-reset": "Reset two-factor credentials",
- "oathauth-donotdeleteoldsecret": "Please do not delete your old
credentials until you have successfully validated your new credentials.",
+ "oathauth-donotdeleteoldsecret": "Please do not delete your old
credentials until you have validated your new credentials.",
"oathauth-token": "Token",
"oathauth-currenttoken": "Current token",
"oathauth-newtoken": "New token",
@@ -36,7 +36,6 @@
"oathauth-notloggedin": "Login required",
"oathauth-mustbeloggedin": "You must be logged in to perform this
action.",
"oathauth-prefs-label": "Two-factor authentication:",
- "oathauth-abortlogin": "The two-factor authentication token provided
was invalid.",
"oathauth-abortlogin": "The two-factor authentication token provided
was invalid.",
"oathauth-step1": "Step 1: Download the app",
"oathauth-step1-test": "Download a mobile app for two-factor
authentication (such as Google Authenticator) on to your phone.",
--
To view, visit https://gerrit.wikimedia.org/r/280671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib17f1a2f0e70e5fd286d7ea441b13f79da3743c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: CSteipp <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
