Reordered image proxy settings

Closes #3942
Closes #3941

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 8e8d2cccbcca40413a306c596404a075cfadd5f3..82d256404e1b4b6cf9e1a649078940e9f819e8c7 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -219,6 +219,9 @@
                        <category name="message.general.image">
                                <parent>message.general</parent>
                        </category>
+                       <category name="message.general.imageProxy">
+                               <parent>message.general</parent>
+                       </category>
                        <category name="message.attachment">
                                <parent>message</parent>
                        </category>
@@ -1080,24 +1083,24 @@ XING</selectoptions>
                                <defaultvalue>0</defaultvalue>
                        </option>
                        <option name="module_image_proxy">
-                               <categoryname>message.general.image</categoryname>
+                               <categoryname>message.general.imageProxy</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
                                <enableoptions>image_proxy_insecure_only,image_proxy_enable_prune,image_proxy_expiration,image_proxy_host_whitelist</enableoptions>
                        </option>
                        <option name="image_proxy_insecure_only">
-                               <categoryname>message.general.image</categoryname>
+                               <categoryname>message.general.imageProxy</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
                        </option>
                        <option name="image_proxy_enable_prune">
-                               <categoryname>message.general.image</categoryname>
+                               <categoryname>message.general.imageProxy</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
                                <enableoptions>image_proxy_expiration</enableoptions>
                        </option>
                        <option name="image_proxy_expiration">
-                               <categoryname>message.general.image</categoryname>
+                               <categoryname>message.general.imageProxy</categoryname>
                                <optiontype>integer</optiontype>
                                <defaultvalue>14</defaultvalue>
                                <minvalue>7</minvalue>
@@ -1105,7 +1108,7 @@ XING</selectoptions>
                                <suffix>days</suffix>
                        </option>
                        <option name="image_proxy_host_whitelist">
-                               <categoryname>message.general.image</categoryname>
+                               <categoryname>message.general.imageProxy</categoryname>
                                <optiontype>textarea</optiontype>
                        </option>
                        <!-- /message.general.image -->

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c8fa25244d8e762fcb24623e8fe4b83be594e10d..35b467e80f8b8d7125a82aa604e035ef83bc3fc1 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1674,10 +1674,11 @@ Als Benachrichtigungs-URL in der Konfiguration der sofortigen Zahlungsbestätigu
                <item name="wcf.acp.option.article_related_articles_match_threshold.description"><![CDATA[Menge an Tags, die für eine Erkennung als verwandter Artikel übereinstimmen müssen.]]></item>
                <item name="wcf.acp.option.article_show_about_author"><![CDATA[„Über den Autor“ anzeigen]]></item>
                <item name="wcf.acp.option.category.message.general.image"><![CDATA[Bilder]]></item>
+               <item name="wcf.acp.option.category.message.general.imageProxy"><![CDATA[Zwischenspeicherung von externen Bilder]]></item>
                <item name="wcf.acp.option.module_article"><![CDATA[Artikel]]></item>
                <item name="wcf.acp.option.message_force_secure_images"><![CDATA[Nur sichere Bilder in Nachrichten erlauben]]></item>
                <item name="wcf.acp.option.message_force_secure_images.description"><![CDATA[Bilder dürfen nur über das verschlüsselte „https“-Protokoll eingebunden werden. Bereits in bestehenden Nachrichten hinterlegte Bilder werden zwangsweise auf dieses Protokoll umgeschrieben.]]></item>
-               <item name="wcf.acp.option.module_image_proxy"><![CDATA[Zwischenspeicherung von externen Bilder aktivieren]]></item>
+               <item name="wcf.acp.option.module_image_proxy"><![CDATA[Zwischenspeicherung von externen Bilder aktivieren („Image-Proxy“)]]></item>
                <item name="wcf.acp.option.image_proxy_expiration"><![CDATA[Maximale Speicherzeit]]></item>
                <item name="wcf.acp.option.image_proxy_insecure_only"><![CDATA[Nur Bilder aus unverschlüsselten Quellen zwischenspeichern]]></item>
                <item name="wcf.acp.option.image_proxy_enable_prune"><![CDATA[Zwischengespeicherte Bilder regelmäßig löschen]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6ddd28ca61ddb2dc76edf0a885b5d53b08fc0ddb..864550f6b5fe35c30bf78dfda7adfc9c8b8bfdf7 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1658,6 +1658,7 @@ When prompted for the notification URL for the instant payment notifications, pl
                <item name="wcf.acp.option.article_related_articles_match_threshold.description"><![CDATA[The minimum amount of tags that both articles have in common.]]></item>
                <item name="wcf.acp.option.article_show_about_author"><![CDATA[Display “about the author” box]]></item>
                <item name="wcf.acp.option.category.message.general.image"><![CDATA[Images]]></item>
+               <item name="wcf.acp.option.category.message.general.imageProxy"><![CDATA[Image Proxy]]></item>
                <item name="wcf.acp.option.module_article"><![CDATA[Articles]]></item>
                <item name="wcf.acp.option.message_force_secure_images"><![CDATA[Allow secure images only]]></item>
                <item name="wcf.acp.option.message_force_secure_images.description"><![CDATA[Images may only be embedded using the encrypted “https”-protocol. Images in already existing messages will be force-rewritten to use the secure protocol.]]></item>