From: Cyperghost <olaf_schmitz_1@t-online.de>
Date: Tue, 19 Nov 2024 08:16:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/6.2' into file-upload-image-crop
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b6691c47924b65305c2013cbdcf8fa38cd94248e;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/6.2' into file-upload-image-crop

# Conflicts:
#	package-lock.json
#	package.json
#	wcfsetup/install/lang/en.xml
---

b6691c47924b65305c2013cbdcf8fa38cd94248e
diff --cc package-lock.json
index a086c9cc38,b57014cd8d..13db92f7d3
--- a/package-lock.json
+++ b/package-lock.json
@@@ -17,11 -18,10 +18,11 @@@
          "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#b9a8e10528a42c5aac06ec1837881a7dd141aefb",
          "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
          "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
 +        "cropperjs": "2.0.0-rc.2",
-         "emoji-picker-element": "^1.22.8",
-         "focus-trap": "^7.6.0",
+         "emoji-picker-element": "^1.23.0",
+         "focus-trap": "^7.6.1",
          "html-parsed-element": "^0.4.1",
-         "perfect-scrollbar": "^1.5.5",
+         "perfect-scrollbar": "^1.5.6",
          "qr-creator": "^1.0.0",
          "reflect-metadata": "^0.2.2",
          "tabbable": "^6.2.0",
diff --cc package.json
index 967a4ac1df,b9a665b74b..b421ff2c3a
--- a/package.json
+++ b/package.json
@@@ -25,11 -26,10 +26,11 @@@
      "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#b9a8e10528a42c5aac06ec1837881a7dd141aefb",
      "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
      "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
 +    "cropperjs": "2.0.0-rc.2",
-     "emoji-picker-element": "^1.22.8",
-     "focus-trap": "^7.6.0",
+     "emoji-picker-element": "^1.23.0",
+     "focus-trap": "^7.6.1",
      "html-parsed-element": "^0.4.1",
-     "perfect-scrollbar": "^1.5.5",
+     "perfect-scrollbar": "^1.5.6",
      "qr-creator": "^1.0.0",
      "reflect-metadata": "^0.2.2",
      "tabbable": "^6.2.0",
diff --cc wcfsetup/install/lang/en.xml
index f8b67dcfda,787c68dba9..4e930bf372
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -5571,8 -5568,7 +5569,8 @@@ your notifications on <a href="{link is
  		<item name="wcf.upload.error.fileExtensionNotPermitted"><![CDATA[The file type of “{$filename}” is not permitted.]]></item>
  		<item name="wcf.upload.error.fileSizeTooLarge"><![CDATA[The file is too large.]]></item>
  		<item name="wcf.upload.error.maximumCountReached"><![CDATA[{plural value=$maximumCount 1='Only one file' other='Only up to # files'} may be uploaded.]]></item>
- 		<item name="wcf.upload.error.adopt"><![CDATA[The file „{$filename}“ cannot be assigned.]]></item>
+ 		<item name="wcf.upload.error.adopt"><![CDATA[The file “{$filename}” cannot be assigned.]]></item>
 +		<item name="wcf.upload.error.image.tooSmall"><![CDATA[The image is too small. It must be at least {$width} x {$height} pixels in size.]]></item>
  	</category>
  </import>
  <delete>