From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 8 May 2023 07:23:36 +0000 (+0200)
Subject: Merge branch '5.5'
X-Git-Tag: 6.0.0_Alpha_1~144
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9f9385c2e3d02b5eb41c020ed3e8c2dff0e4a750;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.5'
---

9f9385c2e3d02b5eb41c020ed3e8c2dff0e4a750
diff --cc wcfsetup/install/lang/de.xml
index 9eaa301987,033ab8e09c..5f4c8153d6
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -2791,14 -2814,12 +2791,14 @@@ Abschnitte dürfen nicht leer sein und 
  		<item name="wcf.acp.systemCheck.php.extension.description"><![CDATA[Die offiziellen Erweiterungen von PHP stellen zusätzliche Funktionen bereit, die für den Betrieb der Software notwendig sind.]]></item>
  		<item name="wcf.acp.systemCheck.php.memoryLimit"><![CDATA[Verfügbarer Arbeitsspeicher („memory_limit“)]]></item>
  		<item name="wcf.acp.systemCheck.php.memoryLimit.description"><![CDATA[Einige Prozesse benötigen in Spitzenzeiten eine große Menge Arbeitsspeicher, für den einwandfreien Betrieb werden mindestens {$phpMemoryLimit} MB benötigt.]]></item>
 -		<item name="wcf.acp.systemCheck.php.sha256"><![CDATA[Unterstützung für SHA-256]]></item>
 -		<item name="wcf.acp.systemCheck.php.sha256.description"><![CDATA[Die kryptographische Funktion SHA-256 wird für den sicheren Betrieb der Software benötigt.]]></item>
 +		<item name="wcf.acp.systemCheck.php.x64"><![CDATA[64-Bit-Unterstützung]]></item>
 +		<item name="wcf.acp.systemCheck.php.x64.description"><![CDATA[Die eingesetzte PHP-Version muss die Verarbeitung von 64-Bit-Ganzzahlen unterstützen, um Zahlwerte größer als etwa 2,1 Milliarden korrekt zu verarbeiten.]]></item>
 +		<item name="wcf.acp.systemCheck.mysql.mysqlnd"><![CDATA[MySQL Native Driver verwendet]]></item>
 +		<item name="wcf.acp.systemCheck.mysql.mysqlnd.description"><![CDATA[Zur Kommunikation mit dem MySQL-Server muss der MySQL Native Driver verwendet werden, damit Datentypen korrekt übermittelt werden. Der MySQL Native Driver ist der Standard-Treiber von PHP.]]></item>
  		<item name="wcf.acp.systemCheck.mysql.innodb"><![CDATA[InnoDB verfügbar]]></item>
  		<item name="wcf.acp.systemCheck.mysql.innodb.description"><![CDATA[InnoDB (XtraDB unter MariaDB) ist eine transaktionale Storage-Engine von MySQL und wird zwingend für den Betrieb benötigt. Dies ist eine Standardfunktion von MySQL.]]></item>
- 		<item name="wcf.acp.systemCheck.mysql.bufferPool"><![CDATA[Bufferpool-Größe]]></item>
- 		<item name="wcf.acp.systemCheck.mysql.bufferPool.description"><![CDATA[Der Bufferpool ist der Ort an dem die gespeicherten Daten im Arbeitsspeicher vorgehalten werden und wird von allen Kunden des Datenbankservers geteilt. Der Bufferpool muss mindestens 128 MiB groß sein, damit auch komplexe Datenbankabfragen verarbeitet werden können. Um Wartezeit durch Festplattenzugriffe zu vermeiden, sollte der Bufferpool allerdings in Abhängigkeit von der Hardware viel größer konfiguriert werden.]]></item>
+ 		<item name="wcf.acp.systemCheck.mysql.bufferPool"><![CDATA[Buffer Pool-Größe]]></item>
+ 		<item name="wcf.acp.systemCheck.mysql.bufferPool.description"><![CDATA[Der Buffer Pool ist der Ort an dem die gespeicherten Daten im Arbeitsspeicher vorgehalten werden und wird von allen Kunden des Datenbankservers geteilt. Der Buffer Pool muss mindestens 128 MiB groß sein, damit auch komplexe Datenbankabfragen verarbeitet werden können. Um Wartezeit durch Festplattenzugriffe zu vermeiden, sollte der Buffer Pool allerdings in Abhängigkeit von der Hardware viel größer konfiguriert werden.]]></item>
  		<item name="wcf.acp.systemCheck.directories.writable"><![CDATA[Beschreibbare Verzeichnisse]]></item>
  		<item name="wcf.acp.systemCheck.directories.writable.description"><![CDATA[Einige Verzeichnisse werden zur Laufzeit durch die Software beschrieben, der PHP-Benutzer muss Schreibrechte haben.]]></item>
  		<item name="wcf.acp.systemCheck.php.gd"><![CDATA[Unterstützte Formate der GD-Bibliothek]]></item>
diff --cc wcfsetup/install/lang/en.xml
index e9617538d5,5ffc014a70..1c7a5c31b3
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -2581,34 -2605,34 +2581,34 @@@ If you have <strong>already bought the 
  	<category name="wcf.acp.rebuildData">
  		<item name="wcf.acp.rebuildData"><![CDATA[Rebuild Data]]></item>
  		<item name="wcf.acp.rebuildData.description"><![CDATA[In order to ensure consistency, e.g. after a data import, it is highly recommended to perform all the actions below in their respective order, starting from top to bottom.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.user"><![CDATA[Rebuild Users]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.user.description"><![CDATA[Rebuilds the user counters.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.like"><![CDATA[Rebuild Reactions]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.like.description"><![CDATA[Recalculates the reactions.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.attachment"><![CDATA[Rebuild Attachments]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.attachment.description"><![CDATA[Rebuilds the attachment preview images.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.media"><![CDATA[Rebuild Media]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.media.description"><![CDATA[Rebuilds the media preview images.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.statDaily"><![CDATA[Rebuild Statistics]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.statDaily.description"><![CDATA[Rebuilds the daily statistics.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.poll"><![CDATA[Rebuild Polls]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.poll.description"><![CDATA[Rebuilds the poll counters.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.article"><![CDATA[Rebuild Articles]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.article.description"><![CDATA[Rebuilds the article search index.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.comment"><![CDATA[Rebuild Comments]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.comment.description"><![CDATA[Rebuilds the comments.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.comment.response"><![CDATA[Rebuild Comment Responses]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.comment.response.description"><![CDATA[Rebuilds the comment responses.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.page"><![CDATA[Rebuild Pages]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.page.description"><![CDATA[Rebuilds the page search index.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.sitemap"><![CDATA[Rebuild Sitemap]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.sitemap.description"><![CDATA[Rebuilds the sitemap.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.activityPointEvent"><![CDATA[Rebuild Points per Activity]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.activityPointEvent.description"><![CDATA[Recalculates points per activity.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.activityPointItems"><![CDATA[Rebuild Point Activities]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.activityPointItems.description"><![CDATA[Recalculates the number of activities for which users get points and rebuilds user ranks.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.searchEngineConvertInnoDb.description"><![CDATA[Migrates the search engine tables to the InnoDB storage engine.]]></item>
 -		<item name="wcf.acp.rebuildData.com.woltlab.wcf.searchEngineConvertInnoDb"><![CDATA[Migrate Search Index to InnoDB]]></item>
 +		<item name="wcf.acp.rebuildData.cli"><![CDATA[Rebuild Using the Command Line]]></item>
 +		<item name="wcf.acp.rebuildData.cli.description"><![CDATA[The listed commands may be used in <kbd>cli.php</kbd> to perform all actions in the correct order.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_UserRebuildDataWorker"><![CDATA[Rebuild Users]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_UserRebuildDataWorker.description"><![CDATA[Rebuilds the user counters.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_LikeRebuildDataWorker"><![CDATA[Rebuild Reactions]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_LikeRebuildDataWorker.description"><![CDATA[Recalculates the reactions.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_AttachmentRebuildDataWorker"><![CDATA[Rebuild Attachments]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_AttachmentRebuildDataWorker.description"><![CDATA[Rebuilds the attachment preview images.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_MediaRebuildDataWorker"><![CDATA[Rebuild Media]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_MediaRebuildDataWorker.description"><![CDATA[Rebuilds the media preview images.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_StatDailyRebuildDataWorker"><![CDATA[Rebuild Statistics]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_StatDailyRebuildDataWorker.description"><![CDATA[Rebuilds the daily statistics.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_PollRebuildDataWorker"><![CDATA[Rebuild Polls]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_PollRebuildDataWorker.description"><![CDATA[Rebuilds the poll counters.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_ArticleRebuildDataWorker"><![CDATA[Rebuild Articles]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_ArticleRebuildDataWorker.description"><![CDATA[Rebuilds the article search index.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_CommentRebuildDataWorker"><![CDATA[Rebuild Comments]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_CommentRebuildDataWorker.description"><![CDATA[Rebuilds the comments.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_CommentResponseRebuildDataWorker"><![CDATA[Rebuild Comment Responses]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_CommentResponseRebuildDataWorker.description"><![CDATA[Rebuilds the comment responses.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_PageRebuildDataWorker"><![CDATA[Rebuild Pages]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_PageRebuildDataWorker.description"><![CDATA[Rebuilds the page search index.]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_SitemapRebuildWorker"><![CDATA[Rebuild Sitemap]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_SitemapRebuildWorker.description"><![CDATA[Rebuilds the sitemap.]]></item>
- 		<item name="wcf.acp.rebuildData.wcf_system_worker_UserActivityPointUpdateEventsWorker"><![CDATA[Rebuilds Points per Activity]]></item>
++		<item name="wcf.acp.rebuildData.wcf_system_worker_UserActivityPointUpdateEventsWorker"><![CDATA[Rebuild Points per Activity]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_UserActivityPointUpdateEventsWorker.description"><![CDATA[Recalculates points per activity.]]></item>
- 		<item name="wcf.acp.rebuildData.wcf_system_worker_UserActivityPointItemsRebuildDataWorker"><![CDATA[Rebuilds Point Activities]]></item>
++		<item name="wcf.acp.rebuildData.wcf_system_worker_UserActivityPointItemsRebuildDataWorker"><![CDATA[Rebuild Point Activities]]></item>
 +		<item name="wcf.acp.rebuildData.wcf_system_worker_UserActivityPointItemsRebuildDataWorker.description"><![CDATA[Recalculates the number of activities for which users get points and rebuilds user ranks.]]></item>
  		<item name="wcf.acp.rebuildData.offline"><![CDATA[It is strongly recommended to enable the maintenance mode while performing a data rebuild.]]></item>
  		<item name="wcf.acp.rebuildData.rebuildAll"><![CDATA[Rebuild All]]></item>
  	</category>
@@@ -2721,14 -2745,12 +2721,14 @@@
  		<item name="wcf.acp.systemCheck.php.extension.description"><![CDATA[The official PHP extensions provide additional capabilities and features that are required for the software to work.]]></item>
  		<item name="wcf.acp.systemCheck.php.memoryLimit"><![CDATA[Available Memory (“memory_limit”)]]></item>
  		<item name="wcf.acp.systemCheck.php.memoryLimit.description"><![CDATA[Processes may require large amounts of memory at peak, requiring a limit of at least {$phpMemoryLimit} MB.]]></item>
 -		<item name="wcf.acp.systemCheck.php.sha256"><![CDATA[Support for SHA-256]]></item>
 -		<item name="wcf.acp.systemCheck.php.sha256.description"><![CDATA[The cryptographic function SHA-256 is required for a safe and secure operation of the software.]]></item>
 +		<item name="wcf.acp.systemCheck.php.x64"><![CDATA[64-bit Support]]></item>
 +		<item name="wcf.acp.systemCheck.php.x64.description"><![CDATA[The PHP version must support 64-bit integers to correctly process numbers larger than ~2.1 billion.]]></item>
 +		<item name="wcf.acp.systemCheck.mysql.mysqlnd"><![CDATA[MySQL Native Driver used]]></item>
 +		<item name="wcf.acp.systemCheck.mysql.mysqlnd.description"><![CDATA[To properly transmit the correct data type, the MySQL Native Driver must be used for communication with the MySQL server. The MySQL Native Driver is the default driver used by PHP.]]></item>
  		<item name="wcf.acp.systemCheck.mysql.innodb"><![CDATA[InnoDB available]]></item>
  		<item name="wcf.acp.systemCheck.mysql.innodb.description"><![CDATA[InnoDB (XtraDB when using MariaDB) is a transaction storage engine for MySQL and is required for the operation of the software. This is a built-in feature of MySQL.]]></item>
- 		<item name="wcf.acp.systemCheck.mysql.bufferPool"><![CDATA[Bufferpool Size]]></item>
- 		<item name="wcf.acp.systemCheck.mysql.bufferPool.description"><![CDATA[The bufferpool is the place where the stored data is kept in memory. It is shared by every customer using the same database server. The bufferpool must have a size of at least 128 MiB to allow for processing of complex queries. To prevent disk accesses from slowing down the page the bufferpool should generally be configured much larger. The ideal size varies based on the hardware configuration.]]></item>
+ 		<item name="wcf.acp.systemCheck.mysql.bufferPool"><![CDATA[Buffer Pool Size]]></item>
+ 		<item name="wcf.acp.systemCheck.mysql.bufferPool.description"><![CDATA[The buffer pool is the place where the stored data is kept in memory. It is shared by every customer using the same database server. The buffer pool must have a size of at least 128 MiB to allow for processing of complex queries. To prevent disk accesses from slowing down the page the buffer pool should generally be configured much larger. The ideal size varies based on the hardware configuration.]]></item>
  		<item name="wcf.acp.systemCheck.directories.writable"><![CDATA[Writable Directories]]></item>
  		<item name="wcf.acp.systemCheck.directories.writable.description"><![CDATA[Some directories are being written to during the normal operation. The user that runs the PHP process must have write access.]]></item>
  		<item name="wcf.acp.systemCheck.php.gd"><![CDATA[Supported formats of the GD library]]></item>