Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-23 16:39:21 +00:00
parent 7440ae18a6
commit a5d07e1069
18 changed files with 179 additions and 31 deletions

View File

@@ -2,5 +2,5 @@
lock_service.insufficent_privileges=You have insufficent privileges to release the lock on the node (id: {0}). The node is locked by another user.
lock_service.node_locked=The node (id: {0}) could not be locked since it is already locked by another user.
lock_service.no_op=Can not perform operation since the node (id:{0}) is locked by another user.
lock_service.no_op2=Can not perform operation {0} since the node (id:{1}) is locked by another user.
lock_service.no_op=Can not perform operation since the node (id:{0}) is locked.
lock_service.no_op2=Can not perform operation {0} since the node (id:{1}) is locked.