Merge branch 'master' into smtp-options

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc wcfsetup/install/lang/de.xml
index 5e4a07b2e4052d4c7681a98fe0468d18deff19a2,72eebf448387f0b58b25161ee2ce72a133d0933e..3c6401f85887e67d959ab1ed2abb1ba09eed7242
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -5557,6 -5557,6 +5556,7 @@@ Benachrichtigungen auf <a href="{link i
        <item name="wcf.acp.devtools.project.apiVersions.description"/>
        <item name="wcf.acp.style.globals.pageLogo.description"/>
        <item name="wcf.acp.style.globals.pageLogoMobile.description"/>
+       <item name="wcf.acp.option.profile_mail_use_captcha"/>
 +      <item name="wcf.acp.option.mail_smtp_starttls.may"/>
  </delete>
  </language>

diff --cc wcfsetup/install/lang/en.xml
index 02b33b30847b8efc60b250ae01b250c39b70774a,39801347d7ec3e34aa4876413832c0d1d5865299..4e0cd4d4dbd106f5357ebbad57b12dd7df0ccee7
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -5558,6 -5558,6 +5557,7 @@@ your notifications on <a href="{link is
        <item name="wcf.acp.devtools.project.apiVersions.description"/>
        <item name="wcf.acp.style.globals.pageLogo.description"/>
        <item name="wcf.acp.style.globals.pageLogoMobile.description"/>
+       <item name="wcf.acp.option.profile_mail_use_captcha"/>
 +      <item name="wcf.acp.option.mail_smtp_starttls.may"/>
  </delete>
  </language>