Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
katkav committed Oct 30, 2018
2 parents d198282 + f1f3f6d commit a8cf456
Show file tree
Hide file tree
Showing 35 changed files with 4,235 additions and 2,297 deletions.
Expand Up @@ -168,7 +168,7 @@ private void initDefaultSearchParameters(){
objectTypeDefaultValue = panelConfig.getSearchBoxConfiguration().getDefaultObjectType();
}
if (scopeDefaultValue == null){
scopeDefaultValue = SearchBoxScopeType.SUBTREE;
scopeDefaultValue = SearchBoxScopeType.ONE_LEVEL;
}
if (objectTypeDefaultValue == null){
objectTypeDefaultValue = WebComponentUtil.classToQName(getPrismContext(), getDefaultObjectType());
Expand Down

Large diffs are not rendered by default.

Expand Up @@ -1275,6 +1275,7 @@ PageRepositoryQuery.resultObjects=Result: retrieved {0} object(s)
PageRepositoryQuery.resultException=Ergebnis: {0}
PageRepositoryQuery.midPoint=MidPoint query
PageRepositoryQuery.objectType=Objekttyp:
PageRepositoryQuery.checkBox.distinct=Distinct
PageRepositoryQuery.hibernateQuery=Hibernate query
PageRepositoryQuery.hibernateParameters=Query parameters
PageRepositoryQuery.hibernateParametersNote=Note: The parameters are shown here only to indicate how midPoint query is translated into hibernate query. They are <b>not</b> used when manually executing a hibernate query, so the query you enter here should contain no references to parameters.
Expand Down Expand Up @@ -1347,6 +1348,10 @@ PageCertCampaigns.message.noCampaignsSelected=Keine relevanten Kampagnen ausgew
PageCertCampaigns.message.campaignToReiterateMustBeClosed=Campaign to be reiterated must be closed
PageCertCampaigns.message.campaignsToReiterateMustBeClosed=Campaigns to be reiterated must be closed
PageCertCampaigns.message.someCampaignsToReiterateAreNotClosed=Not all selected campaigns are closed ({0} of them). They will not be reiterated.
PageCertCampaigns.message.deleteCampaignsPerformed.success=The campaign(s) have been successfully deleted.
PageCertCampaigns.message.deleteCampaignsPerformed.partialError=Couldn't delete campaign.
PageCertCampaigns.message.actOnCampaignsPerformed.success={0} campaign(s) have been successfully processed.
PageCertCampaigns.message.actOnCampaignsPerformed.partialError=Couldn't process campaign.
PageCertCampaigns.nowForCampaign=(Kampagne: jetzt)
PageCertCampaigns.nowForStage=jetzt
PageCertCampaigns.table.deadline=Deadline der Phase (Kampagne)
Expand Down Expand Up @@ -1465,6 +1470,8 @@ PageCertDefinition.scopeIncludeResources=Ressourcen
PageCertDefinition.scopeIncludeByStatus=Einschließen nach Aktivierungsstatus
PageCertDefinition.scopeEnabledItemsOnly=Nur aktivierte Elemente
PageCertDefinition.stagesDefinition=Definition der Phasen
PageCertDefinitions.message.deleteDefinitionPerformed.success=The definition has been successfully deleted.
PageCertDefinitions.message.deleteDefinitionPerformed.partialError=Couldn't delete campaign definition.
PageCert.in=in {0}
PageCert.message.assignment={0} von {1} {2} bis {3} {4}.
PageCert.message.textAdministrativeState=Administrativer Status: {0}.
Expand Down Expand Up @@ -1864,6 +1871,9 @@ pageProcessInstances.item.stage=Phase
pageProcessInstances.item.status=Status
pageProcessInstances.message.noStoppableItemSelected=No process instance that could be stopped has been selected.
pageProcessInstances.message.noItemSelected=Es wurde keine Prozessinstanz ausgewählt
pageProcessInstances.message.stopProcessInstancesPerformed.success=Selected process instance(s) have been successfully stopped.
pageProcessInstances.message.stopProcessInstancesPerformed.partialError=Couldn't stop process instance {0}
pageProcessInstances.message.deleteProcessInstancesPerformed.success=Selected process instance(s) have been successfully deleted.
pageProcessInstances.notYet=noch nicht
PageProcessInstancesAll.title=Alle Bewilligungsanträge
PageProcessInstancesRequestedBy.title=Meine Bewilligungsanfragen
Expand Down Expand Up @@ -1972,6 +1982,9 @@ pageResources.message.refreshResourceSchemaConfirm=Do you really want to refresh
pageResources.message.noHostSelected=Es wurde kein Konnektor ausgewählt.
pageResources.message.noResourceSelected=Es wurde keine Ressource ausgewählt
pageResources.message.queryError=Fehler aufgetreten während der Übersetzung des Suchbegriffs zum Filter.
PageResources.message.deleteResourceConfirmedPerformed.success=The resource(s) have been successfully deleted.
PageResources.message.deleteResourceConfirmedPerformed.partialError=Couldn't delete resource.
PageResources.message.testResourcePerformed.partialError=Resource oid not defined in request
pageResources.name=Name
pageResources.progress=Fortschritt
pageResources.resources=Ressourcen
Expand Down Expand Up @@ -2022,6 +2035,10 @@ pageRoles.message.confirmationMessageForMultipleObject=Wollen Sie wirklich die a
pageRoles.message.confirmationMessageForSingleObject=Wollen Sie wirklich die Rolle '{1}' {0}?
pageRoles.message.confirmationMessageForMultipleObject.members=Wollen Sie wirklich die ausgewählte(n) {1} Rolle(n) {0}? Einige Rollen haben ein oder mehrere Mitglieder.
pageRoles.message.confirmationMessageForSingleObject.members=Wollen Sie wirklich die Rolle '{1}' {0}? Die ausgewählte Rolle hat mit ein oder Mitglieder.
pageServices.message.confirmationMessageForMultipleObject=Wollen Sie wirklich die selektierten {1} Services {0}?
pageServices.message.confirmationMessageForSingleObject=Wollen Sie wirklich Service '{1}' {0}?
pageServices.message.confirmationMessageForMultipleObject.members=Do you really want to {0} selected {1} service(s)? Some of the services have member(s).
pageServices.message.confirmationMessageForSingleObject.members=Do you really want to {0} service '{1}'? Selected service has member(s).
pageRoles.message.nothingSelected=Es wurde keine Rolle ausgewählt
pageRoles.message.queryError=Fehler aufgetreten während der Übersetzung des Suchbegriffs zum Filter.
pageRoles.requestable=Beantragbar
Expand Down Expand Up @@ -2241,7 +2258,32 @@ pageTasks.message.deleteWorkersAndWorkState=delete workers and work state of
pageTasks.message.deleteAllClosedTasksAction=Alle geschlossene Aufgaben löschen
pageTasks.message.startAction=starten
pageTasks.message.scheduleTaskAction=Aufgabe einplanen
pageTasks.message.stopSchedulerAction=Aufgabenplaner stoppen für
pageTasks.message.scheduleTasksPerformed.success=The task(s) have been successfully scheduled.
pageTasks.message.scheduleTasksPerformed.fatalError=Couldn't schedule the task(s)
pageTasks.message.stopSchedulersAndTasksPerformed.success=Selected node scheduler(s) have been successfully stopped, including tasks that were running on them.
pageTasks.message.stopSchedulersAndTasksPerformed.warning=Selected node scheduler(s) have been successfully paused; however, some of the tasks they were executing are still running on them. Please check their completion using task list.
pageTasks.message.stopSchedulersAndTasksPerformed.fatalError=Couldn't stop schedulers due
pageTasks.message.startSchedulersPerformed.success=Selected node scheduler(s) have been successfully started.
pageTasks.message.startSchedulersPerformed.fatalError=Couldn't start the scheduler(s)
pageTasks.message.stopSchedulersPerformed.success=Selected node scheduler(s) have been successfully stopped.
pageTasks.message.stopSchedulersPerformed.fatalError=Couldn't stop the scheduler(s)
pageTasks.message.deleteNodesPerformed.success=Selected node(s) have been successfully deleted.
pageTasks.message.deleteNodesPerformed.fatalError=Couldn't delete the node
pageTasks.message.deactivateServiceThreadsPerformed.success=Service threads on local node have been successfully deactivated.
pageTasks.message.deactivateServiceThreadsPerformed.warning=Deactivation of service threads on local node have been successfully requested; however, some of the tasks are still running. Please check their completion using task list.
pageTasks.message.deactivateServiceThreadsPerformed.fatalError=Couldn't deactivate service threads on this node
pageTasks.message.reactivateServiceThreadsPerformed.success=Service threads on local node have been successfully reactivated.
pageTasks.message.reactivateServiceThreadsPerformed.fatalError=Couldn't reactivate service threads on local node
pageTasks.message.deleteTaskConfirmedPerformed.success=The task(s) have been successfully deleted.
pageTasks.message.deleteTaskConfirmedPerformed.fatalError=Couldn't delete the task(s)
pageTasks.message.suspendTasksPerformed.success=The task(s) have been successfully suspended.
pageTasks.message.suspendTasksPerformed.warning=Task(s) suspension has been successfully requested; please check for its completion using task list.
pageTasks.message.suspendTasksPerformed.fatalError=Couldn't suspend the task(s)
pageTasks.message.reconcileWorkersConfirmedPerformed.fatalError=Couldn't reconcile the workers
pageTasks.message.suspendCoordinatorOnly.fatalError=Couldn't suspend the coordinator
pageTasks.message.resumeCoordinatorOnly.fatalError=Couldn't resume the coordinator
pageTasks.message.deleteWorkersAndWorkState.fatalError=Couldn't delete workers and the work state of the coordinator
pageTasks.message.getLastCheckInTime=vor {0}
pageTasks.message.startSchedulerAction=Aufgabenplaner starten für
pageTasks.message.stopSchedulerTasksAction=Aufgabenplaner und Aufgaben stoppen für
pageTasks.message.confirmationMessageForSingleTaskObject=Wollen Sie wirklich Aufgabe '{1}' {0} ?
Expand Down Expand Up @@ -2455,6 +2497,7 @@ pageWorkItem.requestedBy=Beantragt von:
pageWorkItem.requestedOn=Beantragt am:
pageWorkItem.requester.description=Antragsteller
pageWorkItem.requestSpecific.description=Ihre Entscheidung
webComponentUtil.message.createMenuItemsFromActions.warning=There are no objects to execute the action on
workItemPanel.originallyAllocatedTo=Initial zugewiesen an:
workItemPanel.currentlyAllocatedTo=Aktuell zugewiesen an:
workItemPanel.candidateActors=Candidate actors:
Expand All @@ -2475,8 +2518,15 @@ workItemPanel.changesToBeApproved=zu genehmigende Veränderungen
workItemPanel.additionalAttributes=Zusätzliche Attribute
workItemPanel.approvalHistory=Bewilligungshistorie für diesen Antrag
workItemPanel.approvalHistoryHelp=Decisions that have been done so far in the process of approving the changes displayed here.
TaskWfChildPanel.approvalHistoryHelp=Decisions that have been done so far in the process of approving the changes displayed here.
workItemPanel.otherWorkItemsHelp=Arbeitselemente für hier angezeigte Änderungen welche zur Zeit aktiv sind (Zusätzlich zu den Arbeitselementen auf dieser Seite).
TaskOperationUtils.message.suspendPerformed.success=The task have been successfully suspended.
TaskOperationUtils.message.suspendPerformed.warning=Task suspension has been successfully requested; please check for its completion using task list.
TaskOperationUtils.message.suspendPerformed.fatalError=Couldn't suspend the task
TaskOperationUtils.message.resumePerformed.success=The task has been successfully resumed.
TaskOperationUtils.message.resumePerformed.fatalError=Couldn't resume the task
TaskOperationUtils.message.runNowPerformed.success=The task has been successfully scheduled to run.
TaskOperationUtils.message.runNowPerformed.fatalError=Couldn't schedule the task
TaskWfChildPanel.approvalHistoryHelp=Decisions that have been done so far in the process of approving the changes displayed here.
TaskWfChildPanel.currentWorkItemsHelp=Arbeitselemente für die angezeigten Veränderungen welche zur Zeit aktiv sind.
TaskWfChildPanel.showNextStagesHelp=Zeigt die Vorschau der folgenden Genehmigungsphasen.
TaskWfChildPanel.nextStagesHelp=Dies ist eine die Vorschau der nachfolgenden Genehmigungsphasen.
Expand Down Expand Up @@ -2999,6 +3049,7 @@ SynchronizationStep.label.opportunistic=Opportunistic
SynchronizationStep.label.reaction=Reaktion
SynchronizationStep.label.reconcile=abgleichen
SynchronizationStep.label.syncObjectHeader=Synchronization objects
SynchronizationStep.label.editorReaction=sync
SynchronizationStep.message.cantSave=Ressourcensynchronisation konnte nicht gespeichert werden.
SynchronizationStep.message.errorLoadingObjectSyncList=Objektsynchronisationsliste konnte nicht von Ressource geladen werden. Fehler:
SynchronizationStep.message.errorLoadingObjectTemplates=Objekt Template konnte nicht vom Verzeichnis geladen werden.
Expand Down Expand Up @@ -3653,11 +3704,12 @@ operation.com.evolveum.midpoint.certification.api.CertificationManager.getCampai
operation.com.evolveum.midpoint.repo.api.RepositoryService.searchContainers=Search for containers
operation.com.evolveum.midpoint.repo.api.RepositoryService.searchObjectsIterative=Search for objects (iterative)

operation.PageCertCampaigns.startCampaign=Kampagne starten
operation.PageCertCampaigns.closeStage=Phase schliessen
operation.PageCertCampaigns.openNextStage=Nächste Phase öffnen
operation.PageCertCampaigns.startRemediation=Start Behebung
operation.PageCertCampaigns.closeCampaign=Kampagne schliessen
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaigns.startCampaign=Kampagne starten
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaigns.closeStage=Phase schliessen
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaigns.openNextStage=Nächste Phase öffnen
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaigns.startRemediation=Start Behebung
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaigns.closeCampaign=Kampagne schliessen
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaigns.reiterateCampaign=Reiterate campaign

operation.com.evolveum.midpoint.web.page.admin.certification.PageCertDecisions.recordAction=Aktion protokollieren
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertDecisions.recordActionSelected=Ausgewählte Aktionen aufzeichnen
Expand Down Expand Up @@ -3712,6 +3764,9 @@ operation.com.evolveum.midpoint.web.page.admin.services.PageServices.deleteObjec
operation.com.evolveum.midpoint.web.page.admin.services.PageServices.deleteObject=Delete service (GUI)
operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.importObject=Import object (GUI)
PageConnectorHosts.title=Konnektor System
PageConnectorHosts.message.deleteHostConfirmedPerformed.success=The resource(s) have been successfully deleted.
PageConnectorHosts.message.deleteHostConfirmedPerformed.partialError=Couldn't delete host.
PageConnectorHosts.message.discoveryRemotePerformed.fatalError=Fail to discover connectors on host '{0}:{1}'
operation.com.evolveum.midpoint.web.page.admin.configuration.PageRepositoryQuery.checkQuery=Abfrage überprüfen (GUI)
operation.com.evolveum.midpoint.web.page.admin.configuration.PageRepositoryQuery.translateQuery=Abfrage übersetzen (GUI)
operation.com.evolveum.midpoint.web.page.admin.configuration.PageRepositoryQuery.executeQuery=Abfrage ausführen (GUI)
Expand Down Expand Up @@ -4142,6 +4197,9 @@ GuiActionType.details.newValue=New gui action
ApprovalStageDefinitionType.details.newValue=New approval stage definition
WorkItemTimedActionsType.details.newValue=New work item timed actions
WorkItemNotificationActionType.details.newValue=New work item notification action
ResourceObjectAssociationType.details.newValue=New resource object association
ResourceAttributeDefinitionType.details.newValue=New resource attribute definition
MappingType.details.newValue=New mapping
objectState.details=Object state
assignmentState.details=Assignment state
hasAssignment.details=Has assignment
Expand Down

0 comments on commit a8cf456

Please sign in to comment.