Merged V3.1 to HEAD

13356: Fix for ETHREEOH-1297.
          Fixes the more general issue that content related FreeMarker APIs on AVM Template Nodes were broken since 3.0.
   13357: Fix for ETHREEOH-1445 - missing I18N labels for Site Invite workflow.
   13375: Another I18N missing label patch to workflow tasks from wabson.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-12 11:58:13 +00:00
parent 5b098b6f10
commit 3ad54f1933
3 changed files with 113 additions and 2 deletions

View File

@@ -23,4 +23,5 @@ wf_invitation-moderated.node.review.transition.approve.title=Approve
wf_invitation-moderated.node.review.transition.approve.description=Approve
wf_invitation-moderated.node.review.transition.cancel.title=Cancel
wf_invitation-moderated.node.review.transition.cancel.description=Cancel
wf_invitation-moderated.node.end.title=End
wf_invitation-moderated.node.end.description=End

View File

@@ -31,11 +31,15 @@ wf_invitation-nominated.node.invitePending.transition.cancel.title=Cancel
wf_invitation-nominated.node.invitePending.transition.cancel.description=Cancel
wf_invitation-nominated.node.inviteRejected.title=Rejected
wf_invitation-nominated.node.inviteRejected.description=Rejected
wf_invitation-nominated.node.inviteRejected.transition.end.title=End
wf_invitation-nominated.node.inviteRejected.transition.end.description=End
wf_invitation-nominated.task.wf_rejectInviteTask.title=Rejected
wf_invitation-nominated.task.wf_rejectInviteTask.description=Rejected
wf_invitation-nominated.node.inviteAccepted.title=Accepted
wf_invitation-nominated.node.inviteAccepted.description=Accepted
wf_invitation-nominated.node.inviteAccepted.transition.end.title=End
wf_invitation-nominated.node.inviteAccepted.transition.end.description=End
wf_invitation-nominated.task.wf_acceptInviteTask.title=Accepted
wf_invitation-nominated.task.wf_acceptInviteTask.description=Accepted
wf_invitation-nominated.node.end.title=End
wf_invitation-nominated.node.end.description=End
wf_invitation-nominated.node.end.description=End