Fix i18n merge errors

Address comments by Raimond Spekking on
I39859cc59f1811de42b72f6167d332ea48812f97

Change-Id: Ib17f1a2f0e70e5fd286d7ea441b13f79da3743c5
This commit is contained in:
csteipp 2016-03-31 07:50:15 -07:00
parent 1dd09985d0
commit 07f99656dc

View file

@ -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",
@ -37,7 +37,6 @@
"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.",
"oathauth-step2": "Step 2: Scan the QR code",