Reject `fileSystemPath`s matching an active app during import

[GitHub/WoltLab/WCF.git] / wcfsetup / install / lang / en.xml

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c39a946b115001350df39423f2c2589a66c5e4f5..90194e960800698a986bfbd153e3d6f428f02928 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -348,6 +348,7 @@
                <item name="wcf.acp.dataImport.configure.data"><![CDATA[Data]]></item>
                <item name="wcf.acp.dataImport.configure.data.description"><![CDATA[Import the data selected below:]]></item>
                <item name="wcf.acp.dataImport.configure.database"><![CDATA[Database Credentials]]></item>
+               <item name="wcf.acp.dataImport.configure.database.error.exception"><![CDATA[An error occurred while trying to access the database:<br><strong>{$exception->getPrevious()->getMessage()}</strong>]]></item>
                <item name="wcf.acp.dataImport.configure.database.host"><![CDATA[Hostname]]></item>
                <item name="wcf.acp.dataImport.configure.database.user"><![CDATA[Username]]></item>
                <item name="wcf.acp.dataImport.configure.database.password"><![CDATA[Password]]></item>
@@ -356,8 +357,8 @@
                <item name="wcf.acp.dataImport.configure.fileSystem"><![CDATA[Filesystem]]></item>
                <item name="wcf.acp.dataImport.configure.fileSystem.path"><![CDATA[Path to the Old Installation]]></item>
                <item name="wcf.acp.dataImport.configure.fileSystem.path.description"><![CDATA[Please enter the path to the old installation, this is required to import files, such as avatars or attachments.]]></item>
-               <item name="wcf.acp.dataImport.configure.database.error"><![CDATA[An error occurred while trying to access the database:<br><strong>{$exception->getPrevious()->getMessage()}</strong>]]></item>
-               <item name="wcf.acp.dataImport.configure.fileSystem.path.error"><![CDATA[Unable to find a valid installation located at the path you have provided.]]></item>
+               <item name="wcf.acp.dataImport.configure.fileSystem.path.error.invalid"><![CDATA[Unable to find a valid installation located at the path you have provided.]]></item>
+               <item name="wcf.acp.dataImport.configure.fileSystem.path.error.thisCommunity"><![CDATA[The provided path matches the path of an installed app.]]></item>
                <item name="wcf.acp.dataImport.configure.settings"><![CDATA[Settings]]></item>
                <item name="wcf.acp.dataImport.configure.settings.userMergeMode"><![CDATA[Behavior for colliding user accounts]]></item>
                <item name="wcf.acp.dataImport.configure.settings.userMergeMode.4"><![CDATA[Merge user accounts with same email address]]></item>
@@ -743,7 +744,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
                <item name="wcf.acp.group.option.user.attachment.maxSize"><![CDATA[Maximum Attachment File Size]]></item>
                <item name="wcf.acp.group.option.user.attachment.allowedExtensions"><![CDATA[Allowed Attachment File Extensions]]></item>
                <item name="wcf.acp.group.option.user.attachment.maxCount"><![CDATA[Maximum Attachments per Message]]></item>
-               <item name="wcf.acp.group.option.user.attachment.maxCount.description"><![CDATA[The maximum number of attachments allowed per message.]]></item>
                <item name="wcf.acp.group.option.category.admin.attachment"><![CDATA[Attachments]]></item>
                <item name="wcf.acp.group.option.admin.attachment.canManageAttachment"><![CDATA[Can manage attachments]]></item>
                <item name="wcf.acp.group.option.category.admin.content.bbcode"><![CDATA[BBCodes]]></item>
@@ -5573,5 +5573,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|langu
        <item name="wcf.acp.systemCheck.mysql.searchEngine"/>
        <item name="wcf.acp.systemCheck.mysql.searchEngine.description"/>
        <item name="wcf.acp.systemCheck.mysql.searchEngine.incorrect"/>
+       <item name="wcf.acp.group.option.user.attachment.maxCount.description"/>
 </delete>
 </language>