commit 96e25f527862faec7a8cc2e431c756303573302d parent f7f283a86e814e56733ae530703b171de63aa58f Author: dankert <devnull@localhost> Date: Thu, 30 Apr 2009 19:48:45 +0200 Neuer Schluessel Diffstat:
language/en.ini.php | | | 5 | +++-- |
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/language/en.ini.php b/language/en.ini.php @@ -1022,4 +1022,6 @@ DOCUMENT_TREE = "Document tree" NOTICE_MAX_FILE_SIZE_EXCEEDED="The maximum filesize is exceeded" MENU_TITLE_FILE_RIGHTS="File-Rights" INHERIT_RIGHTS = "Reset rights in all Sub-objects and inherit the inheritable rights from this folder." -NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="The user-group-relations my conflict with the directory service. Memberships were synchronized at login time."- \ No newline at end of file +NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="The user-group-relations my conflict with the directory service. Memberships were synchronized at login time." +NOTICE_CONCURRENT_VALUE_CHANGE="While your edit session another user has changed this content at {last_change_time}. Your changes where saved, but you should check the archive if the overwritten content should be merged." +NOTICE_CONCURRENT_VALUE_CHANGE_NOT_SAVED="While your edit session another user has changed this content at {last_change_time}. Your changes where not saved."