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

Evolveum · Feb 6, 2017 · c8858f6 · c8858f6
2 parents e806532 + 66b384b
commit c8858f6
Show file tree

Hide file tree

Showing 17 changed files with 611 additions and 576 deletions.
diff --git a/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml b/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
@@ -44,6 +44,10 @@
 		<key>hu</key>
 		<label>Magyar</label>
 	</row>
+	<row>
+		<key>pl</key>
+		<label>Polski</label>
+	</row>
 	<row>
 		<key>pt_BR</key>
 		<label>Português (Brasil)</label>

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Deriving attribute from parent org's name
 PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Request
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Odvození atributu z nadřazené organizace
 PageAssignmentShoppingKart.title=Žádost o přiřazení
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Katalog rolí není dosud zkonfigurován v konfiguračnám XML souboru systému.
 AssignmentCatalogPanel.selectTargetUser=Vybrat cílového uživatele
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Vybrat vlastníka přiřazení uživatele
 AssignmentCatalogPanel.requestForMe=Požadavek na mě
 AssignmentCatalogPanel.requestFor=Požadavek pro
 MultiButtonPanel.plusIconTitle=Přidat položku do nákupního košíku
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Zobrazení katalogu rolí
 AssignmentViewType.ROLE_TYPE=Zobrazení všech rolí
 AssignmentViewType.ORG_TYPE=Zobrazení všech organizací
 AssignmentViewType.SERVICE_TYPE=Zobrazení všech služeb
+AssignmentViewType.USER_TYPE=Přiřazení uživatele
 PageAssignmentsList.requestButton = Žádost
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Žádost o přiřazení
 PageAssignmentsList.title=Seznam nových přiřazení

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Deriving attribute from parent org's name
 PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Antrag
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Deriving attribute from parent org's name
 PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Request
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Deriving attribute from parent org's name
 PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Requerimiento
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list

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
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Deriving attribute from parent org's name
 PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Request
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Atribuudi tuletamine emaorganisatsiooni nimes
 PageAssignmentShoppingKart.title=Omistuse taotlemine
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Rollikataloog pole süsteemikonfiguratsiooni xml-s seadistatud
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Rollikataloogi vaade
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Taotle
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Deriving attribute from parent org's name
 PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Request
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
@@ -3335,6 +3335,7 @@ PageEvaluateMapping.sample.OrgName=Deriving attribute from parent org's name
 PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 AssignmentCatalogPanel.selectTargetUser=Select target user
+AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
 AssignmentCatalogPanel.requestForMe=Request for me
 AssignmentCatalogPanel.requestFor=Request for
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
@@ -3349,6 +3350,7 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
+AssignmentViewType.USER_TYPE=User's assignments
 PageAssignmentsList.requestButton = Request
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list