Merge remote-tracking branch 'origin/master'

Evolveum · Oct 10, 2017 · 01c6bf7 · 01c6bf7
2 parents 9400e64 + 0c33169
commit 01c6bf7
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -1321,7 +1321,7 @@ PageCertDecisions.menu.delegateSelected=Delegovat vybrané
 PageCertDecisions.menu.noResponse=Bez odpovědi
 PageCertDecisions.menu.noResponseSelected=Označit vybrané jako Bez odpovědi
 PageCertDecisions.menu.notDecided=Nerozhodnuto
-PageCertDecisions.menu.notDecidedSelected=Označit vybrané jako Nerozhodnuté
+PageCertDecisions.menu.notDecidedSelected=Označit vybrané jako Nerozhodnuto
 PageCertDecisions.menu.reduce=Redukovat
 PageCertDecisions.menu.reduceSelected=Redukovat vybrané
 PageCertDecisions.menu.revoke=Odmítnout
@@ -3725,7 +3725,7 @@ ApprovalProcessExecutionInformationPanel.stage=Fáze {0}/{1}
 PageImportResource.title=Import definice aplikace
 AssignmentType.activation=Aktivace
 AssignmentType.lifecycleState=Fáze životního cyklu
-AssignmnetType.accepted=Schváleno
+AssignmnetType.accepted=Akceptováno
 AssignmentType.policySituation=Situace politiky
 ObjectReferenceType.relation=Vztah
 FocusType.consents=Souhlasy

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
@@ -2569,7 +2569,7 @@ runReportPopupContent.param.name.targetName = Hedef adı
 runReportPopupContent.param.name.filter=Filter resulting roles? true/false (default is false)
 runReportPopupContent.param.name.to = Bitiş tarihi
 runReportPopupContent.param.value=Parametre değeri
-runReportPopupContent.param.name.alsoClosedCampaigns=Kampanyalar da kapatılsın mı? (varsayılan yanlış)
+runReportPopupContent.param.name.alsoClosedCampaigns=Kapalı kampanyalar da getirilsin mi? (varsayılan yanlış)
 runReportPopupContent.param.name.campaignName=Operasyon adı
 runReportPopupContent.param.name.resource=Kaynak
 runReportPopupContent.param.name.intent=Maksat

diff --git a/gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security-cas.xml b/gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security-cas.xml
@@ -24,8 +24,7 @@
 	<!-- CAS CONFIG -->
 	<bean id="serviceProperties"
         class="org.springframework.security.cas.ServiceProperties">
-    <property name="service"
-        value="${auth.cas.midpoint.host}/j_spring_cas_security_check"/>
+    <property name="service" value="${auth.cas.midpoint.host}/login/cas"/>
     <property name="sendRenew" value="${auth.cas.send.renew}"/>
   </bean>
 

diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certification campaign
 ObjectTypes.SEQUENCE=Sequence
 ObjectTypes.SERVICE=Service
 ObjectTypes.OBJECT=Object
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Extension
 FocusType.assignmentKey=Assignment

diff --git a/infra/schema/src/main/resources/localization/schema_cs.properties b/infra/schema/src/main/resources/localization/schema_cs.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certifikační kampaň
 ObjectTypes.SEQUENCE=Sekvence
 ObjectTypes.SERVICE=Služba
 ObjectTypes.OBJECT=Objekt
+ObjectTypes.FORM=Formulář
+ObjectTypes.CASE=Případ
 OrgType.parentOrganization=Rodičovská organizace
 ObjectType.extension=Rozšíření
 FocusType.assignmentKey=Přiřazení

diff --git a/infra/schema/src/main/resources/localization/schema_de.properties b/infra/schema/src/main/resources/localization/schema_de.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Zertifikatskampagne
 ObjectTypes.SEQUENCE=Abschnitt
 ObjectTypes.SERVICE=Dienst
 ObjectTypes.OBJECT=Objekt
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Übergeordnete Organisation
 ObjectType.extension=Erweiterung
 FocusType.assignmentKey=Aufgabe

diff --git a/infra/schema/src/main/resources/localization/schema_en.properties b/infra/schema/src/main/resources/localization/schema_en.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certification campaign
 ObjectTypes.SEQUENCE=Sequence
 ObjectTypes.SERVICE=Service
 ObjectTypes.OBJECT=Object
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Extension
 FocusType.assignmentKey=Assignment

diff --git a/infra/schema/src/main/resources/localization/schema_es.properties b/infra/schema/src/main/resources/localization/schema_es.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certification campaign
 ObjectTypes.SEQUENCE=Sequence
 ObjectTypes.SERVICE=Service
 ObjectTypes.OBJECT=Objeto
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Extensión
 FocusType.assignmentKey=Assignment

diff --git a/infra/schema/src/main/resources/localization/schema_et.properties b/infra/schema/src/main/resources/localization/schema_et.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Sertimiskampaania
 ObjectTypes.SEQUENCE=Järjestus
 ObjectTypes.SERVICE=Teenus
 ObjectTypes.OBJECT=Objekt
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Emaorganisatsioon
 ObjectType.extension=Laiendus
 FocusType.assignmentKey=Omistus

diff --git a/infra/schema/src/main/resources/localization/schema_fi.properties b/infra/schema/src/main/resources/localization/schema_fi.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certification campaign
 ObjectTypes.SEQUENCE=Sequence
 ObjectTypes.SERVICE=Palvelu
 ObjectTypes.OBJECT=Objekti
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Laajennos
 FocusType.assignmentKey=Toimeksianto

diff --git a/infra/schema/src/main/resources/localization/schema_hu.properties b/infra/schema/src/main/resources/localization/schema_hu.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certification campaign
 ObjectTypes.SEQUENCE=Sequence
 ObjectTypes.SERVICE=Service
 ObjectTypes.OBJECT=Object
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Extension
 FocusType.assignmentKey=Assignment

diff --git a/infra/schema/src/main/resources/localization/schema_pl.properties b/infra/schema/src/main/resources/localization/schema_pl.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Kampania certyfikacyjna
 ObjectTypes.SEQUENCE=Sekwencja
 ObjectTypes.SERVICE=Usługa
 ObjectTypes.OBJECT=Obiekt
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Organizacja nadrzędna
 ObjectType.extension=Rozszerzenie
 FocusType.assignmentKey=Przypisanie

diff --git a/infra/schema/src/main/resources/localization/schema_pt_BR.properties b/infra/schema/src/main/resources/localization/schema_pt_BR.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Campanha de certificação
 ObjectTypes.SEQUENCE=Sequência
 ObjectTypes.SERVICE=Serviço
 ObjectTypes.OBJECT=Objeto
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Organização pai
 ObjectType.extension=Extensao
 FocusType.assignmentKey=Atribuição

diff --git a/infra/schema/src/main/resources/localization/schema_ru.properties b/infra/schema/src/main/resources/localization/schema_ru.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Операция по сертифик
 ObjectTypes.SEQUENCE=Последовательность
 ObjectTypes.SERVICE=Сервис
 ObjectTypes.OBJECT=Объект
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Родительская организация
 ObjectType.extension=Расширение
 FocusType.assignmentKey=Назначение

diff --git a/infra/schema/src/main/resources/localization/schema_sk.properties b/infra/schema/src/main/resources/localization/schema_sk.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certification campaign
 ObjectTypes.SEQUENCE=Postupnosť
 ObjectTypes.SERVICE=Služba
 ObjectTypes.OBJECT=Objekt
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Rodičovská organizácia
 ObjectType.extension=Rozšírenia
 FocusType.assignmentKey=Priradenie

diff --git a/infra/schema/src/main/resources/localization/schema_tr.properties b/infra/schema/src/main/resources/localization/schema_tr.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Gözden geçirme operasyonu
 ObjectTypes.SEQUENCE=Diziliş
 ObjectTypes.SERVICE=Servis
 ObjectTypes.OBJECT=Nesne
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=Ana organizasyon
 ObjectType.extension=Uzantı
 FocusType.assignmentKey=Atama

diff --git a/infra/schema/src/main/resources/localization/schema_zh_CN.properties b/infra/schema/src/main/resources/localization/schema_zh_CN.properties
@@ -297,6 +297,8 @@ ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=鉴定活动
 ObjectTypes.SEQUENCE=序列
 ObjectTypes.SERVICE=服务
 ObjectTypes.OBJECT=对象
+ObjectTypes.FORM=Form
+ObjectTypes.CASE=Case
 OrgType.parentOrganization=父级组织
 ObjectType.extension=扩展
 FocusType.assignmentKey=分配