If "*" was supplied as a DOS wildcard, don't convert it to an ordinary regex,

[devedit.git] / errors.conf

diff --git a/errors.conf b/errors.conf
index b2cbb5768f8979e39ee41227afc48bfe4ba9493b..535793664594c6086f7e6af0252a4123891a8aee 100644 (file)
--- a/errors.conf
+++ b/errors.conf
@@ -8,14 +8,15 @@ command_unknown   = Unknown command: '{COMMAND}'
 copy_failed       = Could not copy '{FILE}' to '{NEW_FILE}'.
 create_above_root = You are not allowed to create files and directories above the virtual root directory.
 delete_failed     = Could not delete file '{FILE}'.
-dir_copy          = This editor is not able to copy directories.
+dir_copy_self     = You may not copy a directory into itself.
+dir_move_self     = You may not move a directory into itself.
 dir_edit          = You cannot edit directories.
 dir_no_create     = You have not enough permissions to create a file in directory '{DIR}'.
 dir_not_exist     = The directory where you want to create this file or directory does not exist.
 dir_read_failed   = Reading of directory '{DIR}' failed.
 dir_replace       = You are not allowed to replace a directory.
 edit_failed       = Saving of file '{FILE}' failed. The file could be damaged, please check its integrity.
-edit_file_changed = The file you want to edit changed meanwhile. Now, it looks like this: <a href="{SCRIPT}?command=show&amp;file={FILE_URL}">{FILE}</a>. Please try to merge these two versions of the file or save your version of the file using a different name.
+edit_file_changed = The file you want to edit changed meanwhile. Now, it looks like this: <a href="{SCRIPT}?command=show&amp;file={FILE_URL}">{FILE}</a>.
 exist_no_write    = The target file '{FILE}' already exists and you have not enough permissions to replace it.
 file_exists       = A file or directory called '{FILE}' already exists.
 file_too_large    = The file you want to view or edit is too large (max. {SIZE}&nbsp;Bytes).