X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/1fbf10bec35aeb289a9cf3e1c65a826883bffdea..59507c0a5e5507868ebf6db407219da3f17c8ed9:/errors.conf?ds=sidebyside

diff --git a/errors.conf b/errors.conf
index 78913e9..5357936 100644
--- a/errors.conf
+++ b/errors.conf
@@ -8,18 +8,19 @@ 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).
-forbidden_file    = Dev-Editor is configued to forbid accessing this file.
+forbidden_file    = Dev-Editor is configured to forbid accessing this file.
 invalid_group     = '{GROUP}' seems to be an invalid group name. Please check it and try again.
 invalid_mode      = To change the group of a file or directory, you have to enter an octal number which has at least three digits.
 invalid_upload    = It seems that something is wrong with the file upload you want to submit.