Merge remote-tracking branch 'refs/remotes/origin/3.0'

diff --cc com.woltlab.wcf/templates/moderationReport.tpl
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js
Simple merge

diff --cc wcfsetup/install/lang/de.xml
index f668c787c122c62d309b77ca72945f818206e23d,3d4ebd023876dcb54352c38d5df62747fffa84b0..c3fd8fee014f3e8a82049faf9336dca0479ab3e7
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -1366,8 -1195,8 +1366,9 @@@ Als Benachrichtigungs-URL in der Konfig
                <item name="wcf.acp.option.category.general.payment.paidSubscription"><![CDATA[Bezahlte Mitgliedschaften]]></item>
                <item name="wcf.acp.option.google_maps_api_key"><![CDATA[Browser-API-Schlüssel]]></item>
                <item name="wcf.acp.option.google_maps_api_key.description"><![CDATA[Google stellt <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.google.com/maps/documentation/javascript/get-api-key'|rawurlencode}" class="externalURL">hier</a> eine ausführliche Anleitung bereit, wie {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} einen API-Schlüssel erstellen {if LANGUAGE_USE_INFORMAL_VARIANT}kannst{else}können{/if}.]]></item>
 +              <item name="wcf.acp.option.suffix.chars"><![CDATA[Zeichen]]></item>
                <item name="wcf.acp.option.suffix.days"><![CDATA[Tage]]></item>
+               <item name="wcf.acp.option.suffix.hours"><![CDATA[Stunden]]></item>
                <item name="wcf.acp.option.suffix.minutes"><![CDATA[Minuten]]></item>
                <item name="wcf.acp.option.suffix.percent"><![CDATA[%]]></item>
                <item name="wcf.acp.option.suffix.pixel"><![CDATA[Pixel]]></item>

diff --cc wcfsetup/install/lang/en.xml
index 3c47f89a17005ae3646b343b3c3bd8c56ee2483c,d70aad6073dbf5fc9b99fc5b87f6a010793e8e5f..3196a9ec2198a2518a6337462a2cdb192a58b85d
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -1359,8 -1197,8 +1359,9 @@@ When prompted for the notification URL 
                <item name="wcf.acp.option.category.general.payment.paidSubscription"><![CDATA[Paid Subscriptions]]></item>
                <item name="wcf.acp.option.google_maps_api_key"><![CDATA[Browser API Key]]></item>
                <item name="wcf.acp.option.google_maps_api_key.description"><![CDATA[Google provides a detailed description on how to get an API key <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.google.com/maps/documentation/javascript/get-api-key'|rawurlencode}" class="externalURL">here</a>.]]></item>
 +              <item name="wcf.acp.option.suffix.chars"><![CDATA[Chars]]></item>
                <item name="wcf.acp.option.suffix.days"><![CDATA[Days]]></item>
+               <item name="wcf.acp.option.suffix.hours"><![CDATA[Hours]]></item>
                <item name="wcf.acp.option.suffix.minutes"><![CDATA[Minutes]]></item>
                <item name="wcf.acp.option.suffix.percent"><![CDATA[%]]></item>
                <item name="wcf.acp.option.suffix.pixel"><![CDATA[Pixels]]></item>