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

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

@@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache
 pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
 PageBase.subscriptionMessage=Non-subscription.
+PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription.
+PageBase.demoSubscriptionMessage=Demo subscription.
 PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Start
 PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script.
@@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Assignments
 PageAdmin.menu.credentials=Credentials
 PageAdmin.menu.request=Request a role
 PageTemplate.version=Version\:
-PageTemplate.copy=<strong>Copyright &copy; 2010-2016 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a> and partners.</strong> Thank you for using <a href\="http\://midpoint.evolveum.com" target\="_blank">midPoint</a>
+PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.&nbsp;</strong>
 PageTemplate.toggleNavigation=Toggle navigation
 PageTemplate.user=user
 PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0}
@@ -3080,6 +3082,9 @@ ScenePanel.item=Item
 ScenePanel.oldValue=Old value
 ScenePanel.newValue=New value
 ScenePanel.value=Value
+SceneItemLinePanel.removedValue=Removed value
+SceneItemLinePanel.addedValue=Added value
+SceneItemLinePanel.unchangedValue=Unchanged value
 operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI)
 TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1}
 TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0}
@@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh
 MainObjectListPanel.newObject=New
 MainObjectListPanel.import=Import
 MainObjectListPanel.export=Export
+MainObjectListPanel.exportFileName=export
 TreeTablePanel.menu.createMember=Create member
 TreeTablePanel.menu.createManager=Create manager
 TreeTablePanel.menu.addMembers=Assign members
@@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back
 PageAssignmentConflicts.submit=Submit
 AssignmentCatalogPanel.selectTargetUser=Select target user
 AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
-AssignmentCatalogPanel.requestForMe=Request for me
-AssignmentCatalogPanel.requestFor=Request for
+AssignmentCatalogPanel.requestForMe=Target user\: me
+AssignmentCatalogPanel.requestFor=Target user\:
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
@@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart
 PageAssignmentsList.submitButton=Submit
 PageAssignmentsList.resolveConflicts=Resolve conflicts
 PageAssignmentsList.commentHere=Comment here...
+PageAssignmentsList.requestComment=Request comment (optional)
 AssignmentShoppingCartPanel.treeTitle=Role catalog
 AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
@@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed.
 PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password
 ItemPathSegmentPanel.itemToSearch=Search for {0}
 DecisionDto.automaticallyApproved=(automatically approved)
-DecisionDto.automaticallyRejected=(automatically approved)
+DecisionDto.automaticallyRejected=(automatically rejected)
+DecisionDto.approvedDueToTimeout=(approved due to the timeout)
+DecisionDto.rejectedDueToTimeout=(rejected due to the timeout)
 DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition)
 DecisionDto.NO_APPROVERS_FOUND=(no approvers found)
 wf.object=Object

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

@@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Vyčistit less/js cache
 pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=neznámý
 PageBase.subscriptionMessage=Bez placené podpory.
+PageBase.nonActiveSubscriptionMessage=Bez placené podpory. Placená podpora poskytuje prioritní řešení oprav a vylepšení a umožňuje další rozvoj midPointu.
+PageBase.demoSubscriptionMessage=Ukázková verze.
 PageBulkAction.async=Asynchronní
 PageBulkAction.button.start=Spustit
 PageBulkAction.message.emptyString=Vložená hronadná akce je prázdná. Vložte neprázdný skript.
@@ -1883,7 +1885,7 @@ pageTask.boundHelp=Úlohy s pevnou vazbou jsou používány pro krátké a čast
 pageTask.bound=Pevná vazba (použijte pokud je opakování úlohy časté)
 pageTask.browse=Prohlížet
 pageTask.category.BulkActions=Hromadné akce
-pageTask.category.Demo=Demo
+pageTask.category.Demo=Ukázka
 pageTask.category.ImportFromFile=Importovat ze souboru
 pageTask.category.ImportingAccounts=Importování účtů
 pageTask.category.LiveSynchronization=Live synchronizace
@@ -2014,7 +2016,7 @@ pageTasks.category.AllCategories=Všechny kategorie
 pageTasks.category.BulkActions=Hromadné akce
 pageTasks.category=Kategorie
 pageTasks.category.Cleanup=Vyčistit
-pageTasks.category.Demo=Demo
+pageTasks.category.Demo=Ukázka
 pageTasks.category.ImportFromFile=Import ze souboru
 pageTasks.category.ImportingAccounts=Importované účty
 pageTasks.category.LiveSynchronization=Live synchronizace
@@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Přiřazení
 PageAdmin.menu.credentials=Změna hesla
 PageAdmin.menu.request=Požádat o roli
 PageTemplate.version=Verze\:
-PageTemplate.copy=<strong>Copyright &copy; 2010-2016 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a> a partneři.</strong> Děkujeme vám, že používáte <a href\="http\://midpoint.evolveum.com" target\="_blank">midPoint</a>.
+PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; a partneři.&nbsp;</strong>
 PageTemplate.toggleNavigation=Přepnout navigaci
 PageTemplate.user=uživatel
 PageTemplate.couldntNavigateBreadcrumb=Nelze procházet navigaci, důvod\: {0}
@@ -3080,6 +3082,9 @@ ScenePanel.item=Položky
 ScenePanel.oldValue=Stará hodnota
 ScenePanel.newValue=Nová hodnota
 ScenePanel.value=Hodnota
+SceneItemLinePanel.removedValue=Odebraná hodnota
+SceneItemLinePanel.addedValue=Přidaná hodnota
+SceneItemLinePanel.unchangedValue=Nezměněná hodnota
 operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Změnit vlastníka (GUI)
 TaskSummaryPanel.progressWithTotalKnown=Zpracování\: {0} z {1}
 TaskSummaryPanel.progressWithTotalUnknown=Zpracování\: {0}
@@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Aktualizovat
 MainObjectListPanel.newObject=Nový
 MainObjectListPanel.import=Importovat
 MainObjectListPanel.export=Export
+MainObjectListPanel.exportFileName=export
 TreeTablePanel.menu.createMember=Vytvořit člena
 TreeTablePanel.menu.createManager=Vytvořit manažera
 TreeTablePanel.menu.addMembers=Přiřadit členy
@@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Zpět
 PageAssignmentConflicts.submit=Odeslat
 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
+AssignmentCatalogPanel.requestForMe=Cílový uživatel\: já
+AssignmentCatalogPanel.requestFor=Cílový uživatel\:
 AssignmentCatalogPanel.assignmentsOwner=Přiřazení identity {0}
 MultiButtonPanel.plusIconTitle=Přidat položku do nákupního košíku
 MultiButtonPanel.assignmentDetailsPopupTitle=Podrobnosti přiřazení
@@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Přidat do košíku
 PageAssignmentsList.submitButton=Odeslat
 PageAssignmentsList.resolveConflicts=Rozhodnout konflikty
 PageAssignmentsList.commentHere=Poznámka
+PageAssignmentsList.requestComment=Poznámka k žádosti (volitelná)
 AssignmentShoppingCartPanel.treeTitle=Katalog rolí
 AssignmentViewType.ROLE_CATALOG_VIEW=Zobrazení katalogu rolí
 AssignmentViewType.ROLE_TYPE=Zobrazení všech rolí
@@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset hesla není povolen. Je t
 PageResetPasswordConfirmation.authnetication.failed=Nesprávné uživatelské jméno nebo heslo.
 ItemPathSegmentPanel.itemToSearch=Hledání pro {0}
 DecisionDto.automaticallyApproved=(automaticky schváleno)
-DecisionDto.automaticallyRejected=(automaticky schváleno)
+DecisionDto.automaticallyRejected=(automaticky odmítnuto)
+DecisionDto.approvedDueToTimeout=(schváleno automaticky po uplynutí lhůty)
+DecisionDto.rejectedDueToTimeout=(zamítnuto automaticky po uplynutí lhůty)
 DecisionDto.AUTO_APPROVAL_CONDITION=(podmínečné samoschválení)
 DecisionDto.NO_APPROVERS_FOUND=(nenalezeni žádní schvalovatelé)
 wf.object=Objekt

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

@@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache
 pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unbekannt
 PageBase.subscriptionMessage=Non-subscription.
+PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription.
+PageBase.demoSubscriptionMessage=Demo subscription.
 PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Start
 PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script.
@@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Zuweisungen
 PageAdmin.menu.credentials=Zugangsdaten
 PageAdmin.menu.request=Rolle beantragen
 PageTemplate.version=Version\:
-PageTemplate.copy=<strong>Copyright &copy; 2010-2016 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a> und Partner.</strong> Danke, dass Sie <a href\="http\://midpoint.evolveum.com" target\="_blank">midPoint</a> verwenden.
+PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.&nbsp;</strong>
 PageTemplate.toggleNavigation=Navi ein/abschalten
 PageTemplate.user=Benutzer
 PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0}
@@ -3080,6 +3082,9 @@ ScenePanel.item=Element
 ScenePanel.oldValue=Alter Wert
 ScenePanel.newValue=Neuer Wert
 ScenePanel.value=Wert
+SceneItemLinePanel.removedValue=Removed value
+SceneItemLinePanel.addedValue=Added value
+SceneItemLinePanel.unchangedValue=Unchanged value
 operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI)
 TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1}
 TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0}
@@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Aktualisieren
 MainObjectListPanel.newObject=Neu
 MainObjectListPanel.import=Importieren
 MainObjectListPanel.export=Export
+MainObjectListPanel.exportFileName=export
 TreeTablePanel.menu.createMember=Benutzer anlegen
 TreeTablePanel.menu.createManager=Manager anlegen
 TreeTablePanel.menu.addMembers=Mitglieder zuweisen
@@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back
 PageAssignmentConflicts.submit=Submit
 AssignmentCatalogPanel.selectTargetUser=Select target user
 AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
-AssignmentCatalogPanel.requestForMe=Request for me
-AssignmentCatalogPanel.requestFor=Request for
+AssignmentCatalogPanel.requestForMe=Target user\: me
+AssignmentCatalogPanel.requestFor=Target user\:
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
@@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart
 PageAssignmentsList.submitButton=Submit
 PageAssignmentsList.resolveConflicts=Resolve conflicts
 PageAssignmentsList.commentHere=Comment here...
+PageAssignmentsList.requestComment=Request comment (optional)
 AssignmentShoppingCartPanel.treeTitle=Role catalog
 AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
@@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed.
 PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password
 ItemPathSegmentPanel.itemToSearch=Search for {0}
 DecisionDto.automaticallyApproved=(automatically approved)
-DecisionDto.automaticallyRejected=(automatically approved)
+DecisionDto.automaticallyRejected=(automatically rejected)
+DecisionDto.approvedDueToTimeout=(approved due to the timeout)
+DecisionDto.rejectedDueToTimeout=(rejected due to the timeout)
 DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition)
 DecisionDto.NO_APPROVERS_FOUND=(no approvers found)
 wf.object=Object

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

@@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache
 pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
 PageBase.subscriptionMessage=Non-subscription.
+PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription.
+PageBase.demoSubscriptionMessage=Demo subscription.
 PageBulkAction.async=Asynchronous
 PageBulkAction.button.start=Start
 PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script.
@@ -3080,6 +3082,9 @@ ScenePanel.item=Item
 ScenePanel.oldValue=Old value
 ScenePanel.newValue=New value
 ScenePanel.value=Value
+SceneItemLinePanel.removedValue=Removed value
+SceneItemLinePanel.addedValue=Added value
+SceneItemLinePanel.unchangedValue=Unchanged value
 operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI)
 TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1}
 TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0}
@@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh
 MainObjectListPanel.newObject=New
 MainObjectListPanel.import=Import
 MainObjectListPanel.export=Export
+MainObjectListPanel.exportFileName=export
 TreeTablePanel.menu.createMember=Create member
 TreeTablePanel.menu.createManager=Create manager
 TreeTablePanel.menu.addMembers=Assign members
@@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back
 PageAssignmentConflicts.submit=Submit
 AssignmentCatalogPanel.selectTargetUser=Select target user
 AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
-AssignmentCatalogPanel.requestForMe=Target user: me
-AssignmentCatalogPanel.requestFor=Target user:
+AssignmentCatalogPanel.requestForMe=Target user\: me
+AssignmentCatalogPanel.requestFor=Target user\:
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
@@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart
 PageAssignmentsList.submitButton=Submit
 PageAssignmentsList.resolveConflicts=Resolve conflicts
 PageAssignmentsList.commentHere=Comment here...
+PageAssignmentsList.requestComment=Request comment (optional)
 AssignmentShoppingCartPanel.treeTitle=Role catalog
 AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
@@ -3481,6 +3488,8 @@ PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or pa
 ItemPathSegmentPanel.itemToSearch=Search for {0}
 DecisionDto.automaticallyApproved=(automatically approved)
 DecisionDto.automaticallyRejected=(automatically rejected)
+DecisionDto.approvedDueToTimeout=(approved due to the timeout)
+DecisionDto.rejectedDueToTimeout=(rejected due to the timeout)
 DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition)
 DecisionDto.NO_APPROVERS_FOUND=(no approvers found)
 wf.object=Object

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

@@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Limpiar el cache less/js
 pageBase.midPointVersion=${pom.version}, ${git.describe}
 pageBase.unknownBuildNumber=unknown
 PageBase.subscriptionMessage=Non-subscription.
+PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription.
+PageBase.demoSubscriptionMessage=Demo subscription.
 PageBulkAction.async=Asíncrono
 PageBulkAction.button.start=Iniciar
 PageBulkAction.message.emptyString=La acción de llenado está vacía. Por favor provea un script no vacío.
@@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Asignaciones
 PageAdmin.menu.credentials=Credenciales
 PageAdmin.menu.request=Request a role
 PageTemplate.version=Version\:
-PageTemplate.copy=<strong>Copyright &copy; 2010-2016 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a> and partners.</strong> Thank you for using <a href\="http\://midpoint.evolveum.com" target\="_blank">midPoint</a>
+PageTemplate.copy=<strong>Copyright &copy; 2010-2017 <a href\="https\://www.evolveum.com/" target\="_blank">Evolveum</a>&reg; and partners.&nbsp;</strong>
 PageTemplate.toggleNavigation=Toggle navigation
 PageTemplate.user=user
 PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0}
@@ -3080,6 +3082,9 @@ ScenePanel.item=Item
 ScenePanel.oldValue=Old value
 ScenePanel.newValue=New value
 ScenePanel.value=Valor
+SceneItemLinePanel.removedValue=Removed value
+SceneItemLinePanel.addedValue=Added value
+SceneItemLinePanel.unchangedValue=Unchanged value
 operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI)
 TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1}
 TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0}
@@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh
 MainObjectListPanel.newObject=New
 MainObjectListPanel.import=Importar
 MainObjectListPanel.export=Export
+MainObjectListPanel.exportFileName=export
 TreeTablePanel.menu.createMember=Create member
 TreeTablePanel.menu.createManager=Create manager
 TreeTablePanel.menu.addMembers=Assign members
@@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back
 PageAssignmentConflicts.submit=Submit
 AssignmentCatalogPanel.selectTargetUser=Select target user
 AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner
-AssignmentCatalogPanel.requestForMe=Request for me
-AssignmentCatalogPanel.requestFor=Request for
+AssignmentCatalogPanel.requestForMe=Target user\: me
+AssignmentCatalogPanel.requestFor=Target user\:
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
@@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart
 PageAssignmentsList.submitButton=Submit
 PageAssignmentsList.resolveConflicts=Resolve conflicts
 PageAssignmentsList.commentHere=Comment here...
+PageAssignmentsList.requestComment=Request comment (optional)
 AssignmentShoppingCartPanel.treeTitle=Role catalog
 AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
@@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed.
 PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password
 ItemPathSegmentPanel.itemToSearch=Search for {0}
 DecisionDto.automaticallyApproved=(automatically approved)
-DecisionDto.automaticallyRejected=(automatically approved)
+DecisionDto.automaticallyRejected=(automatically rejected)
+DecisionDto.approvedDueToTimeout=(approved due to the timeout)
+DecisionDto.rejectedDueToTimeout=(rejected due to the timeout)
 DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition)
 DecisionDto.NO_APPROVERS_FOUND=(no approvers found)
 wf.object=Object