Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
#	wcfsetup/install/lang/en.xml

diff --cc wcfsetup/install/lang/en.xml
index c015dd6c8be8748f9f9d4d960eb20a2e0209ba97,2b79a787a2b9f012f0cf5e75454a3028ac02585d..6f36943f7c65e67dfa04ef8981492505405a26dd
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -945,7 -800,8 +945,7 @@@ Examples for medium ID detection
                <item name="wcf.acp.option.session_validate_ip_address.description"><![CDATA[Enabling this validation might cause issues for users with a rotating IP address.]]></item>
                <item name="wcf.acp.option.session_validate_user_agent"><![CDATA[Validate user-agent]]></item>
                <item name="wcf.acp.option.session_enable_virtualization"><![CDATA[Allow session sharing]]></item>
-               <item name="wcf.acp.option.session_enable_virtualization.description"><![CDATA[Users can login from multiple devices (desktop, tablet, smartphone, etc) concurrently, all devices will share the same session. Disabling this will restrict users to only one device (session) at a time, causing all the other device sessions to terminate. It is not recommended to disable this option.]]></item>
+               <item name="wcf.acp.option.session_enable_virtualization.description"><![CDATA[Users can login from multiple devices (desktop, tablet, smartphone, etc.) concurrently; all devices will share the same session. Disabling this will restrict users to only one device (session) at a time, causing all the other device sessions to terminate. It is not recommended to disable this option.]]></item>
 -              <item name="wcf.acp.option.show_clock"><![CDATA[Display current time in page footer]]></item>
                <item name="wcf.acp.option.timezone"><![CDATA[Timezone]]></item>
                <item name="wcf.acp.option.timezone.description"><![CDATA[The default timezone of your page.]]></item>
                <item name="wcf.acp.option.user_online_timeout"><![CDATA[Users Online Timeout]]></item>