inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
102454:     revert 102447-102450,102442,102440,102437 as the config in MergeMonkey was ahead of the current state and as a result changes were discarded.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-04-24 11:21:49 +00:00
parent 7b4afba82c
commit 0ec81d89a6
17 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/workflow/workflow-messages_de.properties
View File

@@ -229,4 +229,3 @@ listconstraint.wf_reviewOutcomeOptions.Reject=Ablehnen
workflowtask.outcome.Approve=Genehmigt
workflowtask.outcome.Reject=Abgelehnt
workflowtask.already.done.error=Diese Aufgabe wurde bereits abgeschlossen und kann nicht mehr bearbeitet werden.

24
config/alfresco/workflow/workflow-messages_it.properties
View File

@@ -45,7 +45,7 @@ wf_review.node.end.description=Fine
#
wf_parallelreview.workflow.title=Esamina e approva in parallelo (JBPM)
wf_parallelreview.workflow.description=Esamina e approva contenuti in parallelo utilizzando il motore di workflow JBPM
wf_parallelreview.workflow.description=Esamina e approva in parallelo contenuti utilizzando il motore di workflow JBPM
# Parallel Review Process Definitions
@@ -59,7 +59,7 @@ wf_parallelreview.node.review.transition.approve.description=Approva
#
wf_reviewpooled.workflow.title=Esamina e approva in pool (JBPM)
wf_reviewpooled.workflow.description=Esamina e approva contenuti in pool utilizzando il motore di workflow JBPM
wf_reviewpooled.workflow.description=Esamina e approva in pool contenuti utilizzando il motore di workflow JBPM
# Pooled Review Process Definitions
@@ -73,7 +73,7 @@ wf_reviewpooled.node.review.transition.approve.description=Approva
#
wf_parallelgroupreview.workflow.title=Esamina e approva in gruppo (JBPM)
wf_parallelgroupreview.workflow.description=Esamina e approva contenuti in gruppo utilizzando il motore di workflow JBPM
wf_parallelgroupreview.workflow.description=Esamina e approva in gruppo contenuti utilizzando il motore di workflow JBPM
# Parallel Group Review Process Definitions
@@ -91,13 +91,13 @@ wf_parallelgroupreview.node.review.transition.approve.description=Approva
#
activitiAdhoc.workflow.title=Nuovo compito
activitiAdhoc.workflow.description=Assegna un nuovo compito a se stessi o a un collega
activitiAdhoc.workflow.description=Assegna un nuovo compito a te stesso o a un collega
#
# Activiti Review And Approve Workflow
#
activitiReview.workflow.title=Esamina e approva (esaminatore singolo)
activitiReview.workflow.description=Assegna un compito di esame a un solo esaminatore
activitiReview.workflow.description=Assegna un'attivit\u00e0 di esame a un esaminatore singolo.
activitiReview.task.approved.description=Il documento \u00e8 stato esaminato e approvato.
activitiReview.task.rejected.description=Il documento \u00e8 stato esaminato e respinto.
@@ -106,7 +106,7 @@ activitiReview.task.rejected.description=Il documento \u00e8 stato esaminato e r
#
activitiParallelReview.workflow.title=Esamina e approva (uno o pi\u00f9 esaminatori)
activitiParallelReview.workflow.description=Assegna un compito di esame a pi\u00f9 esaminatori
activitiParallelReview.workflow.description=Assegna un'attivit\u00e0 di esame a pi\u00f9 esaminatori
activitiParallelReview.task.approved.description=Il documento \u00e8 stato esaminato e approvato.
activitiParallelReview.task.rejected.description=Il documento \u00e8 stato esaminato e respinto.
@@ -115,7 +115,7 @@ activitiParallelReview.task.rejected.description=Il documento \u00e8 stato esami
#
activitiReviewPooled.workflow.title=Esamina e approva (esame in pool)
activitiReviewPooled.workflow.description=Assegna un compito di esame a pi\u00f9 esaminatori che possono assumersi la propriet\u00e0 del compito
activitiReviewPooled.workflow.description=Assegna un'attivit\u00e0 di esame a pi\u00f9 esaminatori che possono assumere la propriet\u00e0 dell'attivit\u00e0
activitiReviewPooled.task.approved.description=Il documento \u00e8 stato esaminato e approvato.
activitiReviewPooled.task.rejected.description=Il documento \u00e8 stato esaminato e respinto.
@@ -123,8 +123,8 @@ activitiReviewPooled.task.rejected.description=Il documento \u00e8 stato esamina
# Activiti Parallel Group Review Workflow
#
activitiParallelGroupReview.workflow.title=Esamina e approva (esame di gruppo)
activitiParallelGroupReview.workflow.description=Assegna un compito di esame a un gruppo
activitiParallelGroupReview.workflow.title=Esamina e approva (esame d gruppo)
activitiParallelGroupReview.workflow.description=Assegna un'attivit\u00e0 di esame a un gruppo
activitiParallelGroupReview.task.approved.description=Il documento \u00e8 stato esaminato e approvato.
activitiParallelGroupReview.task.rejected.description=Il documento \u00e8 stato esaminato
@@ -179,7 +179,7 @@ wf_workflowmodel.property.wf_reviewOutcome.description=Approva o respingi il con
# Parallel Review And Approve Task Definitions
wf_workflowmodel.type.wf_submitParallelReviewTask.title=Invia documenti da esaminare
wf_workflowmodel.type.wf_submitParallelReviewTask.description=Richiede l'approvazione del documento di uno o pi\u00f9 colleghi
wf_workflowmodel.type.wf_submitParallelReviewTask.description=Richiedi l'approvazione del documento da uno o pi\u00f9 colleghi
wf_workflowmodel.property.wf_requiredApprovePercent.title=Percentuale di approvazioni richiesta
wf_workflowmodel.property.wf_requiredApprovePercent.description=Percentuale di esaminatori che devono approvare il contenuto per l'approvazione
wf_workflowmodel.type.wf_rejectedParallelTask.title=Respinto
@@ -198,7 +198,7 @@ wf_workflowmodel.property.wf_reviewOutcome.title=Esamina risultato
wf_workflowmodel.property.wf_reviewOutcome.description=Esamina risultato
activitiParallelReview.task.wf_submitParallelReviewTask.title=Invia documenti da esaminare
activitiParallelReview.task.wf_submitParallelReviewTask.description=Richiede l'approvazione del documento a uno o pi\u00f9 colleghi
activitiParallelReview.task.wf_submitParallelReviewTask.description=Richiedi l'approvazione del documento da uno o pi\u00f9 colleghi
activitiParallelReview.property.wf_requiredApprovePercent.title=Percentuale di approvazioni richiesta
activitiParallelReview.property.wf_requiredApprovePercent.description=Percentuale di esaminatori che devono approvare il contenuto per l'approvazione
activitiParallelReview.task.wf_activitiReviewTask.title=Esamina
@@ -229,5 +229,3 @@ listconstraint.wf_reviewOutcomeOptions.Reject=Respingi
workflowtask.outcome.Approve=Approvato
workflowtask.outcome.Reject=Respinto
workflowtask.already.done.error=Questo compito \u00e8 gi\u00e0 stato completato e non \u00e8 pi\u00f9 modificabile.

1
config/alfresco/workflow/workflow-messages_ja.properties
View File

@@ -229,4 +229,3 @@ listconstraint.wf_reviewOutcomeOptions.Reject=\u5374\u4e0b
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

1
config/alfresco/workflow/workflow-messages_nb.properties
View File

@@ -229,4 +229,3 @@ listconstraint.wf_reviewOutcomeOptions.Reject=Avvis
workflowtask.outcome.Approve=Godkjent
workflowtask.outcome.Reject=Avvist
workflowtask.already.done.error=Denne oppgaven er allrerede fulf\u00f8rt og kan ikke lenger redigeres.

1
config/alfresco/workflow/workflow-messages_zh_CN.properties
View File

@@ -229,4 +229,3 @@ 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