From 82f9dc1d6a8024c27b0a8018006ca29367e16f57 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 29 May 2015 13:51:52 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 105081: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 105070: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3) 104989: GERMAN: German files updated as per EN-rev104967 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/file-folder-service_de.properties | 1 + config/alfresco/workflow/workflow-messages_de.properties | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 config/alfresco/messages/file-folder-service_de.properties diff --git a/config/alfresco/messages/file-folder-service_de.properties b/config/alfresco/messages/file-folder-service_de.properties new file mode 100644 index 0000000000..65672bd643 --- /dev/null +++ b/config/alfresco/messages/file-folder-service_de.properties @@ -0,0 +1 @@ +file_folder_service.file_exists_message=Datei oder Ordner {0} bereits vorhanden \ No newline at end of file diff --git a/config/alfresco/workflow/workflow-messages_de.properties b/config/alfresco/workflow/workflow-messages_de.properties index a062861248..afc30fba2c 100755 --- a/config/alfresco/workflow/workflow-messages_de.properties +++ b/config/alfresco/workflow/workflow-messages_de.properties @@ -227,6 +227,4 @@ listconstraint.wf_reviewOutcomeOptions.Reject=Ablehnen # 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=Genehmigt -workflowtask.outcome.Reject=Abgelehnt - -workflowtask.already.done.error=Diese Aufgabe wurde bereits abgeschlossen und kann nicht mehr bearbeitet werden. \ No newline at end of file +workflowtask.outcome.Reject=Abgelehnt \ No newline at end of file