Merge branch '5.5'

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

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

diff --cc extra/package-lock.json
index 29294ec0785d6a4a0c0fc884b639c52fcd301ff8,1bf0e8488a4c9d06e1a19ea05443020b0d10b033..54df87020e297e898d9c6b61fbd9764020552c2b
--- 1/extra/package-lock.json
--- 2/extra/package-lock.json
+++ b/extra/package-lock.json
@@@ -5,9 -5,9 +5,9 @@@
    "packages": {
      "": {
        "dependencies": {
-         "deepmerge": "^4.2.2",
-         "terser": "^5.14.2",
 +        "@woltlab/r.js": "git+https://github.com/WoltLab/r.js.git#ad2413df45fdf6164611243f9870943de3d2bce3",
 -        "requirejs": "^2.3.6",
+         "deepmerge": "^4.3.0",
+         "terser": "^5.16.5",
          "ts-node": "^10.9.1"
        },
        "devDependencies": {
@@@ -116,16 -116,10 +116,16 @@@
        "dev": true
      },
      "node_modules/@types/node": {
-       "version": "18.0.6",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz",
-       "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw=="
+       "version": "18.14.6",
+       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz",
+       "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
      },
 +    "node_modules/@woltlab/r.js": {
 +      "resolved": "git+ssh://git@github.com/WoltLab/r.js.git#ad2413df45fdf6164611243f9870943de3d2bce3",
 +      "bin": {
 +        "r.js": "r.js"
 +      }
 +    },
      "node_modules/acorn": {
        "version": "8.5.0",
        "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
@@@ -390,14 -396,10 +390,14 @@@
        "dev": true
      },
      "@types/node": {
-       "version": "18.0.6",
-       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz",
-       "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw=="
+       "version": "18.14.6",
+       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz",
+       "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
      },
 +    "@woltlab/r.js": {
 +      "version": "git+ssh://git@github.com/WoltLab/r.js.git#ad2413df45fdf6164611243f9870943de3d2bce3",
 +      "from": "@woltlab/r.js@git+https://github.com/WoltLab/r.js.git#ad2413df45fdf6164611243f9870943de3d2bce3"
 +    },
      "acorn": {
        "version": "8.5.0",
        "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",

diff --cc extra/package.json
index f88e51f93c705934a82f55593de40885c045db67,e8fb4d528f5f634d00cca998caf958feace7f860..cffbf2f2216d8efb3cc929a9c37710fdb6aec49f
--- 1/extra/package.json
--- 2/extra/package.json
+++ b/extra/package.json
@@@ -1,8 -1,8 +1,8 @@@
  {
    "dependencies": {
-     "deepmerge": "^4.2.2",
-     "terser": "^5.14.2",
 +    "@woltlab/r.js": "git+https://github.com/WoltLab/r.js.git#ad2413df45fdf6164611243f9870943de3d2bce3",
 -    "requirejs": "^2.3.6",
+     "deepmerge": "^4.3.0",
+     "terser": "^5.16.5",
      "ts-node": "^10.9.1"
    },
    "devDependencies": {

diff --cc wcfsetup/install/files/acp/templates/categoryList.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/category/ArticleCategoryType.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
index 553ae6e979d8103602a9a17b3ca3b8ac1b121ea6,aacd9aca920352e6dcb7d1ce6d8bd9497c98f825..5c62fadd7a35875c4449fdb65ba871e6600827ad
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -3293,10 -3340,7 +3293,11 @@@ freigeschaltet. {if LANGUAGE_USE_INFORM
                <item name="wcf.article.like.notification.message"><![CDATA[<strong>{$author}</strong> hat auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Artikel <strong>{$article->getTitle()}</strong> reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]></item>
                <item name="wcf.article.like.notification.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} haben auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Artikel <strong>{$article->getTitle()}</strong> reagiert ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]></item>
                <item name="wcf.article.bbcode.type"><![CDATA[Artikel]]></item>
 +              <item name="wcf.article.convertToI18n.question"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} diesen Artikel wirklich in einen mehrsprachigen Artikel umwandeln?]]></item>
 +              <item name="wcf.article.convertToI18n.description"><![CDATA[Der aktuelle Inhalt wird für alle Sprachen übernommen, und die Bearbeitungshistorie für diesen Artikel wird gelöscht.<br><br>Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}speichere{else}speichern Sie{/if} alle Änderungen, bevor {if LANGUAGE_USE_INFORMAL_VARIANT}Du fortfährst{else}Sie fortfahren{/if}.]]></item>
 +              <item name="wcf.article.convertFromI18n.question"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} diesen Artikel wirklich in einen einsprachigen Artikel umwandeln?]]></item>
 +              <item name="wcf.article.convertFromI18n.description"><![CDATA[Die ausgewählte Sprache wird dabei als zukünftigen Inhalt übernommen. Die Angaben in anderen Sprachen, sowie die Bearbeitungshistorie dieses Artikels, werden bei diesem Vorgang verworfen.<br><br>Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}speichere{else}speichern Sie{/if} alle Änderungen, bevor {if LANGUAGE_USE_INFORMAL_VARIANT}du fortfährst{else}Sie fortfahren{/if}.]]></item>
+               <item name="wcf.article.category.delete.sure"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} diese Kategorie wirklich löschen? Alle sich in dieser Kategorie befindlichen Unterkategorien werden in die Elternkategorie dieser Kategorie verschoben und Artikel, die sich in dieser Kategorie befinden, werden gelöscht.]]></item>
        </category>
        <category name="wcf.attachment">
                <item name="wcf.attachment.file.info"><![CDATA[{@$attachment->filesize|filesize} – {plural value=$attachment->downloads 1="1 Download" other="# Downloads"}]]></item>

diff --cc wcfsetup/install/lang/en.xml
index b4fb185eaa17fb60e257d24428a7f3a6fdfa739f,3ba559ad9c55bec632f8750e1bdadc0856bb3371..aca17ac51677aff3b4f7afb5ae8a8a06e8174ed3
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -3221,10 -3267,7 +3221,11 @@@ Your account on the website: {@PAGE_TIT
                <item name="wcf.article.like.notification.message"><![CDATA[<strong>{$author}</strong> reacted to your article <strong>{$article->getTitle()}</strong> ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]></item>
                <item name="wcf.article.like.notification.message.stacked"><![CDATA[{@'wcf.user.notification.stacked.authorList'|language} reacted to article <strong>{$article->getTitle()}</strong> ({@$__wcf->getReactionHandler()->renderInlineList($reactions)}).]]></item>
                <item name="wcf.article.bbcode.type"><![CDATA[Article]]></item>
 +              <item name="wcf.article.convertToI18n.question"><![CDATA[Are you sure you want to enable internationalization for this article?]]></item>
 +              <item name="wcf.article.convertToI18n.description"><![CDATA[This will cause the current values to be copied over to all other languages, and causes the edit history of this article to be discarded.<br><br>Please submit any unsaved changes before executing this action.]]></item>
 +              <item name="wcf.article.convertFromI18n.question"><![CDATA[Are you sure you want to disable internationalization for this article?]]></item>
 +              <item name="wcf.article.convertFromI18n.description"><![CDATA[All values except the ones of the selected language will be discarded, this will also delete the edit history of this article.<br><br>Please submit any unsaved changes before executing this action.]]></item>
+               <item name="wcf.article.category.delete.sure"><![CDATA[Do you really want to delete this category? All child categories of this category will be moved to this category’s parent category. Articles in this category will be deleted.]]></item>
        </category>
        <category name="wcf.attachment">
                <item name="wcf.attachment.file.info"><![CDATA[{@$attachment->filesize|filesize} – {plural value=$attachment->downloads 1="1 Download" other="# Downloads"}]]></item>