Use 'Multi-Factor Authentication' in English phrasing

diff --git a/com.woltlab.wcf/page.xml b/com.woltlab.wcf/page.xml
index 46d1750fb617c3412b27fa86087a2c0b6cfcca38..e6b3932403ab1e58beb83d9b180b593bb816d462 100644 (file)
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@ -832,7 +832,7 @@ E-Mail: [E-Mail-Adresse der verantwortlichen Stelle]</p><p><br></p><p>Verantwort
                        <pageType>system</pageType>
                        <controller>wcf\form\MultifactorManageForm</controller>
                        <name language="de">Mehrfaktor-Authentifizierung einrichten</name>
-                       <name language="en">Manage Multifactor Authentication</name>
+                       <name language="en">Manage Multi-Factor Authentication</name>
                        <hasFixedParent>1</hasFixedParent>
                        <parent>com.woltlab.wcf.AccountSecurity</parent>
                        <excludeFromLandingPage>1</excludeFromLandingPage>
@@ -841,7 +841,7 @@ E-Mail: [E-Mail-Adresse der verantwortlichen Stelle]</p><p><br></p><p>Verantwort
                <page identifier="com.woltlab.wcf.MultifactorAuthentication">
                        <pageType>system</pageType>
                        <controller>wcf\form\MultifactorAuthenticationForm</controller>
-                       <name language="en">Multifactor Authentication</name>
+                       <name language="en">Multi-Factor Authentication</name>
                        <name language="de">Mehrfaktor-Authentifizierung</name>
                        <hasFixedParent>1</hasFixedParent>
                        <parent>com.woltlab.wcf.Login</parent>

diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php
index 873c648d44eb4762c64c1a35aa4270e896fb3afd..5fab3dfc3336acad5e644cb996ed249a10b03908 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/User.class.php
+++ b/wcfsetup/install/files/lib/data/user/User.class.php
@@ -693,7 +693,7 @@ final class User extends DatabaseObject implements IPopoverObject, IRouteControl
        }
        
        /**
-        * Returns the multi factor methods the user set up.
+        * Returns the multi-factor methods the user set up.
         * 
         * @return      ObjectType[]
         * @since       5.4

diff --git a/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php b/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php
index 3af706d9dc8d6a97332bed4c4ea51619863cdd7e..3febf050c6935d9959127ce98087e92084b0a911 100644 (file)
--- a/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php
+++ b/wcfsetup/install/files/lib/form/MultifactorAuthenticationForm.class.php
@@ -10,7 +10,7 @@ use wcf\system\user\multifactor\IMultifactorMethod;
 use wcf\system\WCF;
 
 /**
- * Represents the multifactor authentication form.
+ * Represents the multi-factor authentication form.
  *
  * @author     Tim Duesterhus
  * @copyright  2001-2020 WoltLab GmbH

diff --git a/wcfsetup/install/files/lib/form/MultifactorManageForm.class.php b/wcfsetup/install/files/lib/form/MultifactorManageForm.class.php
index 471d5351fa230e786b8b1f936b3e899da6e7c768..4880c043c278c025d807c6c7b38e9be9ac9eb143 100644 (file)
--- a/wcfsetup/install/files/lib/form/MultifactorManageForm.class.php
+++ b/wcfsetup/install/files/lib/form/MultifactorManageForm.class.php
@@ -10,7 +10,7 @@ use wcf\system\user\multifactor\IMultifactorMethod;
 use wcf\system\WCF;
 
 /**
- * Represents the multifactor setup form.
+ * Represents the multi-factor setup form.
  *
  * @author     Tim Duesterhus
  * @copyright  2001-2020 WoltLab GmbH

diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index e7b3392255fc5156cc4f4d13344244198e2c9f2d..14a1a526a33fb0031b01af4ff2311e8160f6bb2a 100644 (file)
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -692,7 +692,7 @@ final class SessionHandler extends SingletonFactory {
        }
        
        /**
-        * If multifactor authentication is enabled for the given user then
+        * If multi-factor authentication is enabled for the given user then
         * - the userID will be stored in the session variables, and
         * - `true` is returned.
         * Otherwise,

diff --git a/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php b/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php
index 6a456d585772a5c26faa44fa45780120b1e1fb4c..ba52493e6afdb8b2436a2fabd0afadb84e665340 100644 (file)
--- a/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php
+++ b/wcfsetup/install/files/lib/system/user/multifactor/IMultifactorMethod.class.php
@@ -3,7 +3,7 @@ namespace wcf\system\user\multifactor;
 use wcf\system\form\builder\IFormDocument;
 
 /**
- * Handles multifactor authentication for a specific authentication method.
+ * Handles multi-factor authentication for a specific authentication method.
  *
  * @author     Tim Duesterhus
  * @copyright  2001-2020 WoltLab GmbH

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 672518ed4f4df539e46a66cc08abec55e49dff64..4eee12d387b2fe8de9d148bfdd6f37dce6b2b478 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4828,7 +4828,7 @@ Open the link below to access the user profile:
                <item name="wcf.user.security.sessionName"><![CDATA[{if $session->getUserAgent()->getBrowser()}{$session->getUserAgent()->getBrowser()}{if $session->getUserAgent()->getOS()} on {$session->getUserAgent()->getOS()}{/if}{else}Unknown Device{/if}]]></item>
                <item name="wcf.user.security.ipAddress"><![CDATA[IP Address]]></item>
                <item name="wcf.user.security.lastActivity"><![CDATA[Last active]]></item>
-               <item name="wcf.user.security.multifactor"><![CDATA[Multifactor Authentication]]></item>
+               <item name="wcf.user.security.multifactor"><![CDATA[Multi-Factor Authentication]]></item>
                <item name="wcf.user.security.multifactor.com.woltlab.wcf.multifactor.totp"><![CDATA[Smartphone App]]></item>
                <item name="wcf.user.security.multifactor.com.woltlab.wcf.multifactor.backup"><![CDATA[Emergency Codes]]></item>
                <item name="wcf.user.security.multifactor.com.woltlab.wcf.multifactor.backup.manage"><![CDATA[Manage Emergency Codes]]></item>