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

build-system/pom.xml

@@ -652,7 +652,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
-                <version>1.4.4-SNAPSHOT</version>
+                <version>1.4.5-SNAPSHOT</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>

gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Dědění
 PageRoleEditor.title.newRole=Vytvořit
 pageRoles.button.delete=Smazat
 pageRoles.dialog.title.confirmDelete=Potvrdit smazání
-pageRoles.message.deleteRoleConfirm=Opravdu chcete smazat {0} vybraných rolí?
+pageRoles.message.confirmationMessageForMultipleObject=Opravdu chcete {0} {1} vybraných rolí?
+pageRoles.message.confirmationMessageForSingleObject=Opravdu chcete {0} roli '{1}'?
 pageRoles.message.nothingSelected=Nebyla vybrána žádná role.
 pageRoles.message.queryError=Chyba při překladu vyhledávacího dotazu do filtru.
 pageRoles.requestable=Žadatelné
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=Reconciliovat
 pageUsers.menu.unlock=Odemknout
 pageUsers.message.deleteUserConfirm=Opravdu chcete smazat {0} vybraných uživatelů?
 pageUsers.message.deleteUserConfirmSingle=Opravdu chcete smazat uživatele '{0}'?
+pageUsers.message.confirmationMessageForSingleObject=Opravdu chcete {0} uživatele '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Opravdu chcete {0} {1} vybraných uživatelů?
+pageUsers.message.enableAction=povolit
+pageUsers.message.disableAction=zakázat
+pageUsers.message.reconcileAction=rekonciliovat
+pageUsers.message.unlockAction=odemknout
+pageUsers.message.deleteAction=smazat
+pageUsers.message.confirmActionPopupTitle=Potvrdit akci
 pageUsers.message.nothingSelected=Nebyl vybrán žádný uživatel.
 pageUsers.message.queryError=Chyba při překladu vyhledávacího dotazu do filtru.
 PageUsers.title=Seznam uživatelů
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Odmítnuté změny
 TaskDto.changesCanceled=Změny byly zrušeny
 PageServices.title=Seznam služeb
 PageServices.message.deleteServicesConfirm=Opravdu chcete smazat {0} vybraných služeb (či službu)?
+PageServices.message.confirmationMessageForMultipleObject=Opravdu chcete {0} {1} vybraných služeb?
+PageServices.message.confirmationMessageForSingleObject=Opravdu chcete {0} službu '{1}'?
 PageServices.message.nothingSelected=Nebyla vybrána žádná služba.
 PageServices.message.buttonDelete=Smazat
 LiveSyncHandlerPanel.deleteToken=Smazat token

gui/admin-gui/src/main/resources/localization/Midpoint_de.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Veranlassungen
 PageRoleEditor.title.newRole=Erstellen
 pageRoles.button.delete=Löschen
 pageRoles.dialog.title.confirmDelete=Löschen bestätigen
-pageRoles.message.deleteRoleConfirm=Do you really want to delete selected {0} role(s)?
+pageRoles.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} role(s)?
+pageRoles.message.confirmationMessageForSingleObject=Do you really want to {0} role '{1}'?
 pageRoles.message.nothingSelected=No role has been selected.
 pageRoles.message.queryError=Fehler aufgetreten während der Übersetzung des Suchbegriffs zum Filter.
 pageRoles.requestable=Beantragbar
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=abgleichen
 pageUsers.menu.unlock=entsperren
 pageUsers.message.deleteUserConfirm=Wollen Sie wirklich die selektierten Benutzer {0} löschen?
 pageUsers.message.deleteUserConfirmSingle=Wollen Sie wirklich den Benutzer '{0}' löschen? 
+pageUsers.message.confirmationMessageForSingleObject=Do you really want to {0} user '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} user(s)?
+pageUsers.message.enableAction=enable
+pageUsers.message.disableAction=disable
+pageUsers.message.reconcileAction=reconcile
+pageUsers.message.unlockAction=unlock
+pageUsers.message.deleteAction=delete
+pageUsers.message.confirmActionPopupTitle=Confirm action
 pageUsers.message.nothingSelected=Es wurde kein Benutzer selektiert.
 pageUsers.message.queryError=Fehler aufgetreten während der Übersetzung des Suchbegriffs zum Filter.
 PageUsers.title=Benutzerliste
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Änderungen abgelehnt
 TaskDto.changesCanceled=Änderungen abgebrochen
 PageServices.title=Deinstliste
 PageServices.message.deleteServicesConfirm=Do you really want to delete selected {0} service(s)?
+PageServices.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} service(s)?
+PageServices.message.confirmationMessageForSingleObject=Do you really want to {0} service '{1}'?
 PageServices.message.nothingSelected=No service has been selected.
 PageServices.message.buttonDelete=Löschen
 LiveSyncHandlerPanel.deleteToken=Delete token

gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Inducements
 PageRoleEditor.title.newRole=Create
 pageRoles.button.delete=Delete
 pageRoles.dialog.title.confirmDelete=Confirm delete
-pageRoles.message.deleteRoleConfirm=Do you really want to delete selected {0} role(s)?
+pageRoles.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} role(s)?
+pageRoles.message.confirmationMessageForSingleObject=Do you really want to {0} role '{1}'?
 pageRoles.message.nothingSelected=No role has been selected.
 pageRoles.message.queryError=Error occurred during translation search query to filter.
 pageRoles.requestable=Requestable
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=Reconcile
 pageUsers.menu.unlock=Unlock
 pageUsers.message.deleteUserConfirm=Do you really want to delete selected {0} user(s)?
 pageUsers.message.deleteUserConfirmSingle=Do you really want to delete user '{0}'?
+pageUsers.message.confirmationMessageForSingleObject=Do you really want to {0} user '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} user(s)?
+pageUsers.message.enableAction=enable
+pageUsers.message.disableAction=disable
+pageUsers.message.reconcileAction=reconcile
+pageUsers.message.unlockAction=unlock
+pageUsers.message.deleteAction=delete
+pageUsers.message.confirmActionPopupTitle=Confirm action
 pageUsers.message.nothingSelected=No user has been selected.
 pageUsers.message.queryError=Error occurred during translation search query to filter.
 PageUsers.title=User List
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Changes rejected
 TaskDto.changesCanceled=Changes canceled
 PageServices.title=Service List
 PageServices.message.deleteServicesConfirm=Do you really want to delete selected {0} service(s)?
+PageServices.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} service(s)?
+PageServices.message.confirmationMessageForSingleObject=Do you really want to {0} service '{1}'?
 PageServices.message.nothingSelected=No service has been selected.
 PageServices.message.buttonDelete=Delete
 LiveSyncHandlerPanel.deleteToken=Delete token

gui/admin-gui/src/main/resources/localization/Midpoint_es.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Inducements
 PageRoleEditor.title.newRole=Crear
 pageRoles.button.delete=Eliminar
 pageRoles.dialog.title.confirmDelete=Confirmar eliminación
-pageRoles.message.deleteRoleConfirm=Usted desea realmente eliminar el/los rol/es seleccionados {0}?
+pageRoles.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} role(s)?
+pageRoles.message.confirmationMessageForSingleObject=Do you really want to {0} role '{1}'?
 pageRoles.message.nothingSelected=No se ha seleccionado rol.
 pageRoles.message.queryError=Error ocurrido durante la búsqueda de la traducción consulta de búsqueda para filtrar.
 pageRoles.requestable=Solicitable
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=Reconciliar
 pageUsers.menu.unlock=Desbloquear
 pageUsers.message.deleteUserConfirm=Desea realmente eliminar los usuarios seleccionados {0}?
 pageUsers.message.deleteUserConfirmSingle=Desea realmente eliminar el usuario '{0}'?
+pageUsers.message.confirmationMessageForSingleObject=Do you really want to {0} user '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} user(s)?
+pageUsers.message.enableAction=enable
+pageUsers.message.disableAction=disable
+pageUsers.message.reconcileAction=reconcile
+pageUsers.message.unlockAction=unlock
+pageUsers.message.deleteAction=delete
+pageUsers.message.confirmActionPopupTitle=Confirm action
 pageUsers.message.nothingSelected=No se ha seleccionado el usuario.
 pageUsers.message.queryError=Ocurrió error durante la traducción de la consulta de búsqueda a filtro.
 PageUsers.title=User List
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Changes rejected
 TaskDto.changesCanceled=Changes canceled
 PageServices.title=Service List
 PageServices.message.deleteServicesConfirm=Do you really want to delete selected {0} service(s)?
+PageServices.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} service(s)?
+PageServices.message.confirmationMessageForSingleObject=Do you really want to {0} service '{1}'?
 PageServices.message.nothingSelected=No service has been selected.
 PageServices.message.buttonDelete=Eliminar
 LiveSyncHandlerPanel.deleteToken=Delete token

gui/admin-gui/src/main/resources/localization/Midpoint_et.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Tekitused
 PageRoleEditor.title.newRole=Loo
 pageRoles.button.delete=Kustuta
 pageRoles.dialog.title.confirmDelete=Kustutuse kinnitamine
-pageRoles.message.deleteRoleConfirm=Kas soovid kindlasti kustutada valitud {0} rolli?
+pageRoles.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} role(s)?
+pageRoles.message.confirmationMessageForSingleObject=Do you really want to {0} role '{1}'?
 pageRoles.message.nothingSelected=Rolli pole valitud.
 pageRoles.message.queryError=Otsingupäringu tõlkimisel filtrile ilmnes tõrge.
 pageRoles.requestable=Taotletav
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=Lepita
 pageUsers.menu.unlock=Lukusta lahti
 pageUsers.message.deleteUserConfirm=Kas soovid kindlasti kustutada valitud {0} kasutaja(t)?
 pageUsers.message.deleteUserConfirmSingle=Kas soovid kindlasti kustutada kasutaja '{0}'?
+pageUsers.message.confirmationMessageForSingleObject=Do you really want to {0} user '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} user(s)?
+pageUsers.message.enableAction=enable
+pageUsers.message.disableAction=disable
+pageUsers.message.reconcileAction=reconcile
+pageUsers.message.unlockAction=unlock
+pageUsers.message.deleteAction=delete
+pageUsers.message.confirmActionPopupTitle=Confirm action
 pageUsers.message.nothingSelected=Kasutajat pole valitud.
 pageUsers.message.queryError=Otsingupäringu tõlkimisel filtrile ilmnes tõrge.
 PageUsers.title=Kasutajate loend
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Tagasi lükatud muudatused
 TaskDto.changesCanceled=Changes canceled
 PageServices.title=Teenuseloend
 PageServices.message.deleteServicesConfirm=Kas soovid kindlasti kustutada valitud {0} teenust?
+PageServices.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} service(s)?
+PageServices.message.confirmationMessageForSingleObject=Do you really want to {0} service '{1}'?
 PageServices.message.nothingSelected=Teenust pole valitud.
 PageServices.message.buttonDelete=Kustuta
 LiveSyncHandlerPanel.deleteToken=Kustuta tõend

gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Inducements
 PageRoleEditor.title.newRole=Create
 pageRoles.button.delete=Törlés
 pageRoles.dialog.title.confirmDelete=Törlés megerősítése
-pageRoles.message.deleteRoleConfirm=Do you really want to delete selected {0} role(s)?
+pageRoles.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} role(s)?
+pageRoles.message.confirmationMessageForSingleObject=Do you really want to {0} role '{1}'?
 pageRoles.message.nothingSelected=No role has been selected.
 pageRoles.message.queryError=Error occurred during translation search query to filter.
 pageRoles.requestable=Requestable
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=Reconcile
 pageUsers.menu.unlock=Zárolás feloldása
 pageUsers.message.deleteUserConfirm=Do you really want to delete selected {0} user(s)?
 pageUsers.message.deleteUserConfirmSingle=Do you really want to delete user '{0}'?
+pageUsers.message.confirmationMessageForSingleObject=Do you really want to {0} user '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} user(s)?
+pageUsers.message.enableAction=enable
+pageUsers.message.disableAction=disable
+pageUsers.message.reconcileAction=reconcile
+pageUsers.message.unlockAction=unlock
+pageUsers.message.deleteAction=delete
+pageUsers.message.confirmActionPopupTitle=Confirm action
 pageUsers.message.nothingSelected=No user has been selected.
 pageUsers.message.queryError=Error occurred during translation search query to filter.
 PageUsers.title=User List
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Changes rejected
 TaskDto.changesCanceled=Changes canceled
 PageServices.title=Service List
 PageServices.message.deleteServicesConfirm=Do you really want to delete selected {0} service(s)?
+PageServices.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} service(s)?
+PageServices.message.confirmationMessageForSingleObject=Do you really want to {0} service '{1}'?
 PageServices.message.nothingSelected=No service has been selected.
 PageServices.message.buttonDelete=Törlés
 LiveSyncHandlerPanel.deleteToken=Delete token

gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Dziedziczenia
 PageRoleEditor.title.newRole=Utwórz
 pageRoles.button.delete=Usuń
 pageRoles.dialog.title.confirmDelete=Potwierdź usunięcie
-pageRoles.message.deleteRoleConfirm=Naprawdę chcesz usunąć {0} zaznaczonych ról?
+pageRoles.message.confirmationMessageForMultipleObject=Naprawdę chcesz {0} zaznaczonych {1} rolę (ról)?
+pageRoles.message.confirmationMessageForSingleObject=Naprawdę chcesz {0} rolę '{1}'?
 pageRoles.message.nothingSelected=Nie zaznaczono żadnej roli.
 pageRoles.message.queryError=Wystąpił błąd podczas tłumaczenia zapytania do filtra.
 pageRoles.requestable=Wnioskowalne
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=Rekoncyliacja
 pageUsers.menu.unlock=Odblokuj
 pageUsers.message.deleteUserConfirm=Naprawdę chcesz usunąć {0} zaznaczonych użytkowników?
 pageUsers.message.deleteUserConfirmSingle=Naprawdę chcesz usunąć użytkownika '{0}'?
+pageUsers.message.confirmationMessageForSingleObject=Naprawdę chcesz {0} użytkownika '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Naprawdę chcesz {0} zaznaczonych {1} użytkownik(ów)?
+pageUsers.message.enableAction=aktywować
+pageUsers.message.disableAction=zablokować
+pageUsers.message.reconcileAction=rekoncyliacja
+pageUsers.message.unlockAction=odblokować
+pageUsers.message.deleteAction=usunąć
+pageUsers.message.confirmActionPopupTitle=Potwierdź akcję
 pageUsers.message.nothingSelected=Nie wybrano żadnego użytkownika.
 pageUsers.message.queryError=Wystąpił błąd podczas tłumaczenia zapytania do filtra.
 PageUsers.title=Lista użytkowników
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Odrzucone zmiany
 TaskDto.changesCanceled=Zmiany anulowane
 PageServices.title=Lista usług
 PageServices.message.deleteServicesConfirm=Naprawdę chcesz usunąć {0} zaznaczonych usług?
+PageServices.message.confirmationMessageForMultipleObject=Naprawdę chcesz {0} zaznaczonych {1} usług(ę)?
+PageServices.message.confirmationMessageForSingleObject=Naprawdę chcesz {0} usługę '{1}'?
 PageServices.message.nothingSelected=Nie wybrano usługi.
 PageServices.message.buttonDelete=Usuń
 LiveSyncHandlerPanel.deleteToken=Usuń token

gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties

@@ -1844,7 +1844,8 @@ PageRoleEditor.title.inducements=Induzimentos
 PageRoleEditor.title.newRole=Criar
 pageRoles.button.delete=Deletar
 pageRoles.dialog.title.confirmDelete=Confirmar deleção
-pageRoles.message.deleteRoleConfirm=Deseja realmente deletar {0} perfis selecionados?
+pageRoles.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} role(s)?
+pageRoles.message.confirmationMessageForSingleObject=Do you really want to {0} role '{1}'?
 pageRoles.message.nothingSelected=Nenhum perfil selecionado.
 pageRoles.message.queryError=Ocorreu um erro durante a pesquisa de tradução a filtrar.
 pageRoles.requestable=Requisitável
@@ -2136,6 +2137,14 @@ pageUsers.menu.reconcile=Reconciliar
 pageUsers.menu.unlock=Destravar
 pageUsers.message.deleteUserConfirm=Deseja realmente deletar {0} usuários selecionados?
 pageUsers.message.deleteUserConfirmSingle=Deseja realmente deletar o usuários  '{0}'?
+pageUsers.message.confirmationMessageForSingleObject=Do you really want to {0} user '{1}'?
+pageUsers.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} user(s)?
+pageUsers.message.enableAction=enable
+pageUsers.message.disableAction=disable
+pageUsers.message.reconcileAction=reconcile
+pageUsers.message.unlockAction=unlock
+pageUsers.message.deleteAction=delete
+pageUsers.message.confirmActionPopupTitle=Confirm action
 pageUsers.message.nothingSelected=Nenhum usuário selecionado.
 pageUsers.message.queryError=Ocorreu um erro durante a pesquisa de tradução a filtrar.
 PageUsers.title=Listagem de usuario
@@ -3148,6 +3157,8 @@ TaskDto.changesRejected=Alterações rejeitadas
 TaskDto.changesCanceled=Alterações canceladas
 PageServices.title=Lista de serviços
 PageServices.message.deleteServicesConfirm=Deseja realmente deletar {0} serviço(s) selecionado(s)?
+PageServices.message.confirmationMessageForMultipleObject=Do you really want to {0} selected {1} service(s)?
+PageServices.message.confirmationMessageForSingleObject=Do you really want to {0} service '{1}'?
 PageServices.message.nothingSelected=Nenhum serviço selecionado.
 PageServices.message.buttonDelete=Deletar
 LiveSyncHandlerPanel.deleteToken=Deletar token