Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Dec 12, 2016 · 4650566 · 4650566
2 parents 4de5b94 + aaa175c
commit 4650566
Show file tree

Hide file tree

Showing 19 changed files with 2,339 additions and 2,144 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -605,7 +605,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
-                <version>1.4.3.0-SNAPSHOT</version>
+                <version>1.4.3</version>
                 <exclusions>
 					<exclusion> <!-- Version in dependency of org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j conflicts with xalan. Can be removed when connector version is bumped beyond 1.4.2.17 -->
                         <groupId>xml-apis</groupId>

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronization
 Channel.null=Choose One
 channel.nullValid=Choose One
 Channel.reconciliation=Reconciliation
+Channel.recompute=Recompute
 Channel.user=User
 Channel.webService=Web Service
 CheckTableHeader.label.error=Error
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Description
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=File type
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Text

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronizace
 Channel.null=Vyberte jeden
 channel.nullValid=Vyberte jeden
 Channel.reconciliation=Rekonciliace
+Channel.recompute=Přepočítat
 Channel.user=Uživatel
 Channel.webService=Webová služba
 CheckTableHeader.label.error=Chyba
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Aktualizovat výraz
 SearchFilterPanel.label.description=Popis
 SearchFilterPanel.label.filterClause=Filtrovat dle výrazu
-SearchFilterPanel.message.cantSerialize=Nepodařilo se vytvořit element MaxXNode z poskytnutého XML filtru. Vložte správnou hodnotu. Důvod\: {0}
-SearchFilterPanel.message.expressionSuccess=Definice filtru byla úspěšně aktualizována.
+SearchFilterPanel.message.cantSerialize=Nepodařilo se rozebrat větu filtru. Prosím, zadejte správný výraz. Důvod\: {0}
+SearchFilterPanel.message.expressionSuccess=Věta filtru byla úspěšně aktualizována.
 searchForm.filetype.null=Typ souboru
 searchForm.reportType.null=Typ reportu
 searchForm.searchTextPlaceholder=Text

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Echtzeitsynchronisation
 Channel.null=Auswählen
 channel.nullValid=Auswählen
 Channel.reconciliation=Abgleich
+Channel.recompute=Recompute
 Channel.user=Anwender
 Channel.webService=Web Service
 CheckTableHeader.label.error=Fehler
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Beschreibung
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=Dateityp
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Text

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronization
 Channel.null=Choose One
 channel.nullValid=Choose One
 Channel.reconciliation=Reconciliation
+Channel.recompute=Recompute
 Channel.user=User
 Channel.webService=Web Service
 CheckTableHeader.label.error=Error
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Description
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=File type
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Text

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronization
 Channel.null=Elija uno
 channel.nullValid=Elija uno
 Channel.reconciliation=Reconciliación
+Channel.recompute=Recompute
 Channel.user=Usuario
 Channel.webService=Web Service
 CheckTableHeader.label.error=Error
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Descripción
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=File type
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Texto

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronization
 Channel.null=Choose One
 channel.nullValid=Choose One
 Channel.reconciliation=Reconciliation
+Channel.recompute=Recompute
 Channel.user=User
 Channel.webService=Web Service
 CheckTableHeader.label.error=Error
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Description
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=File type
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Text

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
@@ -103,8 +103,8 @@ AssignmentTablePanel.message.illegalAssignmentState=Lubamatu omistuse olek '{0}'
 AssignmentTablePanel.message.noAssignmentSelected=Omistust pole valitud.
 AssignmentTablePanel.message.noDelegationsSelected=Delegeerimist pole valitud.
 AssignmentTablePanel.modal.message.delete=Kas soovid kindlasti kustutada {0} omistust?
-AssignmentTablePanel.modal.message.deleteDelegation=Do you really want to delete {0} delegation(s)?
-AssignmentTablePanel.modal.message.noDelegationWarning=User doesn't have any delegable item
+AssignmentTablePanel.modal.message.deleteDelegation=Kas soovid kindlasti kustutada {0} delegeerimist?
+AssignmentTablePanel.modal.message.noDelegationWarning=Kasutajal pole ühtegi delegeeritavat objekti.
 AssignmentTablePanel.modal.title.confirmDeletion=Kustutuse kinnitamine
 AssignmentTablePanel.modal.title.selectAssignment=Vali objekt(id)
 associationAttribute.nullValid=Vali üks
@@ -195,6 +195,7 @@ Channel.liveSync=Otsesünkimine
 Channel.null=Vali üks
 channel.nullValid=Vali üks
 Channel.reconciliation=Lepitamine
+Channel.recompute=Recompute
 Channel.user=Kasutaja
 Channel.webService=Veebiteenus
 CheckTableHeader.label.error=Viga
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Uuenda klauslit
 SearchFilterPanel.label.description=Kirjeldus
 SearchFilterPanel.label.filterClause=Filtriklausel
-SearchFilterPanel.message.cantSerialize=Esitatud XML filtriklauslist ei õnnestu luua MaxXNode. Palun sisesta korrektne avaldis. Põhjus\: {0}
-SearchFilterPanel.message.expressionSuccess=Filtriklausel on edukalt uuendatud.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=Failitüüp
 searchForm.reportType.null=Aruandetüüp
 searchForm.searchTextPlaceholder=Tekst
@@ -3339,34 +3340,34 @@ PageAuditLogViewer.menuName=Auditilogivaatur
 PageAuditLogViewer.timeLabel=Aeg
 PageAuditLogViewer.fromLabel=Alates
 PageAuditLogViewer.toLabel=Kuni
-PageAuditLogViewer.initiatorNameLabel=Initiator
+PageAuditLogViewer.initiatorNameLabel=Algataja
 PageAuditLogViewer.channelLabel=Kanal
 PageAuditLogViewer.hostIdentifierLabel=Hostiidentifikaator
-PageAuditLogViewer.targetNameLabel=Target
-PageAuditLogViewer.targetTypeLabel=Target Type
-PageAuditLogViewer.targetOwnerNameLabel=Target Owner
+PageAuditLogViewer.targetNameLabel=Sihtmärk
+PageAuditLogViewer.targetTypeLabel=Sihtüksuse tüüp
+PageAuditLogViewer.targetOwnerNameLabel=Sihtüksuse omanik
 PageAuditLogViewer.eventTypeLabel=Sündmusetüüp
 PageAuditLogViewer.eventTypeShortLabel=Tüüp
 PageAuditLogViewer.eventStageLabel=Sündmuse etapp
 PageAuditLogViewer.eventStageShortLabel=Etapp
 PageAuditLogViewer.outcomeLabel=Tulemus
-PageAuditLogViewer.changedItem=Item changed
+PageAuditLogViewer.changedItem=Muutunud üksus
 AuditLogViewerPanel.dateValidatorMessage=From date must be before To date.
 AuditEventRecordType.timestamp=Aeg
 AuditEventRecordType.initiatorRef=Algataja
 AuditEventRecordType.taskIdentifier=Ülesandeidentifikaator
 AuditEventRecordType.channel=Kanal
 AuditEventRecordType.delta=Delta
-AuditEventRecordType.targetRef=Target
-AuditEventRecordType.targetOwnerRef=Target owner
+AuditEventRecordType.targetRef=Sihtüksus
+AuditEventRecordType.targetOwnerRef=Sihtüksuse omanik
 PageAuditLogDetails.title=Auditilogi üksikasjad
 PageAuditLogDetails.eventTimestamp=Ajatempel
 PageAuditLogDetails.eventIdentifier=Sündmuseidentifikaator
 PageAuditLogDetails.eventType=Sündmusetüüp
 PageAuditLogDetails.eventStage=Sündmuse etapp
 PageAuditLogDetails.eventInitiatorRef=Algataja
-PageAuditLogDetails.eventTargetRef=Target ref.
-PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventTargetRef=Sihtüksus
+PageAuditLogDetails.eventTargetOwnerRef= Sihtüksuse omanik
 PageAuditLogDetails.eventResult=Tulem
 PageAuditLogDetails.eventOutcome=Tulemus
 PageAuditLogDetails.sessionIdentifier=Seansiidentifikaator
@@ -3429,4 +3430,4 @@ PageResetPassword.title=Lähtesta parool
 PageResetPasswordConfirmation=Parooli lähtestamise kinnitus
 PageResetPasswordConfirmation.confirmation.error=Parooli lähtestamine pole lubatud. Meil on kahju, kuid sa peaksid tõenäoliselt võtma ühendust süsteemiadministraatoriga.
 PageResetPasswordConfirmation.authnetication.failed=Vale kasutajanimi ja/või parool
-ItemPathSegmentPanel.itemToSearch=Search for {0}
+ItemPathSegmentPanel.itemToSearch=Otsitav {0}
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronization
 Channel.null=Choose One
 channel.nullValid=Choose One
 Channel.reconciliation=Reconciliation
+Channel.recompute=Recompute
 Channel.user=User
 Channel.webService=Web Service
 CheckTableHeader.label.error=Error
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Description
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=File type
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Text

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronization
 Channel.null=Choose One
 channel.nullValid=Choose One
 Channel.reconciliation=Reconciliation
+Channel.recompute=Recompute
 Channel.user=Felhasználó
 Channel.webService=Web Service
 CheckTableHeader.label.error=Hiba
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Leírás
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=File type
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Text

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
@@ -195,6 +195,7 @@ Channel.liveSync=Live Synchronization
 Channel.null=Choose One
 channel.nullValid=Choose One
 Channel.reconciliation=Reconciliation
+Channel.recompute=Recompute
 Channel.user=User
 Channel.webService=Web Service
 CheckTableHeader.label.error=Error
@@ -2574,8 +2575,8 @@ SchemaStep.xml=XML
 SearchFilterPanel.button.update=Update clause
 SearchFilterPanel.label.description=Description
 SearchFilterPanel.label.filterClause=Filter clause
-SearchFilterPanel.message.cantSerialize=Could not create MaxXNode from provided XML filterClause. Please enter correct expression. Reason\: {0}
-SearchFilterPanel.message.expressionSuccess=Filter clause has been update successfully.
+SearchFilterPanel.message.cantSerialize=Could not parse filter clause. Please enter correct expression. Reason\: {0}
+SearchFilterPanel.message.expressionSuccess=Filter clause has been updated successfully.
 searchForm.filetype.null=File type
 searchForm.reportType.null=Report type
 searchForm.searchTextPlaceholder=Text