From 7d874360d79ae9c45bb3a098c330afcdb33ec26f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Tue, 10 Nov 2020 09:18:31 +0100
Subject: [PATCH] Use 'Multi-Factor Authentication' in English phrasing

---
 com.woltlab.wcf/page.xml                                      | 4 ++--
 wcfsetup/install/files/lib/data/user/User.class.php           | 2 +-
 .../files/lib/form/MultifactorAuthenticationForm.class.php    | 2 +-
 .../install/files/lib/form/MultifactorManageForm.class.php    | 2 +-
 .../install/files/lib/system/session/SessionHandler.class.php | 2 +-
 .../lib/system/user/multifactor/IMultifactorMethod.class.php  | 2 +-
 wcfsetup/install/lang/en.xml                                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/com.woltlab.wcf/page.xml b/com.woltlab.wcf/page.xml
index 46d1750fb6..e6b3932403 100644
--- 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 873c648d44..5fab3dfc33 100644
--- 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 3af706d9dc..3febf050c6 100644
--- 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 471d5351fa..4880c043c2 100644
--- 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 e7b3392255..14a1a526a3 100644
--- 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 6a456d5857..ba52493e6a 100644
--- 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 672518ed4f..4eee12d387 100644
--- 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>
-- 
2.20.1