Merge branch '5.5'

diff --cc package-lock.json
index 366fa85ab2a5ca45e35cc334afbd70d64a4ffd23,308174566fc3610818eb4c4194e0f0b85296358f..8b3404b3bca5a8e6ebc834a7fee2d5678aa6baf3
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -18,14 -13,12 +18,14 @@@
          "@types/jquery": "^3.5.14",
          "@types/perfect-scrollbar": "^0.7.0",
          "@types/pica": "^5.1.3",
 -        "@types/prismjs": "^1.16.6",
 +        "@types/prismjs": "^1.26.0",
          "@types/twitter-for-web": "0.0.2",
 -        "focus-trap": "^6.9.4",
 +        "focus-trap": "^7.4.0",
 +        "html-parsed-element": "^0.4.1",
          "qr-creator": "^1.0.0",
 -        "tabbable": "^5.3.3",
 +        "reflect-metadata": "^0.1.13",
 +        "tabbable": "^6.1.2",
-         "tslib": "^2.5.0"
+         "tslib": "^2.5.2"
        },
        "devDependencies": {
          "@typescript-eslint/eslint-plugin": "^5.55.0",

diff --cc package.json
index 1bcc2ac46f763703f25a78452961f1eea833e0bd,d5262e01b72832da81480d13670ab6ec731efb84..f7406ed52b76526fdfeb789c83579c19011ebf61
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -14,25 -15,16 +14,25 @@@
      "typescript": "^5.0.2"
    },
    "dependencies": {
 -    "@types/google.maps": "^3.53.1",
 -    "@types/perfect-scrollbar": "^0.7.0",
 +    "@ckeditor/ckeditor5-autosave": "^37.1.0",
 +    "@ckeditor/ckeditor5-code-block": "^37.1.0",
 +    "@ckeditor/ckeditor5-core": "^37.1.0",
 +    "@ckeditor/ckeditor5-editor-classic": "^37.1.0",
 +    "@ckeditor/ckeditor5-inspector": "^4.1.0",
 +    "@ckeditor/ckeditor5-mention": "^37.1.0",
 +    "@googlemaps/markerclusterer": "^2.0.15",
      "@types/facebook-js-sdk": "^3.3.6",
 +    "@types/google.maps": "^3.53.1",
      "@types/jquery": "^3.5.14",
 +    "@types/perfect-scrollbar": "^0.7.0",
      "@types/pica": "^5.1.3",
 -    "@types/prismjs": "^1.16.6",
 +    "@types/prismjs": "^1.26.0",
      "@types/twitter-for-web": "0.0.2",
 -    "focus-trap": "^6.9.4",
 +    "focus-trap": "^7.4.0",
 +    "html-parsed-element": "^0.4.1",
      "qr-creator": "^1.0.0",
 -    "tabbable": "^5.3.3",
 +    "reflect-metadata": "^0.1.13",
 +    "tabbable": "^6.1.2",
-     "tslib": "^2.5.0"
+     "tslib": "^2.5.2"
    }
  }

diff --cc wcfsetup/install/files/lib/page/AttachmentPage.class.php
Simple merge

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

diff --cc wcfsetup/install/lang/en.xml
index 1c7a5c31b3930e85d6b4e13ef0542333902e439b,e990291b0df3ee4ea195a77ba846bf8bbd93bca9..ee62e79888999d5f87959653cfaa5634db9e830d
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -5406,9 -5424,8 +5406,9 @@@ your notifications on <a href="{link is
                <item name="wcf.user.notification.com.woltlab.wcf.article.comment.notification.comment"><![CDATA[Notify me of new comments on my articles]]></item>
                <item name="wcf.user.notification.com.woltlab.wcf.article.comment.response.notification.commentResponse"><![CDATA[Notify me of new replies to my comments]]></item>
                <item name="wcf.user.notification.com.woltlab.wcf.article.comment.response.notification.commentResponseOwner"><![CDATA[Notify me of new replies to comments on my articles]]></item>
 -              <item name="wcf.user.notification.articleComment.title"><![CDATA[New Comment (Article)]]></item>
 -              <item name="wcf.user.notification.articleComment.title.stacked"><![CDATA[{#$timesTriggered} New Comments (Article)]]></item>
 +              <item name="wcf.user.notification.comment.title"><![CDATA[New Comment ({$typeName})]]></item>
 +              <item name="wcf.user.notification.comment.mail.title"><![CDATA[New Comment on "{@$objectTitle}" ({@$typeName})]]></item>
-               <item name="wcf.user.notification.comment.title.stacked"><![CDATA[{#$timesTriggered} new Comments ({$typeName})]]></item>
++              <item name="wcf.user.notification.comment.title.stacked"><![CDATA[{#$timesTriggered} New Comments ({$typeName})]]></item>
                <item name="wcf.user.notification.articleComment.message"><![CDATA[{if $author->userID}<strong>{$author}</strong>{else}A guest{/if} commented on the article <strong>{$article->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.articleComment.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} commented on the article <strong>{$article->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.articleComment.mail.plaintext"><![CDATA[{@$authorList} commented on the article “{@$article->getTitle()}” [URL:{@$article->getLink()}#comment{@$commentID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]></item>
@@@ -5417,9 -5434,8 +5417,9 @@@
                <item name="wcf.user.notification.articleComment.like.title.stacked"><![CDATA[{#$count} users reacted to your comment (Article)]]></item>
                <item name="wcf.user.notification.articleComment.like.message"><![CDATA[<strong>{$author}</strong> reacted to your comment on the article <strong>{$article->getTitle()}</strong> ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]></item>
                <item name="wcf.user.notification.articleComment.like.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} reacted to your comment on the article <strong>{$article->getTitle()}</strong> ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]></item>
 -              <item name="wcf.user.notification.articleComment.response.title"><![CDATA[New Reply (Article)]]></item>
 -              <item name="wcf.user.notification.articleComment.response.title.stacked"><![CDATA[{#$timesTriggered} New Replies (Article)]]></item>
 +              <item name="wcf.user.notification.comment.response.title"><![CDATA[New Reply ({$typeName})]]></item>
 +              <item name="wcf.user.notification.comment.response.mail.title"><![CDATA[New Reply on "{@$objectTitle}" ({@$typeName})]]></item>
-               <item name="wcf.user.notification.comment.response.title.stacked"><![CDATA[{#$timesTriggered} new Replies ({$typeName})]]></item>
++              <item name="wcf.user.notification.comment.response.title.stacked"><![CDATA[{#$timesTriggered} New Replies ({$typeName})]]></item>
                <item name="wcf.user.notification.articleComment.response.message"><![CDATA[{if $author->userID}<strong>{$author}</strong>{else}A guest{/if} replied to a comment on the article <strong>{$article->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.articleComment.response.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} replied to a comment on the article <strong>{$article->getTitle()}</strong>.]]></item>
                <item name="wcf.user.notification.articleComment.response.mail.plaintext"><![CDATA[{@$authorList} replied to a comment on the article “{@$article->getTitle()}” [URL:{@$article->getLink()}#comments/comment{@$commentID}/response{@$responseID}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]></item>