From 3b3340d84cf7206a4718a4983173a33aae58eed5 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 24 Apr 2015 11:06:35 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 102446: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 102345: BRAZILIAN: Updated Brazilian Portuguese 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@102556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/invitation-service_pt_BR.properties | 2 +- config/alfresco/workflow/workflow-messages_pt_BR.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/alfresco/messages/invitation-service_pt_BR.properties b/config/alfresco/messages/invitation-service_pt_BR.properties index 8b55565f8e..b5f8784864 100644 --- a/config/alfresco/messages/invitation-service_pt_BR.properties +++ b/config/alfresco/messages/invitation-service_pt_BR.properties @@ -7,7 +7,7 @@ invitation.error.not_found=''Convite n\u00e3o encontrado, invitationId: {0}'' invitation.error.not_found_by_invitee=''Convite n\u00e3o encontrado para o site: {0}, convidado: {1}'' invitation.error.invalid_inviteId_format=''O formato de ID do convite n\u00e3o \u00e9 v\u00e1lido, os formatos v\u00e1lidos s\u00e3o $: {0}'' invitation.invite.already_member=''O usu\u00e1rio {0} j\u00e1 um membro de {1} e n\u00e3o pode ser convidado novamente'' -invitation.invite.user_disabled=''{0} foi desativado e n\u00e3o ode ser convidado'' +invitation.invite.user_disabled=''{0} foi desativado e n\u00e3o pode ser convidado'' invitation.cancel.not_site_manager=''O usu\u00e1rio atual, {0}, n\u00e3o pode cancelar o convite: {1} porque n\u00e3o \u00e9 um gerenciador do site: {2}'' invitation.invite.not_site_manager=''O usu\u00e1rio atual, {0}, n\u00e3o \u00e9 gerenciador do site: {1}'' invitation.invite.unable_generate_id=''N\u00e3o \u00e9 poss\u00edvel gerar um nome de usu\u00e1rio para o convidado que ainda n\u00e3o perten\u00e7a a outra pessoa firstName:{0} lastName:{1} email:{2}'' diff --git a/config/alfresco/workflow/workflow-messages_pt_BR.properties b/config/alfresco/workflow/workflow-messages_pt_BR.properties index c6d63b40b4..3304b4134c 100644 --- a/config/alfresco/workflow/workflow-messages_pt_BR.properties +++ b/config/alfresco/workflow/workflow-messages_pt_BR.properties @@ -229,3 +229,4 @@ listconstraint.wf_reviewOutcomeOptions.Reject=Rejeitar workflowtask.outcome.Approve=Aprovado workflowtask.outcome.Reject=Rejeitado +workflowtask.already.done.error=Esta tarefa foi conclu\u00edda e n\u00e3o \u00e9 mais edit\u00e1vel. \ No newline at end of file