Merge branch '5.5'

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

diff --cc constants.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCF.class.php
index 5ad42d7ee4f0a241a02c81f11d4ca6470eb2693a,7fec9f3b3c8c9b84490665e3f08e493e1196e001..9dfec8631df4aa1c777b64295e32201b713aa0c9
--- 1/wcfsetup/install/files/lib/system/WCF.class.php
--- 2/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@@ -482,8 -496,9 +482,12 @@@ class WC
          // The captcha option related to the removed SearchForm was removed in 5.5.
          \define('SEARCH_USE_CAPTCHA', 0);
  
+         // The prompt for desktop notifications is no longer obtrusive since 5.5.
+         // https://github.com/WoltLab/WCF/issues/4806
+         \define('ENABLE_DESKTOP_NOTIFICATIONS', 1);
++
 +        // Disabling X-Frame-Options is no longer possible since 5.6.
 +        \define('HTTP_SEND_X_FRAME_OPTIONS', 1);
      }
  
      /**

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge