Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

102458: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102346: SIMP CHINESE: Updated Simplified Chinese files based on EN-rev101823. Also this commit is a fix for ACE-3931.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-04-24 11:22:38 +00:00
parent fca1606a04
commit 86d7ca94cd
2 changed files with 2 additions and 1 deletions

View File

@@ -229,3 +229,4 @@ listconstraint.wf_reviewOutcomeOptions.Reject=\u62d2\u7edd
workflowtask.outcome.Approve=\u5df2\u6279\u51c6
workflowtask.outcome.Reject=\u5df2\u62d2\u7edd
workflowtask.already.done.error=\u6b64\u4efb\u52a1\u5df2\u5b8c\u6210\uff0c\u65e0\u6cd5\u518d\u7f16\u8f91\u3002