From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 10 May 2022 07:26:40 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Beta_1~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=005b1b26ab2c7d99f08b2ad1f7b7d62d98165287;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4'
---

005b1b26ab2c7d99f08b2ad1f7b7d62d98165287
diff --cc wcfsetup/install/lang/en.xml
index 3c83629346,bc192d6cc8..a46592b2f2
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -4949,10 -4950,10 +4949,10 @@@ Open the link below to access the user 
  <p>You can manage multi-factor authentication within the <a href="{link controller='AccountSecurity' isHtmlEmail=true}#section_multifactor{/link}">Account Security</a> page. Within account security you can generate new emergency codes or disable multi-factor authentication.</p>]]></item>
  		<item name="wcf.user.security.multifactor.backup.authenticationEmail.body.plain"><![CDATA[Dear {$setup->getUser()->username},
  
- You used the emergency code “{$usedCode[identifier]}” for multi-factor authentication. This code no longer is valid. {plural value=$remaining 0='**You don't have any remaining codes.**' 1='You have one remaining code.' other='You have # remaining codes.'} {* this line ends with a space *}
+ You used the emergency code “{$usedCode[identifier]}” for multi-factor authentication. This code no longer is valid. {plural value=$remaining 0='**You don\'t have any remaining codes.**' 1='You have one remaining code.' other='You have # remaining codes.'} {* this line ends with a space *}
  
  You can manage multi-factor authentication within the Account Security page [URL:{link controller='AccountSecurity' isEmail=true}#section_multifactor{/link}]. Within account security you can generate new emergency codes or disable multi-factor authentication.]]></item>
 -		<item name="wcf.user.security.multifactor.backup.authenticationEmail.subject"><![CDATA[Authentication using emergency code on {@PAGE_TITLE|language}]]></item>
 +		<item name="wcf.user.security.multifactor.backup.authenticationEmail.subject"><![CDATA[Authentication using emergency code on {@PAGE_TITLE|phrase}]]></item>
  		<item name="wcf.user.security.multifactor.backup.code"><![CDATA[Emergency Code]]></item>
  		<item name="wcf.user.security.multifactor.backup.code.description"><![CDATA[An emergency code consists of 20 digits and may only be used once.]]></item>
  		<item name="wcf.user.security.multifactor.backup.error.flood"><![CDATA[Please try again later.]]></item>