From e4a97a5036035b4ad7175a96e1809fe4e8278414 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 29 May 2015 13:52:23 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 105086: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 105074: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3) 104994: JAPANESE: Japanese files updated as per EN-rev104967 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105097 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/file-folder-service_ja.properties | 1 + config/alfresco/workflow/workflow-messages_ja.properties | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 config/alfresco/messages/file-folder-service_ja.properties diff --git a/config/alfresco/messages/file-folder-service_ja.properties b/config/alfresco/messages/file-folder-service_ja.properties new file mode 100644 index 0000000000..deed340b5b --- /dev/null +++ b/config/alfresco/messages/file-folder-service_ja.properties @@ -0,0 +1 @@ +file_folder_service.file_exists_message={0} \u3068\u3044\u3046\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30d5\u30a9\u30eb\u30c0\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059 \ No newline at end of file diff --git a/config/alfresco/workflow/workflow-messages_ja.properties b/config/alfresco/workflow/workflow-messages_ja.properties index 3610e8d886..027f8356e7 100755 --- a/config/alfresco/workflow/workflow-messages_ja.properties +++ b/config/alfresco/workflow/workflow-messages_ja.properties @@ -227,6 +227,4 @@ listconstraint.wf_reviewOutcomeOptions.Reject=\u5374\u4e0b # The result of a workflow task seen on Workflow Details - History # This is formed by prefixing workflowtask.outcome to the value of the wf:outcome property workflowtask.outcome.Approve=\u627f\u8a8d\u6e08\u307f -workflowtask.outcome.Reject=\u5374\u4e0b\u6e08\u307f - -workflowtask.already.done.error=\u3053\u306e\u30bf\u30b9\u30af\u306f\u3059\u3067\u306b\u5b8c\u4e86\u3057\u3066\u3044\u308b\u305f\u3081\u3001\u7de8\u96c6\u3067\u304d\u307e\u305b\u3093\u3002 \ No newline at end of file +workflowtask.outcome.Reject=\u5374\u4e0b\u6e08\u307f \ No newline at end of file