Merge branch '4.6' into 4

silverstripe · Jun 16, 2023 · acb64c1 · acb64c1
2 parents f30b21c + 9097868
commit acb64c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/client/lang/en.js b/client/lang/en.js
@@ -6,15 +6,15 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('en', {
-    "TOTPRegister.NEXT": "Next",
     "TOTPRegister.BACK": "Back",
+    "TOTPRegister.HOW_TO_USE": "How to use authenticator app.",
     "TOTPRegister.INTRO": "Verification codes are created by an app on your phone. ",
-    "TOTPRegister.OR": "Or",
     "TOTPRegister.MANUAL": "Enter manually the following code into authentication app:",
-    "TOTPRegister.HOW_TO_USE": "How to use authenticator app.",
-    "TOTPVerify.NEXT": "Next",
+    "TOTPRegister.NEXT": "Next",
+    "TOTPRegister.OR": "Or",
+    "TOTPVerify.ENTER_CODE": "Enter {length}-digit code",
     "TOTPVerify.HOW_TO_USE": "How to use authenticator app.",
-    "TOTPVerify.VERIFY": "Use verification code from your authenticator app. ",
-    "TOTPVerify.ENTER_CODE": "Enter {length}-digit code"
+    "TOTPVerify.NEXT": "Next",
+    "TOTPVerify.VERIFY": "Use verification code from your authenticator app. "
 });
 }
diff --git a/client/lang/src/en.json b/client/lang/src/en.json
@@ -1,12 +1,12 @@
 {
-    "TOTPRegister.NEXT": "Next",
     "TOTPRegister.BACK": "Back",
+    "TOTPRegister.HOW_TO_USE": "How to use authenticator app.",
     "TOTPRegister.INTRO": "Verification codes are created by an app on your phone. ",
-    "TOTPRegister.OR": "Or",
     "TOTPRegister.MANUAL": "Enter manually the following code into authentication app:",
-    "TOTPRegister.HOW_TO_USE": "How to use authenticator app.",
-    "TOTPVerify.NEXT": "Next",
+    "TOTPRegister.NEXT": "Next",
+    "TOTPRegister.OR": "Or",
+    "TOTPVerify.ENTER_CODE": "Enter {length}-digit code",
     "TOTPVerify.HOW_TO_USE": "How to use authenticator app.",
-    "TOTPVerify.VERIFY": "Use verification code from your authenticator app. ",
-    "TOTPVerify.ENTER_CODE": "Enter {length}-digit code"
+    "TOTPVerify.NEXT": "Next",
+    "TOTPVerify.VERIFY": "Use verification code from your authenticator app. "
 }