Merge branch 'master' into next

diff --cc wcfsetup/install/lang/en.xml
index dba55ec74e18ab4b7f6677347d79f2e4b8a965e0,c2eb596a917b51df45abb73fc6c6af6c681cd3fc..06aae8cfa38415f4fd5b4eb62e781df1e2627b2c
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -1198,10 -958,10 +1198,10 @@@ This protocol file contains {$data[coun
                <item name="wcf.acp.notice.example"><![CDATA[Example text of a notice]]></item>
                <item name="wcf.acp.notice.isDisabled"><![CDATA[Disable notice]]></item>
                <item name="wcf.acp.notice.isDismissible"><![CDATA[User can dismiss notice]]></item>
-               <item name="wcf.acp.notice.isDismissible.description"><![CDATA[If a user dismisses a notice, it will not display for them again.]]></item>
+               <item name="wcf.acp.notice.isDismissible.description"><![CDATA[If a user dismisses a notice, it will not be displayed for them again.]]></item>
                <item name="wcf.acp.notice.list"><![CDATA[Notices]]></item>
                <item name="wcf.acp.notice.notice"><![CDATA[Notice]]></item>
 -              <item name="wcf.acp.notice.notice.description"><![CDATA[<code>{literal}{$username}{/literal}</code> will be replaced by the name and <code>{literal}{$email}{/literal}</code> by the mail address of the active user.]]></item>
 +              <item name="wcf.acp.notice.notice.description"><![CDATA[<kbd>{literal}{$username}{/literal}</kbd> will be replaced by the name and <kbd>{literal}{$email}{/literal}</kbd> by the mail address of the active user.]]></item>
                <item name="wcf.acp.notice.noticeUseHtml"><![CDATA[Enable HTML code in notice]]></item>
                <item name="wcf.acp.notice.resetIsDismissed"><![CDATA[Dismissed notices will be displayed again.]]></item>
                <item name="wcf.acp.notice.resetIsDismissed.description"><![CDATA[The notice will be displayed again to users who dismissed the previous version. Guests who dismissed the notice will only view it in a new session.]]></item>