Merge remote-tracking branch 'origin/support-3.7' into support-3.7

gui/admin-gui/src/main/resources/localization/Midpoint.properties

@@ -77,7 +77,8 @@ MetadataPanel.modifyApprovalTimestamp=Modify approval timestamp
 RelationTypes.MANAGER=Manager
 RelationTypes.OWNER=Owner
 RelationTypes.APPROVER=Approver
-RelationTypes.MEMBER=Member
+RelationTypes.MEMBER=Default
+RelationTypes.ANY=Any
 DelegationEditorPanel.from=From
 DelegationEditorPanel.to=To
 DelegationEditorPanel.meLabel=Current user
@@ -211,6 +212,11 @@ Channel.reconciliation=Reconciliation
 Channel.recompute=Recompute
 Channel.user=User
 Channel.webService=Web Service
+Channel.resetPassword=Password reset
+Channel.selfRegistration=Self registration
+Channel.init=Initialization
+Channel.rest=REST
+Channel.objectImport=Object import
 CheckTableHeader.label.error=Error
 CheckTableHeader.protected=Protected
 CheckTableHeader.showMore=Show more
@@ -287,10 +293,18 @@ DropDownChoicePanel.empty=Choose one
 DropDownChoicePanel.notDefined=Undefined
 EmptyProcessDetailsPanel.message=Process details are not available.
 ExecuteChangeOptionsPanel.label.executeAfterAllApprovals=Execute after all approvals
+ExecuteChangeOptionsPanel.label.executeAfterAllApprovals.help=If checked, execution of changes is delayed until all the required approvals are gathered. \
+  If unchecked, partial changes are executed as soon as they are approved - or immediately, if no approval is required.
 ExecuteChangeOptionsPanel.label.force=Force
+ExecuteChangeOptionsPanel.label.force.help=Force the operation even if it would otherwise fail due to an external failure. E.g. attempt to delete an account that no longer exists on resource may fail without a Force option. \
+  If this option is used then the operation is finished even if the account does not exist (meaning that - at least - shadow is removed from midPoint repository).
 ExecuteChangeOptionsPanel.label.keepDisplayingResults=Keep displaying results
+ExecuteChangeOptionsPanel.label.keepDisplayingResults.help=Should the execution results and operational statistics be displayed even after the operation completes? \
+  If not checked, the page with results and statistics will disappear automatically on operation completion.
 ExecuteChangeOptionsPanel.label.reconcileAffected=Reconcile affected objects
+ExecuteChangeOptionsPanel.label.reconcileAffected.help=Reconcile affected objects
 ExecuteChangeOptionsPanel.label.reconcile=Reconcile
+ExecuteChangeOptionsPanel.label.reconcile.help=Option to reconcile focus and all projections while executing changes.
 ExecuteChangeOptionsPanel.options=Options
 existenceFetchStrategy.nullValid=Choose One
 ExportType.CSV=CSV
@@ -654,6 +668,7 @@ ObjectTypeGuiDescriptor.user=User
 ObjectTypeGuiDescriptor.service=Service
 ObjectTypeGuiDescriptor.case=Case
 ObjectTypeGuiDescriptor.valuePolicy=Value policy
+ObjectTypeGuiDescriptor.functionLibrary=Function library
 ObjectTypeGuiDescriptor.unknown=Not defined
 operation.com.evolveum.midpoint.common.crypto.CryptoUtil.securitySelfTest=Security self test
 operation.com.evolveum.midpoint.common.operation.import.object=Import object
@@ -968,11 +983,11 @@ PageAbout.button.reindexRepositoryObjects=Reindex repository objects
 PageAbout.button.testRepository=Repository self test
 PageAbout.button.clearCssJsCache=Clear CSS/JS cache
 PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
-PageAbout.midPointRevision=git-v3.7devel-1345-ga70a981bb6
+PageAbout.midPointRevision=${git.describe}
 PageAbout.builtAt=Build at
-PageAbout.build=Pá, 8 Pro 2017 12:44:30 +0000
+PageAbout.build=${timestamp}
 PageAbout.midPointRevisionTitle=Git describe
-PageAbout.midPointVersion=3.7-SNAPSHOT
+PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Version
 PageAbout.repoDiag.additionalDetails.name=Name
 PageAbout.repoDiag.additionalDetails.value=Value
@@ -1186,6 +1201,7 @@ PageBase.button.abort=Abort
 PageBase.button.back=Back
 PageBase.button.cancel=Cancel
 PageBase.button.delete=Delete
+PageBase.button.unassign=Unassign
 PageBase.button.edit=Edit
 PageBase.button.run=Run
 PageBase.button.saveAndRun=Save & Run
@@ -1194,7 +1210,7 @@ PageBase.button.search=Search
 PageBase.button.send=Send
 PageBase.button.update=Update
 PageBase.clearCssCache=Clear less/js cache
-pageBase.midPointVersion=3.7-SNAPSHOT, git-v3.7devel-1345-ga70a981bb6
+pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
 PageBase.subscriptionMessage=Non-subscription.
 PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription.
@@ -1291,6 +1307,7 @@ PageCertCampaigns.table.name=Name
 PageCertCampaigns.table.stages=Stages
 PageCertCampaigns.table.stage=Stage
 PageCertCampaigns.table.state=State
+PageCertCampaigns.search.state=State
 PageCertCampaign.stageTime=Stage time
 PageCertCampaign.escalationLevel=Escalation level
 PageCertCampaign.statistics.accept=Accept
@@ -1986,6 +2003,7 @@ pageTask.category.Recomputation=Recomputation
 pageTask.category.Reconciliation=Reconciliation
 pageTask.category.UserRecomputation=User recomputation
 pageTask.category.Workflow=Workflow
+pageTask.category.Custom=Custom
 pageTask.createSuspended=Create in SUSPENDED state
 pageTask.cronHelp=Cron-like specification is in the form: SECONDS MINUTES HOURS DAY-OF-MONTH MONTH DAY-OF-WEEK YEAR (optional), e.g. '0 0 12 ? * WED' which means 'every Wednesday at 12:00:00 pm'.
 pageTask.cronHelpLink=For more information, please see
@@ -2129,6 +2147,7 @@ pageTasks.category.System=System
 pageTasks.category.UserRecomputation=User recomputation
 pageTasks.category.Utility=Utility
 pageTasks.category.Workflow=Workflow
+pageTasks.category.Custom=Custom
 pageTasks.category.ExecuteChanges=Execute changes
 pageTasks.message.suspendAction=suspend
 pageTasks.message.resumeAction=resume
@@ -2363,6 +2382,10 @@ pageWorkItems.item.owner=Owner
 pageWorkItems.item.status=Status
 pageWorkItems.message.noItemSelected=No work item has been selected.
 pageWorkItems.message.noItemToBeReleased=None of the work items can be released (most probably because they were not claimed by the user).
+pageWorkItems.message.success.approved=The work item(s) have been successfully approved.
+pageWorkItems.message.success.rejected=The work item(s) have been successfully rejected.
+pageWorkItems.message.success.claimed=The work item(s) have been successfully claimed.
+pageWorkItems.message.success.released={0} work item(s) have been successfully released.
 PageWorkItemsAll.title=All work items
 PageWorkItemsAllocatedToMe.title=Work items allocated to me
 PageWorkItem.title=Work item details
@@ -3118,7 +3141,7 @@ LdapAuthenticationProvider.badCredentials=Invalid username and/or password.
 LdapAuthenticationProvider.emptyUsername=Empty username.
 LdapAuthentication.incorrect.value=MidPoint principal type doesn't match.
 LdapAuthentication.bad.user=Unknown user.
-UserProfileServiceImpl.unknownUser=Couldn''t find user with name ''{0}'', reason: {1}.
+UserProfileServiceImpl.unknownUser=Couldn't find user.
 AbstractLdapAuthenticationProvider.emptyPassword=Empty password.
 BindAuthenticator.badCredentials=Invalid username and/or password.
 WfDeltasPanel.label.deltaIn=Process input: delta(s) to be approved
@@ -3806,10 +3829,6 @@ ApprovalProcessExecutionInformationPanel.performer=Performer
 ApprovalProcessExecutionInformationPanel.attorney=Attorney
 ApprovalProcessExecutionInformationPanel.stage=Stage
 PageImportResource.title=Import resource definition
-AssignmentType.activation=Activation
-AssignmentType.lifecycleState=Lifecycle state
-AssignmnetType.accepted=Accepted
-AssignmentType.policySituation=Policy situation
 ObjectReferenceType.relation=Relation
 FocusType.consents=Consents
 AbstractAssignmentDetailsPanel.properties=Properties
@@ -3839,6 +3858,7 @@ ValuePolicyBasicPanel.valuePolicy.name=Name
 ValuePolicyBasicPanel.valuePolicy.description=Description
 comboInput.nullValid=Choose one
 ContainerPanel.containerProperties=Properties
+PageOperationResult.title=Operation result
 PageOperationResult.noResultAvailable=No operation result available. It was probably "deleted" via script hook.
 PageInternals.tab.clock=Clock
 PageInternals.tab.debugUtil=Debug util
@@ -3896,4 +3916,16 @@ RoleRelationSelectionPanel.owner=Owner
 TreeTablePanel.menu.unassignApproversSelected=Unassign selected approvers
 TreeTablePanel.menu.unassignOwnersSelected=Unassign selected owners
 TreeTablePanel.menu.unassignManagersSelected=Unassign selected managers
-Button.cancel=Cancel
+Button.cancel=Cancel
+RoleRelationSelectionPanel.select.relation=Select relations to process
+operation.com.evolveum.midpoint.web.page.admin.workflow.PageWorkItem.delegateWorkItem=Delegate work item
+AbstractRoleAssignmentPanel.relationLabel=Relation
+AbstractRoleMainPanel.inducedEntitlements=Induced entitlements
+CertCampaignStateFilter.ALL=All campaign states
+CertCampaignStateFilter.NOT_CLOSED=Not closed
+CertCampaignStateFilter.CREATED=Created
+CertCampaignStateFilter.IN_REVIEW_STAGE=In review stage
+CertCampaignStateFilter.REVIEW_STAGE_DONE=Review stage done
+CertCampaignStateFilter.IN_REMEDIATION=In remediation
+CertCampaignStateFilter.CLOSED=Closed
+pageAdminFocus.dataProtection=Data protection