Merge branch 'master' into next

diff --cc wcfsetup/install/lang/en.xml
index 055482a155cfbc98a7d08b414bff7cba9c67c5ef,7240601b4b2ab188a0dda7a6aa492f767a82d404..b3763fbe00e062293dbebfa21cb17edae6cea1b5
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -670,10 -675,9 +670,10 @@@ Examples for medium ID detection
                <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.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.noticeUseHtml"><![CDATA[Enable HTML code in notice]]></item>
-               <item name="wcf.acp.notice.resetIsDismissed"><![CDATA[Dismissed notices will be shown again]]></item>
-               <item name="wcf.acp.notice.resetIsDismissed.description"><![CDATA[The notice will be shown again to users who dismissed the previous version. Guests who dismissed the notice will only see it in a new session.]]></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 see it in a new session.]]></item>
                <item name="wcf.acp.notice.showOrder"><![CDATA[Display Order]]></item>
                <item name="wcf.acp.notice.showOrder.description"><![CDATA[Sets the order in which the notices are displayed.]]></item>
        </category>
@@@ -1577,9 -1579,14 +1577,9 @@@ GmbH=Gesellschaft mit beschränkter Haf
                <item name="wcf.acp.user.merge.destination.description"><![CDATA[The selected users will be merged into this user account.]]></item>
                <item name="wcf.acp.user.merge.markedUsers"><![CDATA[Merge the following users]]></item>
                <item name="wcf.acp.user.revertChanges"><![CDATA[Revert Changes To Contents]]></item>
-               <item name="wcf.acp.user.revertChanges.timeframe"><![CDATA[Timeframe]]></item>
-               <item name="wcf.acp.user.revertChanges.timeframe.description"><![CDATA[Changes made in this timeframe will be reverted to the newest version that is either older than the given timeframe or made by an unrelated user [time in days]]]></item>
+               <item name="wcf.acp.user.revertChanges.timeframe"><![CDATA[Time Frame]]></item>
+               <item name="wcf.acp.user.revertChanges.timeframe.description"><![CDATA[Changes made in this time frame will be reverted to the newest version that is either older than the given timeframe or made by an unrelated user [time in days]]]></item>
                <item name="wcf.acp.user.revertChanges.markedUsers"><![CDATA[Revert changes by the following users]]></item>
 -              <item name="wcf.acp.user.bulkProcessing"><![CDATA[Bulk Processing]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.action"><![CDATA[Actions]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.conditions"><![CDATA[Conditions]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.success"><![CDATA[Executed action affected {#$affectedUsers} user{if $affectedUsers != 1}s{/if}.]]></item>
 -              <item name="wcf.acp.user.bulkProcessing.warning"><![CDATA[Heads up! The bulk processing executes all actions below without any further confirmation prompt!]]></item>
                <item name="wcf.acp.user.search"><![CDATA[Search Users]]></item>
                <item name="wcf.acp.user.search.conditions.general"><![CDATA[General]]></item>
                <item name="wcf.acp.user.search.conditions.profile"><![CDATA[Profile]]></item>