Merge V1.4 to HEAD

- Ignored Enterprise-specific changes
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3701 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3703 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3704 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3705 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3707 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 .
   svn revert root\projects\web-client\source\web\jsp\admin\admin-console.jsp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-09-21 23:35:51 +00:00
parent 89f39cd176
commit d2bce74f0b
103 changed files with 3569 additions and 1172 deletions

View File

@@ -4,8 +4,8 @@ bpm_businessprocessmodel.title=Business Process Model
bpm_businessprocessmodel.description=Base definitions of all Business Processes
# Default transition
bpm_businessprocessmodel.transition.title=Done
bpm_businessprocessmodel.transition.description=Done
bpm_businessprocessmodel.transition.title=Task Done
bpm_businessprocessmodel.transition.description=Task Done
# Base Task
bpm_businessprocessmodel.type.bpm_task.title=Task
@@ -36,6 +36,8 @@ bpm_businessprocessmodel.property.bpm_workflowInstanceId.title=Workflow Instance
bpm_businessprocessmodel.property.bpm_workflowInstanceId.description=Workflow Instance Id
bpm_businessprocessmodel.property.bpm_context.title=Task Context
bpm_businessprocessmodel.property.bpm_context.description=The context within which this task has been assigned
bpm_businessprocessmodel.property.bpm_description.title=Task Description
bpm_businessprocessmodel.property.bpm_description.description=Description of what needs to be achieved
bpm_businessprocessmodel.property.bpm_outcome.title=Task Outcome
bpm_businessprocessmodel.property.bpm_outcome.description=Decision made on completing Task
bpm_businessprocessmodel.property.bpm_completedItems.title=Completed Items
@@ -48,3 +50,15 @@ bpm_businessprocessmodel.association.bpm_package.title=Content Package
bpm_businessprocessmodel.association.bpm_package.description=The collection of content routed through the workflow
bpm_businessprocessmodel.aspect.bpm_workflowPackage.title=Workflow Package
bpm_businessprocessmodel.aspect.bpm_workflowPackage.description=The collection of content routed through the workflow
# Workflow Start Task
bpm_businessprocessmodel.type.bpm_startTask.title=Workflow Start Task
bpm_businessprocessmodel.type.bpm_startTask.description=Task used to collect information required for initiating Workflow
bpm_businessprocessmodel.property.bpm_workflowDescription.title=Description
bpm_businessprocessmodel.property.bpm_workflowDescription.description=Description
bpm_businessprocessmodel.property.bpm_workflowDueDate.title=Workflow Due Date
bpm_businessprocessmodel.property.bpm_workflowDueDate.description=Workflow Due Date
bpm_businessprocessmodel.property.bpm_workflowPriority.title=Workflow Priority
bpm_businessprocessmodel.property.bpm_workflowPriority.description=Workflow Priority
bpm_businessprocessmodel.association.bpm_assignee.title=Workflow Assignee
bpm_businessprocessmodel.association.bpm_assignee.description=Workflow Assignee