X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/6cbef69555b48386fee70b73bac2c3df4d15ff6a..be298a203e5044131b71d108260859ce69ba4ee5:/errors.conf?ds=sidebyside

diff --git a/errors.conf b/errors.conf
index 83e924e..87c8914 100644
--- a/errors.conf
+++ b/errors.conf
@@ -4,6 +4,7 @@ above_root        = Accessing files and directories above the virtual root direc
 binary_file       = This editor is not able to view/edit binary files.
 chprop_link       = You are not allowed to change the properties of a symbolic link.
 chprop_root       = You are not allowed to change the properties of the root directory.
+command_disabled  = The command '{COMMAND}' has been disabled by the administrator.
 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.
@@ -16,7 +17,7 @@ dir_not_exist     = The directory where you want to create this file or director
 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).
@@ -33,6 +34,7 @@ no_copy           = You have not enough permissions to copy this file.
 no_delete         = You have not enough permissions to delete this file.
 no_dir_access     = You have not enough permissions to access this directory.
 no_directory      = '{FILE}' is not a directory.
+no_download       = You are not allowed to download '{FILE}'.
 no_edit           = You have not enough permissions to edit this file.
 no_rename         = You have not enough permissions to move/rename this file.
 no_root_access    = You have not enough permissions to access the root directory.