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

Evolveum · Mar 29, 2017 · 9a4b810 · 9a4b810
2 parents d726e3d + 523ad82
commit 9a4b810
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 11,783 deletions.
diff --git a/config/initial-objects/100-report-reconciliation.xml b/config/initial-objects/100-report-reconciliation.xml
diff --git a/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml b/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -2749,7 +2749,7 @@ SystemConfigPanel.title.notification=Notifikace
 SystemConfigPanel.title.passwordPolicy=Globální politika hesel
 SystemConfigPanel.title.securityPolicy=Globální bezpečnostní politika
 SystemConfigPanel.title.userTemplate=Výhozí šablona uživatele
-SystemConfigPanel.tooltip.duration=Formát\: P[n][p], n-číslo, p-perioda (d - dny, m - měsíce, ...), P3M - vyčištění každé 3 měsíce
+SystemConfigPanel.tooltip.duration=Formát\: P[n][p], n-číslo, p-perioda (d - dny, m - měsíce, ...), příklad\: P3M - vyčištění každé 3 měsíce
 SystemInfoPanel.cpuUsage=Využití CPU
 SystemInfoPanel.heapMemory=Paměť typu heap (využitá/přidělená/max)
 SystemInfoPanel.nonHeapMemory=Paměť typu non-heap (využitá/přidělená/max)

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
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
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
@@ -3374,7 +3374,7 @@ MultiButtonPanel.plusIconTitle=Dodaj pozycję do koszyka
 MultiButtonPanel.assignmentDetailsPopupTitle=Szczegóły przypisania
 MultiButtonPanel.detailsLink=Szczegóły
 MultiButtonPanel.addToCartLink=Dodaj do koszyka
-MultiButtonPanel.alreadyAssignedIconTitle=Already assigned
+MultiButtonPanel.alreadyAssignedIconTitle=Już przypisano
 PageAssignmentDetails.title=Szczegóły przypisania
 PageAssignmentDetails.backButton=Wstecz
 PageAssignmentDetails.addToCartButton=Dodaj do koszyka

diff --git a/infra/schema/src/main/resources/localization/schema_ar.properties b/infra/schema/src/main/resources/localization/schema_ar.properties
diff --git a/infra/schema/src/main/resources/localization/schema_es_AR.properties b/infra/schema/src/main/resources/localization/schema_es_AR.properties
diff --git a/infra/schema/src/main/resources/localization/schema_hi.properties b/infra/schema/src/main/resources/localization/schema_hi.properties