diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
index 59a2cadc179..4b70d09447b 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
@@ -61,7 +61,7 @@ assignablePopupContent.button.assign=Přiřazení
 assignablePopupContent.button.add=Vložit
 assignablePopupContent.description=Popis
 assignablePopupContent.displayName=Zobrazované jméno
-assignablePopupContent.message.errorLoadingRoleTypes=Nemohu načíst dostupné typy rolí.
+assignablePopupContent.message.errorLoadingRoleTypes=Nepodařilo se načíst dostupné typy rolí.
 assignablePopupContent.message.noOrgStructureDefined=Organizační struktura není definovaná.
 assignablePopupContent.name=Název
 assignablePopupContent.role.type=Typ role
@@ -108,7 +108,7 @@ AssignmentTablePanel.menu.assignOrg=Přiřadit organizaci
 AssignmentTablePanel.menu.assignRole=Přiřadit roli
 AssignmentTablePanel.menu.unassign=Odebrat přiřazení
 AssignmentTablePanel.menu.showAllAssignments=Zobrazit všechna přiřazení
-AssignmentTablePanel.message.couldntAssignObject=Nemohu přiřadit objekt '{0}', důvod\: {1}.
+AssignmentTablePanel.message.couldntAssignObject=Nepodařilo se přiřadit objekt '{0}', důvod\: {1}.
 AssignmentTablePanel.message.illegalAssignmentState=Nepovolený stav přiřazení '{0}'.
 AssignmentTablePanel.message.noAssignmentSelected=Není vybrané přiřazení.
 AssignmentTablePanel.modal.message.delete=Opravdu chcete smazat těchto {0} přiřazení?
@@ -200,11 +200,11 @@ capabilityScriptPanel.label.enabled=Povolený
 capabilityScriptPanel.label.onConnector=Na konektoru
 capabilityScriptPanel.label.onResource=Na aplikaci
 capabilityScriptPanel.label=Konfigurace skriptu
-CapabilityStep.activation.tooltip.attributeName=Name of the attribute that contains a value for simulated administrativeStatus. This is usually an attribute that contains some kind of enabled/disabled information. Typical examples are attributes such as "enabled", "ds-pwp-account-disabled", "accountStatus", etc. _
+CapabilityStep.activation.tooltip.attributeName=Název atributu, který obsahuje hodnotu simulovaného atributu administrativeStatus. Toto je obvykle atribut, který obsahuje nějaký druh informace typu povoleno/zakázáno. Typické příklady jsou atributy jako  "enabled", "ds-pwp-account-disabled", "accountStatus" a podobně.
 CapabilityStep.activation.tooltip.disableList=List of attribute values that represent the "disabled" state. If any of these values are present in the attribute then the object will be considered to be disabled. Typical values are "false", "disabled", "0" or empty value. _
 CapabilityStep.activation.tooltip.enabled=True if this capability is active. False if it is disabled. Disabled capability acts in the same way as if it was not there. Capabilities can be disabled e.g. to work around connector bugs, to make resource read-only, etc. _
 CapabilityStep.activation.tooltip.enableList=List of attribute values that represent the "enabled" state. If any of these values are present in the attribute then the object will be considered to be enabled. Typical values are "true", "ENABLED", "1" and so on. _
-CapabilityStep.activation.tooltip.ignoreAttribute=If set to true then the attribute which is used for simulated activation will be mark as ignored in the schema. I.e. midPoint will pretend that this attribute does not exist and only use the standard administrativeStatus. This is the default. If set to false then the attribute will also be visible in the schema and both the administrativeStatus and the original attribute will work. This may be needed if the attribute has a richer set of states than the administrativeStatus attribute. But in this case beware of value conflicts between administrativeStatus and the original attribute. _
+CapabilityStep.activation.tooltip.ignoreAttribute=Pokud je povoleno, potom atribut, který je použit pro simulovanou aktivaci, bude v tomto schématu označen jako ignorovaný. Systém bude v takovém případě předstírat, že tento atribut neexistuje, a použije pouze standardní atribut administrativeStatus. Toto je výchozí hodnota.<br />\nPokud není povoleno, potom atribut bude ve schématu taktéž viditelný a jak adminitrativeStatus, tak tento atribut, bude použit. Toto může být žádoucí, pokud má atribut bohatší možnosti stavů než atribut administrativeStatus. Avšak, v tomto případě je třeba si dát pozor na konflikty hodnot mezi atributem administrativeStatus a původním atributem.
 CapabilityStep.activation.tooltip.returnedByDefault=If true then the activation attribute is returned with resource objects by default and it does not need to be requested. If false then the activation attribute has to be explicitly requested. _
 CapabilityStep.activation.tooltip.validFromEnabled=True if the resource supports validFrom activation property. _
 CapabilityStep.activation.tooltip.validFromReturned=True of the validFrom property is returned by default. False if it needs to be explicitly requested. _
@@ -223,7 +223,7 @@ CapabilityStep.configured=Konfigurováno
 CapabilityStep.credentials.tooltip.enabled=True if this capability is active. False if it is disabled. Disabled capability acts in the same way as if it was not there. Capabilities can be disabled e.g. to work around connector bugs, to make resource read-only, etc. _
 CapabilityStep.credentials.tooltip.passEnabled=True if the resource supports password credentials. _
 CapabilityStep.credentials.tooltip.passReturned=True of the password is returned by default. False if it needs to be explicitly requested. _
-CapabilityStep.message.cantLoadCaps=nemohu načíst schopnosti
+CapabilityStep.message.cantLoadCaps=Nepodařilo se načíst schopnosti
 CapabilityStep.native=Nativní
 CapabilityStep.script.tooltip.enabled=True if this capability is active. False if it is disabled. Disabled capability acts in the same way as if it was not there. Capabilities can be disabled e.g. to work around connector bugs, to make resource read-only, etc. _
 CapabilityStep.script.tooltip.onConnector=Capability to execute scripts "on connector". This means that the scripts will be executed on the machine where the connector is installed. This is usually midPoint node or a connector server. _
@@ -236,8 +236,8 @@ capabilityValuePanel.label.capability.read=Schopnost číst
 capabilityValuePanel.label.capability.testConnection=Schopnost ověřit spojení
 capabilityValuePanel.label.capability.update=Schopnost měnit
 capabilityValuePanel.label.enabled=Povoleno
-CertDefinitionPage.message.cantSaveEmpty=Nemohu uložit prázdné XML.
-CertDefinitionPage.message.cantSaveEmptyName=Nemohu uložit definici s prázdným názvem.
+CertDefinitionPage.message.cantSaveEmpty=Nepodařilo se uložit prázdné XML.
+CertDefinitionPage.message.cantSaveEmptyName=Nepodařilo se uložit definici s prázdným názvem.
 ChangeType.ADD=Vložit
 ChangeType.DELETE=Smazat
 ChangeType.MODIFY=Upravit
@@ -427,7 +427,7 @@ importOptionsPanel.summarizeSuccesses=Sumarizovat úspěchy
 importOptionsPanel.validateDynamicSchema=Validovat dynamické schéma
 importOptionsPanel.validateStaticSchema=Validovat statické schéma
 ItemApprovalPanel.approvalSchema=Schéma schvalování
-ItemApprovalPanel.currentWorkItems=Aktuální úkoly a požadavky
+ItemApprovalPanel.currentWorkItems=Aktuální pracovní položky
 ItemApprovalPanel.decisionsDoneWhenFinishedIs_false=Dosud provedená rozhdonutí
 ItemApprovalPanel.decisionsDoneWhenFinishedIs_true=Rozhodování ukončeno
 ItemApprovalPanel.itemThatWasApproved=Položka byla SCHVÁLENA
@@ -478,7 +478,7 @@ LockoutStatusType.UNDEFINED=Nedefinováno
 logger.duplicate=Logger se jménem '{0}' je již definovaný.
 logger.emptyLogger=Logger nesmí být prázdný.
 LoggingComponentType.ALL=Vše
-LoggingComponentType.GUI=Web logger _
+LoggingComponentType.GUI=Logger rozhraní
 LoggingComponentType.WEB=Logovací služba webového rozhraní
 LoggingComponentType.MODEL=Model logger _
 LoggingComponentType.NOTIFICATIONS = Notification logger _
@@ -572,7 +572,7 @@ MappingEditorDialog.label.strength=Váha
 MappingEditorDialog.label.target=Cíl
 MappingEditorDialog.label.timeFrom=Čas od
 MappingEditorDialog.label.timeTo=Čas do
-MappingEditorDialog.message.cantSave=Nemohu uložit mapování. Důvod\:
+MappingEditorDialog.message.cantSave=Nepodařilo se uložit mapování. Důvod\:
 MappingEditorDialog.message.warn.emptyTarget=Příchozí mapování vyžaduje nastavení položky 'Cíl'.
 MappingsStatistics.AverageTime=Prům. čas
 MappingsStatistics.Count=Počet zpracování
@@ -608,7 +608,7 @@ multiplicityContainer.label.description=popis
 multiplicityContainer.label.enforcement=Vynucení
 multiplicityContainer.label.multiplicity=Násobnost
 MultiplicityPolicyDialog.label=Konfigurace násobného omezení
-MultiplicityPolicyDialog.message.badUpdate=Nemohu zobrazit konfiguraci prázdného násobného omezení.
+MultiplicityPolicyDialog.message.badUpdate=Nepodařilo se zobrazit konfiguraci prázdného násobného omezení.
 MultiplicityPolicyDialog.message.invalidMultiplicity=Chybná hodnota násobku. Nastavte číselnou hodnotu (0, 1, ...) nebo hodnotu 'unbounded' (použijte zaškrtávací políčko)
 MultiValueField.nameNotSpecified=(Nespecifikovaný název)
 MyAccountsPanel.account.name=Název
@@ -680,7 +680,7 @@ ObjectTypeGuiDescriptor.connector=Konektor
 ObjectTypeGuiDescriptor.connectorHost=Konektor host
 ObjectTypeGuiDescriptor.focus=Vzorový objekt
 ObjectTypeGuiDescriptor.genericObject=Generický objekt
-ObjectTypeGuiDescriptor.lookupTable=Lookup tabulka
+ObjectTypeGuiDescriptor.lookupTable=Překladová tabulka
 ObjectTypeGuiDescriptor.node=Uzel
 ObjectTypeGuiDescriptor.object=Objekt
 ObjectTypeGuiDescriptor.objectTemplate=Šablona objektu
@@ -866,28 +866,28 @@ operation.com.evolveum.midpoint.task.quartzimpl.GlobalExecutionManager.addNodeAn
 operation.com.evolveum.midpoint.task.quartzimpl.GlobalExecutionManager.stopSchedulersAndTasks=Stop schedulers and tasks (Task) _
 operation.com.evolveum.midpoint.task.quartzimpl.LocalExecutionManager.getLocallyRunningTasks=Get locally running tasks (Task) _
 operation.com.evolveum.midpoint.task.quartzimpl.TaskManagerQuartzImpl.addTaskToRepositoryAndQuartz=Add task to repository and Quartz Job Store (Task) _
-operation.com.evolveum.midpoint.web.component.assignment.AssignmentEditorPanel.loadAttributes=Load attributes (Gui) _
-operation.com.evolveum.midpoint.web.component.assignment.AssignmentEditorPanel.loadObject=Load object (Gui) _
-operation.com.evolveum.midpoint.web.component.assignment.AssignmentEditorPanel.loadResource=Load resource (Gui) _
+operation.com.evolveum.midpoint.web.component.assignment.AssignmentEditorPanel.loadAttributes=Načíst atributy (Rozhraní)
+operation.com.evolveum.midpoint.web.component.assignment.AssignmentEditorPanel.loadObject=Načíst objekt (Rozhraní)
+operation.com.evolveum.midpoint.web.component.assignment.AssignmentEditorPanel.loadResource=Načíst aplikaci (Rozhraní)
 operation.com.evolveum.midpoint.web.component.orgStruct.BookmarkableFolderContent.loadOrgUnit=Loading organization unit _
-operation.com.evolveum.midpoint.web.component.prism.ContainerWrapper.createProperties=Create properties (Gui) _
-operation.com.evolveum.midpoint.web.component.prism.ObjectWrapper.createContainers=Create containers (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugList.deleteObject=Delete object (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugList.deleteObjects=Delete objects (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugView.loadObject=Load object (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugView.saveObject=Save object (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageImportObject.importFile=Import file (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageImportObject.importXml=Import xml (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageInternals.changeTime=Change time (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageInternals.changeTimeReset=Change time - reset (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageLogging.loadLoggingConfiguration=Load logging configuration (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageLogging.updateLoggingConfiguration=Update logging configuration (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.getRepoDiag=Get repository diagnostics (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.testRepository=Test repository (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadAccounts=Load accounts (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadAssignments=Load assignments (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadUser=Load user (Gui) _
-operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadWorkItems=Load work items (Gui) _
+operation.com.evolveum.midpoint.web.component.prism.ContainerWrapper.createProperties=Vytvořit vlastnosti (Rozhraní)
+operation.com.evolveum.midpoint.web.component.prism.ObjectWrapper.createContainers=Vytvořit kontejnery (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugList.deleteObject=Smazat objekt (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugList.deleteObjects=Smazat objekty (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugView.loadObject=Načíst objekt (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugView.saveObject=Uložit objekt (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageImportObject.importFile=Importovat soubor (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageImportObject.importXml=Importovat XML soubor (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageInternals.changeTime=Změnit čas (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageInternals.changeTimeReset=Změnit čas - resetovat (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageLogging.loadLoggingConfiguration=Načíst konfiguraci logování (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageLogging.updateLoggingConfiguration=Aktualizovat konfiguraci logování (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.getRepoDiag=Získat diagnostiku repozitáře (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.testRepository=Otestovat repozitář (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadAccounts=Načíst účty (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadAssignments=Načíst přiřazení (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadUser=Načíst uživatele (Rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadWorkItems=Načíst pracovní položky (Rozhraní)
 operation.com.evolveum.midpoint.web.page.admin.home.PageMyPasswords.loadAccount=Load account (Gui) _
 operation.com.evolveum.midpoint.web.page.admin.home.PageMyPasswords.loadUser=Load user (Gui) _
 operation.com.evolveum.midpoint.web.page.admin.home.PageMyPasswords.loadUserWithAccounts=Load user with accounts (Gui) _
@@ -955,8 +955,8 @@ operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.reconcileUser=Rec
 operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.reconcileUsers=Reconcile users (Gui) _
 operation.com.evolveum.midpoint.web.page.admin.workflow.PageWorkItem.saveWorkItem=Save work item (Gui) _
 operation.com.evolveum.midpoint.web.util.WebModelUtils.deleteObject=Delete object (Gui) _
-operation.com.evolveum.midpoint.web.util.WebModelUtils.loadObject=Load object (Gui) _
-operation.com.evolveum.midpoint.wf.WfHook.invoke=Workflow hook invocation (Workflow) _
+operation.com.evolveum.midpoint.web.util.WebModelUtils.loadObject=Načíst objekt (Rozhraní)
+operation.com.evolveum.midpoint.wf.WfHook.invoke=Vyvolání zaháčkování ve workflow (Workflow)
 operation.com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelPortType.addObject=Model web service add object _
 operation.com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelPortType.deleteObject=Model web service delete object _
 operation.com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelPortType.getObject=Model web service get object _
@@ -971,11 +971,11 @@ operation.com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelPortType.
 operation.com.evolveum.midpoint.xml.ns._public.model.model_1_wsdl.ModelPortType.testResource=Model web service test resource _
 operation.linkShadow=Napojit účet (Model)
 operation.org.identityconnectors.framework.api.ConnectorFacade.addAttributeValues=Add attribute values (Icf) _
-operation.org.identityconnectors.framework.api.ConnectorFacade.create=Create (Icf) _
-operation.org.identityconnectors.framework.api.ConnectorFacade.delete=Delete object (ICF) _
-operation.org.identityconnectors.framework.api.ConnectorFacade.getObject=ICF get object _
-operation.org.identityconnectors.framework.api.ConnectorFacade.schema=ICF schema _
-operation.org.identityconnectors.framework.api.ConnectorFacade.update=Update (Icf) _
+operation.org.identityconnectors.framework.api.ConnectorFacade.create=Vytvořit objekt (ICF)
+operation.org.identityconnectors.framework.api.ConnectorFacade.delete=Smazat objekt (ICF)
+operation.org.identityconnectors.framework.api.ConnectorFacade.getObject=Získat ICF objekt
+operation.org.identityconnectors.framework.api.ConnectorFacade.schema=ICF schéma
+operation.org.identityconnectors.framework.api.ConnectorFacade.update=Aktualizovat (ICF)
 operationResultPanel.cause=Příčina\:
 operationResultPanel.context=Kontext\:
 operationResultPanel.count=Počet\:
@@ -1045,12 +1045,12 @@ PageAbout.allRightsReserved=&copy;2015 Evolveum.
 PageAbout.button.testProvisioning=Provisioning self test _
 PageAbout.button.testRepositoryCheckOrgClosure=Zkontrolovat a opravit konzistenci org. struktury
 PageAbout.button.testRepository=Repository self test _
-PageAbout.message.couldntObtainJvmParams=Nemohu získat parametry JVM z JMX.
-PageAbout.midPointRevision=${git.describe} _
+PageAbout.message.couldntObtainJvmParams=Nepodařilo se získat parametry JVM z JMX.
+PageAbout.midPointRevision=${git.describe}
 PageAbout.builtAt=Sestavení
-PageAbout.build=${timestamp} _
+PageAbout.build=${timestamp}
 PageAbout.midPointRevisionTitle=Git popis
-PageAbout.midPointVersion=${pom.version} _
+PageAbout.midPointVersion=${pom.version}
 PageAbout.midPointVersionTitle=Verze
 PageAbout.repoDiag.additionalDetails.name=Název
 PageAbout.repoDiag.additionalDetails.value=Hodnota
@@ -1071,7 +1071,7 @@ PageAbout.unknownBuildNumber=neznámý
 pageAccount.button.back=Zpět
 pageAccount.button.save=Uložit
 pageAccount.description=Účet v aplikaci
-pageAccount.message.cantEditAccount=Nemohu načíst účet pro úpravy.
+pageAccount.message.cantEditAccount=Nepodařilo se načíst účet pro úpravy.
 pageAccount.message.cantEditProtectedAccount=Toto je chráněný účet a nemůže být modifikován.
 PageAccounts.accounts.description=Popis
 PageAccounts.accounts.intent=Záměr
@@ -1091,10 +1091,10 @@ PageAccounts.count=Počet
 PageAccounts.deleted=Smazaný
 PageAccounts.disputed=Sporný
 PageAccounts.exportException=Při exportu došlo k chybě, důvod {0}
-PageAccounts.exportFileDoesntExist=Nemohu vytvořit soubor {0}
+PageAccounts.exportFileDoesntExist=Nepodařilo se vytvořit soubor {0}
 PageAccounts.linked=Navázaný
-PageAccounts.message.cantShowOwner=Nemohu zobrazit detaily vlastníka.
-PageAccounts.message.ownerNotFound=Nemohu nalézt vlastníka pro účet s OID {0}.
+PageAccounts.message.cantShowOwner=Nepodařilo se zobrazit detaily vlastníka.
+PageAccounts.message.ownerNotFound=Nepodařilo se nalézt vlastníka pro účet s OID {0}.
 PageAccounts.message.unsupportedOwnerType=Nepodporovaný typ vlastníka.
 pageAccounts.message.resourceNotSelected=Není zvolená aplikace. Vyberte aplikaci pro zobrazení jejích stínových účtů.
 PageAccounts.message.success.clearExport=Složka pro export byla vymazána úspěšně
@@ -1169,7 +1169,7 @@ PageAdmin.menu.top.workItems.list=Moje úkoly
 PageAdmin.menu.top.workItems.listProcessInstancesAll=Všechny požadavky
 PageAdmin.menu.top.workItems.listProcessInstancesRequestedBy=Moje požadavky
 PageAdmin.menu.top.workItems.listProcessInstancesRequestedFor=Požadavky o mně
-PageAdmin.menu.top.workItems=Úkoly a požadavky
+PageAdmin.menu.top.workItems=Pracovní položky
 pageAdmin.reports.description=Exportovat reporty
 pageAdmin.reports=Reporty
 PageAdmin.menu.top.users.requestAssign=Žádost o přiřazení
@@ -1181,8 +1181,8 @@ PageAdminObjectDetails.title.editServiceType=Upravit službu  '{0}'
 PageAdminObjectDetails.title.newRoleType=Vytvořit novou roli
 PageAdminObjectDetails.title.editOrgType=Upravit organizaci '{0}'
 PageAdminObjectDetails.title.newOrgType=Vytvořit novou organizaci
-pageAdminFocus.message.cantEditFocus=Nastala neznámá chyba, nemohu upravit vzorový objekt.
-pageAdminFocus.message.cantNewFocus=Nastala neznámá chyba, nemohu vytvořit objekt vzorový objekt.
+pageAdminFocus.message.cantEditFocus=Nastala neznámá chyba, Nepodařilo se upravit vzorový objekt.
+pageAdminFocus.message.cantNewFocus=Nastala neznámá chyba, Nepodařilo se vytvořit objekt vzorový objekt.
 pageAdminFocus.message.illegalAccountState=Nelegální stav stínového účtu '{0}'.
 pageAdminFocus.message.noAssignmentsAvailable=Není zde žádné přiřazení pro zobrazení.
 pageAdminFocus.message.noOrgSelected=Nebyla vybrána žádná organizace.
@@ -1201,11 +1201,11 @@ pageAdminFocus.focusDetails=Detaily
 pageAdminFocus.projections=Projekce
 pageAdminFocus.organizations=Organizace
 pageAdminFocus.assignments=Přiřazení
-pageAdminFocus.message.couldntCreateAccountNoSchema=Nemohu vytvořit projekci pro '{0}', není dostupné upravené schéma. Možný problém s konfigurací konektoru nebo spojením. Více informací najdete v logu.
-pageAdminFocus.message.couldntCreateAccountNoAccountSchema=Nemohu vytvořit projekci pro '{0}', není dostupné schéma pro výchozí typ objektu 'account'. Možný problém s konfigurací aplikace. Více informací najdete v logu.
-pageAdminFocus.message.couldntCreateAccount=Nemohu vytvořit formulář projekce pro '{0}', důvod\: {1}.
+pageAdminFocus.message.couldntCreateAccountNoSchema=Nepodařilo se vytvořit projekci pro '{0}', není dostupné upravené schéma. Možný problém s konfigurací konektoru nebo spojením. Více informací najdete v logu.
+pageAdminFocus.message.couldntCreateAccountNoAccountSchema=Nepodařilo se vytvořit projekci pro '{0}', není dostupné schéma pro výchozí typ objektu 'account'. Možný problém s konfigurací aplikace. Více informací najdete v logu.
+pageAdminFocus.message.couldntCreateAccount=Nepodařilo se vytvořit formulář projekce pro '{0}', důvod\: {1}.
 pageAdminFocus.message.noAssignableSelected=Není vybrané přiřazení.
-pageAdminFocus.message.couldntAssignObject=Nemohu přiřadit objekt '{0}', důvod\: {1}.
+pageAdminFocus.message.couldntAssignObject=Nepodařilo se přiřadit objekt '{0}', důvod\: {1}.
 pageAdminFocus.message.noActivationFound=Pro projekci '{0}' nebyla nalezena žádná aktivace.
 pageAdminFocus.message.noEnabledPropertyFound=Nenalezena vlastnost enabled pro účet '{0}'.
 pageAdminFocus.message.noAccountSelected=Nebyla zvolena žádná projekce.
@@ -1233,7 +1233,7 @@ pageAdminResources.detailsResource=Detaily aplikace
 pageAdminResources.editResource=Upravit aplikaci
 pageAdminResources.importResource=Importovat aplikaci
 pageAdminResources.listResources=Seznam aplikací
-pageAdminResources.message.cantLoadResource=Nemohu načíst detaily aplikace.
+pageAdminResources.message.cantLoadResource=Nepodařilo se načíst detaily aplikace.
 pageAdminResources.newResource=Nová aplikace
 pageAdmin.resources=Aplikace
 pageAdmin.roles.description=Konfigurace rolí
@@ -1243,7 +1243,7 @@ pageAdmin.serverTasks=Serverové úlohy
 pageAdmin.users.description=Uživatelé v repozitáři
 pageAdmin.users=Uživatelé
 pageAdmin.workItems.description=Požadavky, schvalování
-pageAdmin.workItems=Požadavky
+pageAdmin.workItems=Pracovní položky
 PageBase.button.abort=Přerušit
 PageBase.button.back=Zpět
 PageBase.button.cancel=Zrušit
@@ -1480,9 +1480,9 @@ pageContentAccounts.menu.disableAccount=Zakázat
 pageContentAccounts.menu.enableAccount=Povolit
 pageContentAccounts.menu.importAccount=Importovat
 pageContentAccounts.menu.removeOwner=Odebrat vlastníka
-pageContentAccounts.message.cantImportAccount=nemohu importovat účet, oid\={0}
-pageContentAccounts.message.cantShowAccountDetails=Nemohu zobrazit detaily účtu {0} ({1}).
-pageContentAccounts.message.cantShowUserDetails=Nemohu zobrazit detaily uživatele {0} ({1}).
+pageContentAccounts.message.cantImportAccount=Nepodařilo se importovat účet, oid\={0}
+pageContentAccounts.message.cantShowAccountDetails=Nepodařilo se zobrazit detaily účtu {0} ({1}).
+pageContentAccounts.message.cantShowUserDetails=Nepodařilo se zobrazit detaily uživatele {0} ({1}).
 pageContentAccounts.message.deleteConfirmation=Opravdu chcete smazat {0} účtů z této aplikace?
 pageContentAccounts.message.deleteConfirmationSingle=Opravdu chcete smazat účet '{0}' z této aplikace?
 pageContentAccounts.message.noAccountSelected=Nbyl vybrán žádný účet.
@@ -1508,7 +1508,7 @@ pageCreatedReports.inlineMenu.deleteSelected=Smazat vybrané
 pageCreatedReports.message.deleteAll=Opravdu chcete smazat všechny vytvořené výstupy?
 pageCreatedReports.message.deleteOutputConfirmed=Opravdu chcete smazat všechny vybrané {0} reporty?
 pageCreatedReports.message.deleteOutputSingle=Opravdu chcete smazat všech '{0}' vytvořených reportů?
-pageCreatedReports.message.downloadError=Nemohu stáhnout report.
+pageCreatedReports.message.downloadError=Nepodařilo se stáhnout report.
 pageCreatedReports.message.fileNotFound=Soubor s reportem nebyl nalezen.
 pageCreatedReports.message.nothingSelected=Nebyl vybrán žádný report.
 pageCreatedReports.message.queryError=Chyba při překladu vyhledávacího dotazu do filtru.
@@ -1528,7 +1528,7 @@ PageDashboard.serverLoad=Zátěž serveru
 PageDashboard.systemInfo=Stav systému
 PageDashboard.title=Nástěnka
 PageDashboard.usedRam=Využitá RAM
-PageDashboard.workItems=Moje úkoly
+PageDashboard.workItems=Moje pracovní položky
 PageDashboard.infobox.users.label=Uživatelé
 PageDashboard.infobox.users.number=povoleno
 PageDashboard.infobox.users.total=celkem
@@ -1564,18 +1564,18 @@ pageDebugList.menu.exportShadowsOnResource=Exportovat všechny stínové účty
 pageDebugList.menu.exportAll=Exportovat všechny objekty
 pageDebugList.menu.exportAllSelectedType=Exportovat objekty vybraného typu
 pageDebugList.menu.exportSelected=Exportovat vybrané
-pageDebugList.message.countSearchProblem=Nemohu provést vyhledání nad uživateli/shadows/org.
-pageDebugList.message.createFileException=Nemohu vytvořit soubor pro stažení.
+pageDebugList.message.countSearchProblem=Nepodařilo se provést vyhledání nad uživateli/shadows/org.
+pageDebugList.message.createFileException=Nepodařilo se vytvořit soubor pro stažení.
 pageDebugList.message.deleteAllType=Opravdu chcete smazat všechny objekty typu "{0}"?
 pageDebugList.message.deleteObjectConfirm=Opravdu chcete smazat "{0}"?
 pageDebugList.message.deleteSelectedConfirm=Opravdu chcete smazat {0} objektů?
 pageDebugList.message.laxativeProblem=Operace zrušit všechny identity byla dokončena úspěšně
 pageDebugList.message.nothingSelected=Nebyl vybrán žádný objekt.
-pageDebugList.message.queryException=nemohu vytvořit dotaz pro podřetězec jména, důvod\: {0}
+pageDebugList.message.queryException=Nepodařilo se vytvořit dotaz pro podřetězec jména, důvod\: {0}
 pageDebugList.message.resourceNotSelected=Nebyla vybrána apliakce.
-pageDebugList.message.singleOrgDeleteProblem=Nemohu smazat org. jednotku
-pageDebugList.message.singleShadowDeleteProblem=Nemohu smazat shadow
-pageDebugList.message.singleUserDeleteProblem=Nemohu smazat uživatele
+pageDebugList.message.singleOrgDeleteProblem=Nepodařilo se smazat org. jednotku
+pageDebugList.message.singleShadowDeleteProblem=Nepodařilo se smazat shadow
+pageDebugList.message.singleUserDeleteProblem=Nepodařilo se smazat uživatele
 pageDebugList.messsage.deleteAllOfType=Odstraňuji objekty typu {0}.
 pageDebugList.messsage.deleteAllResourceShadows=Opravdu chcete smazat všechny stínové účty v aplikaci {0}?
 pageDebugList.messsage.deleteAllShadowsStarted=Úloha, která maže všechny stínové účty v aplikaci {0}, nastartovala.
@@ -1593,7 +1593,7 @@ pageDebugView.button.back=Zpět
 pageDebugView.button.save=Uložit
 pageDebugView.edit=Upravit
 pageDebugView.encrypt=Chránit kryptováním
-pageDebugView.message.cantSaveEmpty=Nemohu uložit prázdné XML.
+pageDebugView.message.cantSaveEmpty=Nepodařilo se uložit prázdné XML.
 pageDebugView.message.oidNotDefined=OID objektu není definováno.
 pageDebugView.options=Možnosti
 pageDebugView.reevaluateSearchFilters=Přepočítat vyhledávací filtry
@@ -1620,7 +1620,7 @@ PageImportObject.button.import=Importovat objekt
 PageImportObject.embeddedEditor=Vložený editor
 PageImportObject.file=Soubor
 PageImportObject.getObjectsFrom=Získat objekt z
-pageImportObject.message.emptyXml=Nemohu uložit prázdné XML.
+pageImportObject.message.emptyXml=Nepodařilo se uložit prázdné XML.
 PageImportObject.message.help=Vyberte XML soubor pro import.
 pageImportObject.message.nullFile=Nahraný soubor je null.
 PageImportObject.title=Importovat objekty
@@ -1715,7 +1715,7 @@ PageMyPasswords.accountMidpoint=MidPoint _
 PageMyPasswords.accounts=Účty
 PageMyPasswords.button.back=Zpět
 PageMyPasswords.button.save=Uložit
-PageMyPasswords.couldntResolve=Nemohu kontaktovat aplikaci.
+PageMyPasswords.couldntResolve=Nepodařilo se kontaktovat aplikaci.
 PageMyPasswords.enabled=Povoleno
 PageMyPasswords.importantNote=Pokud je vybráno, pak jsou uživatelské heslo a všechna pověření účtů uživatele aktualizována podle nastavení politik v definici aplikací.
 PageMyPasswords.name=Název
@@ -1728,7 +1728,7 @@ PageNewReport.button.import=Importovat report
 PageNewReport.embeddedEditor=Vložený editor
 PageNewReport.file=Soubor
 PageNewReport.getObjectsFrom=Vytvořit report z
-PageNewReport.message.emptyXml=Nemohu uložit prázdné XML.
+PageNewReport.message.emptyXml=Nepodařilo se uložit prázdné XML.
 PageNewReport.message.help=Vyberte XML sobor pro import.
 PageNewReport.message.nullFile=Nahraný soubor je null.
 PageNewReport.title=Importovat Jasper report
@@ -1772,8 +1772,8 @@ PageReport.basic=Konfigurace
 PageReport.fullXml=Plné XML
 PageReport.jasperTemplate=Šablona Jasper
 PageReport.jasperTemplateStyle=Styl šablony Jasper
-PageReport.message.cantSaveEmpty=Nemohu uložit prázdný report.
-PageReport.message.cantSerializeFromObjectToString=Nemohu převést objekt do XML.
+PageReport.message.cantSaveEmpty=Nepodařilo se uložit prázdný report.
+PageReport.message.cantSerializeFromObjectToString=Nepodařilo se převést objekt do XML.
 PageReports.button.configure=Konfigurovat
 PageReports.button.run=Spustit
 PageReports.message.jasperError=Chyba při vytváření reportu.
@@ -1826,7 +1826,7 @@ pageResource.conSanity=Stav konektoru
 pageResource.conSchema=Schéma konektoru
 pageResource.deleteSyncToken=Smazat synch. token
 pageResourceEdit.edit=Upravit
-pageResourceEdit.message.emptyXml=Nemohu uložit prázdný XML jako aplikaci.
+pageResourceEdit.message.emptyXml=Nepodařilo se uložit prázdný XML jako aplikaci.
 pageResourceEdit.options=Možnosti
 pageResource.editResource=Upravit aplikaci
 PageResourceEdit.title=Nová aplikace
@@ -1898,8 +1898,8 @@ PageRoleEditor.label.riskLevel=Úroveň rizika
 PageRoleEditor.label.type=Typ
 PageRoleEditor.message.addApproverOk=Schvalovatel\: '{0}' byl úspěšně vložen.
 PageRoleEditor.message.addOwnerOk=Vlastník\: '{0}' byl úspěšně vložen.
-PageRoleEditor.message.cantAddOwner=Nemohu nastavit vybraného vlastníka.
-PageRoleEditor.message.cantCreateExtensionDelta=Nemohu vytvořit rozdíl pro rozšíření role
+PageRoleEditor.message.cantAddOwner=Nepodařilo se nastavit vybraného vlastníka.
+PageRoleEditor.message.cantCreateExtensionDelta=Nepodařilo se vytvořit rozdíl pro rozšíření role
 PageRoleEditor.subtitle.activation=Aktivace
 PageRoleEditor.subtitle.basic=Základní
 PageRoleEditor.subtitle.editingRole=role '{0}'
@@ -1944,7 +1944,7 @@ RichHyperlinkConfigDialog.color=Barva
 RichHyperlinkConfigDialog.authorization=Autorizace
 RichHyperlinkConfigDialog.icon=Ikonka (CSS třída)
 RichHyperlinkConfigDialog.description=Popis
-RichHyperlinkConfigDialog.message.badUpdate=Nemohu zobrazit konfiguraci prázdného odkazu na nástěnce.
+RichHyperlinkConfigDialog.message.badUpdate=Nepodařilo se zobrazit konfiguraci prázdného odkazu na nástěnce.
 PageTaskAdd.title=Nová úloha
 pageTask.advancedOption=Rozšířené možnosti
 pageTask.basic=Základní
@@ -1995,7 +1995,7 @@ pageTaskEdit.intent=Záměr
 pageTaskEdit.kind=Typ objektu
 pageTaskEdit.lastFinished=Poslední běh ukončen
 pageTaskEdit.lastStarted=Poslední běh spuštěn
-pageTaskEdit.message.cantTaskDetails=Nemohu načíst detaily úlohy.
+pageTaskEdit.message.cantTaskDetails=Nepodařilo se načíst detaily úlohy.
 pageTaskEdit.message.node=- v uzlu {0}
 pageTaskEdit.misfire=Selhání akce
 pageTaskEdit.modelOperationStatusLabel=Stav operace modelu
@@ -2107,7 +2107,7 @@ pageTasks.inForNotRunningTasks=(za {0})
 pageTasks.in=za {0}
 pageTasks.message.alreadyResumed=Úloha '{0}' nemůže pokračovat, protože již běží nebo byla uzavřena.
 pageTasks.message.alreadySuspended=Úloha '{0}' je již pozastavena nebo uzavřena.
-pageTasks.message.couldntCreateQuery=Nemohu vyvořit dotaz pro seznam úloh.
+pageTasks.message.couldntCreateQuery=Nepodařilo se vyvořit dotaz pro seznam úloh.
 pageTasks.message.deleteTaskConfirm=Opravdu chcete smazat úlohu '{0}'?
 pageTasks.message.deleteAllClosedTasksConfirm=Opravdu chcete smazat všechny ukončené úlohy?
 pageTasks.message.deleteTasksConfirm=Opravdu chcete smazat {0} úloh?
@@ -2167,13 +2167,13 @@ pageUser.menu.assignOrg=Přiřadit org. jednotku
 pageUser.menu.assignRole=Přiřadit roli
 pageUser.menu.unassign=Odebrat
 pageUser.message.cantCreateUser=Vytvoření uživatele se nezdařilo.
-pageUser.message.cantEditUser=Nemohu načíst formulář pro úpravu uživatele.
-pageUser.message.cantNewUser=Nemohu načíst formulář pro nového uživatele.
-pageUser.message.cantSubmitUser=Nemohu zpracovat uživatele
+pageUser.message.cantEditUser=Nepodařilo se načíst formulář pro úpravu uživatele.
+pageUser.message.cantNewUser=Nepodařilo se načíst formulář pro nového uživatele.
+pageUser.message.cantSubmitUser=Nepodařilo se zpracovat uživatele
 pageUser.message.cantUpdateUser=Aktualizace uživatele se nezdařila
-pageUser.message.couldntAssignObject=Nemohu přiřadit objekt '{0}', důvod\: {1}.
-pageUser.message.couldntCreateAccount=Nemohu vytvořit formulář účtu '{0}', důvod\: {1}.
-pageUser.message.couldntCreateAccountNoSchema=Nemohu vytvořit formulář účtu '{0}', není vybrané schéma. Možný problém s připojením nebo konfigurací aplikace. Více informací najdete v logu.
+pageUser.message.couldntAssignObject=Nepodařilo se přiřadit objekt '{0}', důvod\: {1}.
+pageUser.message.couldntCreateAccount=Nepodařilo se vytvořit formulář účtu '{0}', důvod\: {1}.
+pageUser.message.couldntCreateAccountNoSchema=Nepodařilo se vytvořit formulář účtu '{0}', není vybrané schéma. Možný problém s připojením nebo konfigurací aplikace. Více informací najdete v logu.
 pageUser.message.deleteAccountConfirm=Opravdu chcete smazat {0} účtů?
 pageUser.message.deleteAssignmentConfirm=Opravdu chcete odebrat {0} přiřazení?
 pageUser.message.illegalAccountState=Neznámý stav účtu '{0}'.
@@ -2257,14 +2257,14 @@ workItemPanel.changesToBeApproved=Změny ke schválení
 workItemPanel.approvalHistory=Historie schvalování pro tuto žádost
 workItemPanel.approvalHistoryHelp=Zde jsou zobrazena rozhodnutí, která byla doposud učiněna v procesu schvalování změn.
 TaskWfChildPanel.approvalHistoryHelp=Zde jsou zobrazena rozhodnutí, která byla doposud učiněna v procesu schvalování změn.
-workItemPanel.otherWorkItemsHelp=Zde jsou zobrazeny položky úkolu na změnu, které jsou aktivní (navíc k položkám úkolů, již zobrazeným na této stránce)
-TaskWfChildPanel.currentWorkItemsHelp=Zde jsou zobrazeny položky úkolu na změnu, které jsou aktivní
+workItemPanel.otherWorkItemsHelp=Zde jsou zobrazeny pracovní položky pro změnu, které jsou aktivní (navíc k pracovním položkám, které jsou již zobrazené na této stránce)
+TaskWfChildPanel.currentWorkItemsHelp=Zde jsou zobrazeny pracovní položky pro změnu, které jsou aktivní.
 workItemPanel.relatedRequestsHelp=Seznam žádostí na schválení, které byly vytvořeny spolu tímto. Každá žádost má svůj vlastní schvalovací proces a tedy může bát schválena nebo odmítnuta nezávisle na ostatních. Všechny byly spuštěny jako důsledek jediné operace změny, která sestává z vícero drobných jednoduchých změn.
 TaskWfChildPanel.relatedRequestsHelp=Seznam žádostí na schválení, které byly vytvořeny spolu tímto. Každá žádost má svůj vlastní schvalovací proces a tedy může bát schválena nebo odmítnuta nezávisle na ostatních. Všechny byly spuštěny jako důsledek jediné operace změny, která sestává z vícero drobných jednoduchých změn.
 workItemPanel.showRequestHelp=Zobrazuje žádost na schválení a odpovídající schvalovací procesy na změny.
 TaskWfChildPanel.showParentHelp=Zobrazuje celou operaci, která sestává z jednoho nebo více změn, které vyžadují schválení.
 TaskWfParentPanel.requestsHelp=Zde jsou zobrazeny všechny procesy schvalování změn.
-workItemPanel.otherWorkItems=Další úkoly pro tuto žádost
+workItemPanel.otherWorkItems=Další pracovní položky pro tuto žádost
 workItemPanel.requests=Žádosti
 workItemPanel.relatedRequests=Příbuzné žádosti
 workItemPanel.approverComment=Komentář schvalovatele
@@ -2272,13 +2272,13 @@ pageWorkItems.button.approve=Schválit
 pageWorkItems.button.claim=Převzít
 pageWorkItems.button.reject=Odmítnout
 pageWorkItems.button.release=Uvolnit
-PageWorkItemsClaimable.title=Úkoly nárokované na mě
+PageWorkItemsClaimable.title=Pracovní položky,  na kterých mohu pracovat
 pageWorkItems.item.created=Vytvořeno
 pageWorkItems.item.name=Název
 pageWorkItems.item.owner=Vlastník
 pageWorkItems.item.status=Stav
 pageWorkItems.message.noItemSelected=Nebyl vybrán žádný úkol.
-PageWorkItems.title=Úkoly přidělené mě
+PageWorkItems.title=Pracovní položky přiřazené mě
 PageWorkItem.title=Detaily úkolu
 PageWorkItem.subTitle=detaily úkolu
 pageWorkItem.title=Úkol\:
@@ -2328,14 +2328,14 @@ prismValuePanel.delete=Smazat
 prismValuePanel.message.association.attributes=Atributy\:
 processInstancePanel.details=Další informace\:
 processInstancePanel.finished=Ukončeno\:
-processInstancePanel.message.cantGetDetails=Nemohu získat detaily procesu.
+processInstancePanel.message.cantGetDetails=Nepodařilo se získat detaily procesu.
 processInstancePanel.message.noTasks=žádný
 processInstancePanel.name=Název procesu\:
 processInstancePanel.pid=ID instance\:
 processInstancePanel.started=Spuštěno\:
 processInstancePanel.taskAlreadyRemoved=(byl již odebrán)
 processInstancePanel.task=Úloha MidPointu\:
-processInstancePanel.tasks=Aktuální aktivní úkoly\:
+processInstancePanel.tasks=Aktivní pracovní položky
 processInstancePanel.title.edit=Detaily pro '{0}'
 ProfilingLevel.ARGUMENTS=Argumenty
 ProfilingLevel.ENTRY_EXIT=Vstup/výstup
@@ -2423,7 +2423,7 @@ ResourceAssociationEditor.label.resourceItem=Specifické atributy položky aplik
 ResourceAssociationEditor.label.tolerant=Tolerantní
 ResourceAssociationEditor.label.tolerantVP=Tolerantní vzor
 ResourceAssociationEditor.label.valueAttribute=Hodnota atributu
-ResourceAssociationEditor.message.cantParseSchema=Nemohu zpracovat schéma systému
+ResourceAssociationEditor.message.cantParseSchema=Nepodařilo se zpracovat schéma systému
 ResourceAttributeEditor.label.allow=Atribut bez schématu
 ResourceAttributeEditor.label.description=Popis
 ResourceAttributeEditor.label.displayName=Zobrazované jméno
@@ -2439,7 +2439,7 @@ ResourceAttributeEditor.label.outbound=Odchozí mapování
 ResourceAttributeEditor.label.reference=Atribut
 ResourceAttributeEditor.label.tolerant=Tolerantní
 ResourceAttributeEditor.label.tolerantVP=Tolerantní vzor
-ResourceAttributeEditor.message.cantParseSchema=Nemohu zpracovat schéma aplikace
+ResourceAttributeEditor.message.cantParseSchema=Nepodařilo se zpracovat schéma aplikace
 ResourceAttributeEditor.title.delete=Smazat
 ResourceAttributeEditor.title.edit=Upravit
 ResourceCredentialsEditor.label=Upravit pověření aplikace
@@ -2577,7 +2577,7 @@ SchemaHandlingStep.label.iteration=Opakování
 SchemaHandlingStep.label.kind=Typ
 SchemaHandlingStep.label.newObjectType=Nový typ objektu
 SchemaHandlingStep.label.objectClass=Třída objektu
-SchemaHandlingStep.label.objectTypes=Typy objektu
+SchemaHandlingStep.label.objectTypes=Typy objektů
 SchemaHandlingStep.label.protected=Chráněný
 SchemaHandlingStep.limitations.tooltip.ignore=Flag to ignore an attribute. MidPoint will pretend that the ignored attribute does not exist at all. It will not display it in the user interface, will not apply mappings, etc. _
 SchemaHandlingStep.limitations.tooltip.layers=System layers to which this limitation applies. Sometimes the limitation does not apply equally to all the layers. E.g. the attribute may be formally read-write but we want it to be only presented as read-only by the user interface and change it only through mappings. In such a case the read-only limitation applies only to "presentation" layer. _
@@ -2600,8 +2600,8 @@ SchemaHandlingStep.mapping.tooltip.expressionValuePolicyRef=Reference to a value
 SchemaHandlingStep.mapping.tooltip.source=Mapping source. Mapping will react to changes in its sources. The values of the sources are input parameters to the expression inside the mapping. _
 SchemaHandlingStep.mapping.tooltip.strength=The strength with which the mapping is applied. Weak mappings are only applied if there is no value in the target yet. Normal mappings are applied only if the source has been changed. Strong mappings are applied always. _
 SchemaHandlingStep.mapping.tooltip.target=Mapping target. The value that the mapping produces will be applied to the mapping target. _
-SchemaHandlingStep.message.errorLoadingObjectTypeList=Nemohu načíst seznam tříd objektů z aplikace. Chyba\:
-SchemaHandlingStep.message.saveError=Nemohu uložit nastavení schématu, {0}
+SchemaHandlingStep.message.errorLoadingObjectTypeList=Nepodařilo se načíst seznam tříd objektů z aplikace. Chyba\:
+SchemaHandlingStep.message.saveError=Nepodařilo se uložit nastavení schématu, {0}
 SchemaHandlingStep.message.selectObjectClassAss=Nastavte atribut 'Třída objektu' před tím, než vytvoříte asociaci aplikace.
 SchemaHandlingStep.message.selectObjectClassAttr=Nastavte atribut 'Třída objektu' před tím, než vytvoříte atribut aplikace.
 SchemaHandlingStep.message.validationError=Vložená hodnota třídy objektu\: '{0}' není správná. Nasdtavte správnou hodnotu třídy objektu.
@@ -2632,7 +2632,7 @@ SchemaListPanel.details.kind=Typ
 SchemaListPanel.details.nativeObjectClass=Nativní třída objektu
 SchemaListPanel.displayName=Zobrazované jméno
 SchemaListPanel.displayOrder=Pořadí
-SchemaListPanel.message.couldntParseSchema=Nemohu zpracovat schéma aplikace
+SchemaListPanel.message.couldntParseSchema=Nepodařilo se zpracovat schéma aplikace
 SchemaListPanel.minMax=Min/max počet
 SchemaListPanel.name=Název
 SchemaListPanel.nativeAttributeName=Nativní název atributu
@@ -2651,7 +2651,7 @@ SchemaStep.xml=Xml _
 SearchFilterPanel.button.update=Aktualizovat
 SearchFilterPanel.label.description=Popis
 SearchFilterPanel.label.filterClause=Filtrovat
-SearchFilterPanel.message.cantSerialize=Nemohu vytvořit MaxXNode z poskytnutého XML filtru. Vložte správnou hodnotu. Důvod\: {0}
+SearchFilterPanel.message.cantSerialize=Nepodařilo se vytvořit MaxXNode z poskytnutého XML filtru. Vložte správnou hodnotu. Důvod\: {0}
 SearchFilterPanel.message.expressionSuccess=Definice filtru byla úspěšně aktualizována.
 searchForm.filetype.null=Typ souboru
 searchForm.reportType.null=Typ reportu
@@ -2762,9 +2762,9 @@ SynchronizationStep.label.opportunistic=Příležitostně
 SynchronizationStep.label.reaction=Reakce
 SynchronizationStep.label.reconcile=Rekonciliovat
 SynchronizationStep.label.syncObjectHeader=Synchronizační objekty
-SynchronizationStep.message.cantSave=Nemohu uložit synchronizaci aplikace.
-SynchronizationStep.message.errorLoadingObjectSyncList=Nemohu načíst seznam synchronizačních objektů z aplikace. Chyba\:
-SynchronizationStep.message.errorLoadingObjectTemplates=Nemohu načíst objekty šablon z repozitory.
+SynchronizationStep.message.cantSave=Nepodařilo se uložit synchronizaci aplikace.
+SynchronizationStep.message.errorLoadingObjectSyncList=Nepodařilo se načíst seznam synchronizačních objektů z aplikace. Chyba\:
+SynchronizationStep.message.errorLoadingObjectTemplates=Nepodařilo se načíst objekty šablon z repozitory.
 SynchronizationStep.message.unsupportedActionFormat=Používáte zastaralý atribut 'ref' pro definici reakce. Místo toho použijte element 'handlerUri'. Akce s atributem 'ref' v tomto průvodci nebudou zobrazeny.
 SynchronizationStep.reaction.tooltip.action=Explicit action. This setting defines what midPoint has to do as a reaction to the synchronization event. _
 SynchronizationStep.reaction.tooltip.channel=Channel limitation. If the synchronization event originated from the specified channel (e.g. live sync, reconciliation or import) then this reaction will be processed. It will be ignored otherwise. _
@@ -2794,13 +2794,13 @@ SystemConfigPanel.deprecated.objectPolicy=Tato část konfigurace je zastaralá.
 SystemConfigPanel.mail.config.placeholder=Nová konfigurace
 SystemConfigPanel.mail.debug=Ladění
 SystemConfigPanel.mail.defaultFrom=Výchozí odesílatel
-SystemConfigPanel.mail.host=Host _
+SystemConfigPanel.mail.host=Hostitel
 SystemConfigPanel.mail.password=Heslo
 SystemConfigPanel.mail.password.placeholder.empty=Nastavit heslo
 SystemConfigPanel.mail.password.placeholder.set=Heslo je nastaveno
 SystemConfigPanel.mail.port=Port
-SystemConfigPanel.mail.server=Mail Server _
-SystemConfigPanel.mail.server.remove.warn=Nemohu smazat vybranou konfiguraci mailového serveru. Změny zvolené konfigurace zabrání jejímu odebrání. vyberte jinou konfiguraci k odebrání.
+SystemConfigPanel.mail.server=Mailový server
+SystemConfigPanel.mail.server.remove.warn=Nepodařilo se smazat vybranou konfiguraci mailového serveru. Změny zvolené konfigurace zabrání jejímu odebrání. vyberte jinou konfiguraci k odebrání.
 SystemConfigPanel.mail.server.tooltip=Vyberte mail server pro konfiguraci. Pro vložení nové konfigurace stiskněte tlačítko '+'. Pro smazání vybrané konfigurace stiskněte tlačítko '-'.
 SystemConfigPanel.mail.transportSecurity=Bezpečnost přenosu
 SystemConfigPanel.mail.username=Uživatel
@@ -2811,7 +2811,7 @@ SystemConfigPanel.title.accountSynchronization=Nastavení globální synchroniza
 SystemConfigPanel.title.basic=Základní
 SystemConfigPanel.title.connectorFramework=Konfigurace frameworku konektorů
 SystemConfigPanel.title.misc=Různé
-SystemConfigPanel.title.modelHooks=Model hooks _
+SystemConfigPanel.title.modelHooks=Zaháčkování do modelu
 SystemConfigPanel.title.notification=Notifikace
 SystemConfigPanel.title.passwordPolicy=Globální politika hesel
 SystemConfigPanel.title.securityPolicy=Globální bezpečnostní politika
@@ -2926,16 +2926,16 @@ TreeTablePanel.menu.delete=Smazat
 TreeTablePanel.menu.disable=Deaktivovat
 TreeTablePanel.menu.enable=Aktivovat
 TreeTablePanel.menu.move=Přesunout
-TreeTablePanel,menu.recompute=Přeuložit
+TreeTablePanel,menu.recompute=Přepočítat
 TreeTablePanel.menu.removeFromHierarchy=Odebrat z org. jednotky
 TreeTablePanel.message.deleteObjectConfirm=Opravdu chcete odebrat {0} zvolených objektů?
 TreeTablePanel.message.deleteRootConfirm=Opravdu chcete odebrat {0} ({1})?
 TreeTablePanel.message.nothingSelected=Nebyly vybrány žádné objekty.
-TreeTablePanel.message.recomputeError=Nemohu přeuložit org. jednotku
+TreeTablePanel.message.recomputeError=Nepodařilo se přeuložit org. jednotku
 TreeTablePanel.moveRoot=Přesunout kořen
 TreeTablePanel.recomputeRoot=Přeuložit kořen
 TreeTablePanel.recomputeTask=Přeuložit uživatele v organizaci {0}
-TreeTablePanel.search.scope.one=Jedaá úroveň
+TreeTablePanel.search.scope.one=Jedna úroveň
 TreeTablePanel.search.scope.subtree=Podstrom
 TreeTablePanel.fullName.displayName=Celé/Zobrazované jméno
 TreeTablePanel.identifier.description=Identifikátor/Popis
@@ -2975,7 +2975,7 @@ UserReportConfigPanel.dateFrom=Od
 UserReportConfigPanel.dateTo=Do
 UserReportConfigPanel.exportFileType=Typ exportu
 UserReportConfigPanel.title.basic=Základní konfigurace reportů
-User.superuser=Superuživatel
+User.superuser=Privilegovaný uživatel
 UserType.emailAddress=Email
 UserType.familyName=Příjmení
 UserType.fullName=Celé jméno
@@ -2983,14 +2983,14 @@ UserType.givenName=Křestní
 validFromFetchStrategy.nullValid=Vyberte jeden
 validToFetchStrategy.nullValid=Vyberte jeden
 valueAttribute.nullValid=Vyberte jeden
-WebModelUtils.couldntLoadObject=Nemohu načíst objekt.
+WebModelUtils.couldntLoadObject=Nepodařilo se načíst objekt.
 web.security.provider.access.denied=Přístup odepřen. Nemáte právo přístupu, kontaktujte administrátory.
 web.security.provider.denied=Přístup odepřen.
 web.security.provider.disabled=Uživatel je zakázaný.
 web.security.provider.invalid=Chybné uživatelské jméno nebo heslo.
 web.security.provider.locked=Uživatel je uzamčen, zkuste to později.
 web.security.provider.password.bad=Uživatel nemá nastavené heslo.
-web.security.provider.password.encoding=Nemohu přihlásit uživatele, důvod\: Nemohu dekódovat heslo.
+web.security.provider.password.encoding=Nepodařilo se přihlásit uživatele, důvod\: Nepodařilo se dekódovat heslo.
 web.security.provider.unavailable=Nyní nemůžeme zpracovat Váš požadavek. Prosíme, zkuste to znovu později.
 WfDeltasPanel.label.deltaIn=Vstup procesu\: Změny ke schválení
 WfDeltasPanel.label.deltaOutListEmpty=(prázdný)
@@ -3033,7 +3033,7 @@ MyRequestsPanel.inProgress = Zpracovává se
 MyRequestsPanel.name = Název
 PageSelfProfile.title=Upravit profil
 PageSelfDashboard.title=Domů
-PageSelfDashboard.workItems=Moje úkoly
+PageSelfDashboard.workItems=Moje pracovní položky
 PageSelfDashboard.myRequests=Moje požadavky
 PageAdmin.menu.top.serverTasks.edit=Upravit úlohu
 PageAdmin.menu.top.configuration.repositoryObjectView=Upravit objekt
@@ -3058,7 +3058,7 @@ ChangePasswordPanel.enabled=Povoleno
 ChangePasswordPanel.legendMessage.selected= - Heslo bude změněno
 ChangePasswordPanel.legendMessage.propagated= - Heslo může být změněno (v závislosti na definici aplikace)
 ChangePasswordPanel.legendMessage.deselected= - Heslo nebude změněno
-ChangePasswordPanel.helpInfo=<p>Tato část dialogu pověření řídí způsob, jakým bude změna hesla propagována do každé jednotlivé aplikace. První řádka definuje zda heslo bude změněno v samotném Identity manageru. Další řádky představují každou aplikaci, pro kterou bude heslo změněno. Propagování hesla se řídí těmito ikonkami\\\:</p><ul><li><span class\\\="fa fa-check-square-o"/> Heslo bude změněno. Heslo pro tuto aplikaci bude změněno na hodnotu uvedenou v dialogu výše.</li><li><span class\\\="fa fa-sign-out"/> Automatická propagace hesla. Heslo může být změněno. Zda heslo změněno bude či nikoli závisí na politice nastavené správcem identit. Toto obvykle značí, že heslo bude změněno, pokud to dané situaci a nastavení dává smysl.</li><li><span class\\\="fa fa-square-o"/> Heslo v této aplikaci změněno nebude.</li></ul><p>Můžete změnit nastavení propagace hesla kliknutím na danou ikonku. Tímto způsobem můžete nastavovat, jak přesně se má heslo do každé aplikace propagovat.</p>
+ChangePasswordPanel.helpInfo=<p>Tato část dialogu pověření řídí způsob, jakým bude změna hesla propagována do každé jednotlivé aplikace. První řádka definuje, zda bude heslo změněno v samotném systému. Další řádky představují každou aplikaci, pro kterou bude heslo změněno. Propagování hesla se řídí těmito ikonkami\:</p><ul><li><span class\="fa fa-check-square-o"/> Heslo bude změněno. Heslo pro tuto aplikaci bude změněno na hodnotu uvedenou v políčku pr oheslo.</li><li><span class\="fa fa-sign-out"/> Automatická propagace hesla. Heslo může být změněno. Zda heslo změněno bude či nikoli, závisí na politice nastavené správcem identit. Toto obvykle značí, že heslo bude změněno, pokud to dané situaci a nastavení dává smysl.</li><li><span class\="fa fa-square-o"/> Heslo v této aplikaci změněno nebude.</li></ul><p>Můžete změnit nastavení propagace hesla kliknutím na danou ikonku. Tímto způsobem můžete nastavovat, jak přesně se má heslo do každé aplikace propagovat.</p>
 ChangePasswordPanel.helpPopupTitle=Nápověda pro propagaci hesla
 PageBase.button.tooltip.clearSearch=Vyčistit
 mainForm.uploadTooLarge = Nahrávaný soubor musí být menší než ${maxSize}.
@@ -3092,7 +3092,7 @@ FeedbackAlertMessageDetails.error=Chyba
 operation.com.evolveum.midpoint.model.impl.lens.projector.InboundProcessor.processInbound=Příchozí proces (Model)
 operation.com.evolveum.midpoint.model.impl.lens.projector.Projector.project=Projekt (Model)
 operation.com.evolveum.midpoint.model.impl.lens.projector.AssignmentProcessor.processAssignmentsProjections=Proces přiřazení (Model)
-operation.com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails.save=Uložit (rozhraní)
+operation.com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails.save=Uložit (Rozhraní)
 operation.com.evolveum.midpoint.repo.api.RepositoryService.getVersion=Získat verzi (Repozitář)
 operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.scheduleRunnableTaskNow=Naplánovat spustitelnou úlohu (Úloha)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskAdd.runNowTask=Spustit nyní (Úloha)
@@ -3248,7 +3248,7 @@ PageCertDefinition.scopeSearchFilterHelp=Pokud je pro certifikaci zvažována je
 PageCertDefinition.scopeAssignmentsInducementsHelp=Vybrat, které rysy (přiřazení, dědění nebo oboje) objektů popsaných výše jsou certifikovány.
 PageCertDefinition.scopeIncludeTargetTypesHelp=Když jsou certifikovány přiřazení nebo dědění, můžete určit jaké cílové typy jsou použity. Například, můžete určit, že chcete certifikovat pouze přiřazení rolí (uživatelům).
 PageCertDefinition.scopeIncludeByStatusHelp=Zda se mají certifikovat pouze přiřazení či dědění, která mají administrativní status nastaven na Povoleno (či nijak nenastaven). Poznámka\: důležitý je zde administrativní status přiřazení, ne administrativní status přiřazeného objektu.
-StageDefinitionPanel.stageDurationHelp=Doba trvání této fáze, použitá k určení času konce fáze. Čas konce fáze se počítá jako okamžik spuštění fáze, plus doba trvání, zaokrouhleno na 23\:59\:59 posledního dne. <br />\nTrvání je zadáváno ve formátu ISO 8601, tj například P14D pro 14 dní, P3W pro tři týdny, P2M pro dva měsíce a podobně.
+StageDefinitionPanel.stageDurationHelp=Trvání této fáze, použité k určení konce fáze. Čas konce fáze je počítán jako okamžik otevření fáze plus doba trvání, zaokrohleno na čas 23\:59\:59 posledního dne. <br />Trvání se specifikuje v ISO 8601 formátu, například\: P14D \= 14 dní , P3W \= 3 týdny, P2M \= 2 měsíce, a podobně.
 StageDefinitionPanel.notifyBeforeDeadlineHelp=Jak dlouho před koncem fáze se mají posílat upozornění (ověřitelům a vlastníkovi kampaně). Lze zadatr více hodnot, oddělených čárkou.Trvání je zadáváno ve formátu ISO 8601, například PT12H pro 12 hodin, P2D pro 2 dny, P1W pro jeden týden a podobně.<br/>Například, PT48H, PT12H znamená, že první upozornění se pošle 48 hodin před koncem fáze, následovaná druhým upozorněním 12 před koncem fáze.
 StageDefinitionPanel.notifyWhenNoDecisionHelp=Pokud je zaškrtnuto, je upozornění o blížícím se konci fáze zasláno ověřiteli, a to jen tehdy, pokud nějaké případy čekají na jeho/její rozhodnutí. <br /> Pokud není zaškrtnuto, ověřitelé dostanou upozornění vždy - bez ohledu na to, zda provedli rozhodnutí, nebo ne. (Poznámka\: vlastník kampaně dostane upozornění na blížící se konec fáze vždy, bez ohledu na toto nastavení)
 StageDefinitionPanel.reviewerSpecificationTargetHelp=Výběr ověřitelů na základě přiřazení/dědění vlastníka/schvalovatele cíle. Například lze určit, že vlastník role certifikuje všechna přiřazení "své" role (komukoli).
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
index 1a3ad6342dd..16c255eff7a 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
@@ -28,7 +28,7 @@ AccessCertificationResponseType.ACCEPT=Accept
 AccessCertificationResponseType.REVOKE=Revoke
 AccessCertificationResponseType.REDUCE=Reduce
 AccessCertificationResponseType.NOT_DECIDED=Not decided
-AccessCertificationResponseType.DELEGATE=Delegate
+AccessCertificationResponseType.DELEGATE=Delegieren
 AccessCertificationResponseType.NO_RESPONSE=No response
 ActivationStatusType.ARCHIVED=Archiviert
 ActivationStatusType.DISABLED=Gesperrt
@@ -402,7 +402,7 @@ HandlerUriActions.ACTION_DELETE_ACCOUNT=Delete account
 HandlerUriActions.ACTION_DELETE_FOCUS=Delete focus
 HandlerUriActions.ACTION_DELETE_SHADOW=Delete shadow
 HandlerUriActions.ACTION_DELETE_USER=Anwender entfernen
-HandlerUriActions.ACTION_DISABLE_ACCOUNT=Disable account
+HandlerUriActions.ACTION_DISABLE_ACCOUNT=Account sperren
 HandlerUriActions.ACTION_DISABLE_USER=Anwender sperren
 HandlerUriActions.ACTION_INACTIVATE_FOCUS=Inactivate focus
 HandlerUriActions.ACTION_INACTIVATE_SHADOW=Inactivate shadow
@@ -540,9 +540,9 @@ LoggingLevelType.INFO=Info
 LoggingLevelType.OFF=Off
 LoggingLevelType.TRACE=Trace
 LoggingLevelType.WARN=Warn
-lower.ActivationStatusType.ARCHIVED=archived
-lower.ActivationStatusType.DISABLED=disabled
-lower.ActivationStatusType.ENABLED=enabled
+lower.ActivationStatusType.ARCHIVED=archiviert
+lower.ActivationStatusType.DISABLED=gesperrt
+lower.ActivationStatusType.ENABLED=freigegeben
 lower.ActivationStatusType.null=undefined
 MailTransportSecurityType.NONE=Nichts
 MailTransportSecurityType.SSL=SSL
@@ -614,7 +614,6 @@ MultiValueField.nameNotSpecified=(Name not specified)
 MyAccountsPanel.account.name=Name
 MyAccountsPanel.account.resource=Ressource
 MyAssignmentsPanel.assignment.displayName=Name
-MyAssignmentsPanel.assignment.type=Type
 MyAssignmentsPanel.type.accountConstruction=Account construction
 MyAssignmentsPanel.type.error=Fehler
 MyAssignmentsPanel.type.orgUnit=Org. unit
@@ -1191,8 +1190,8 @@ pageAdminFocus.menu.assignRole=Rolle zuweisen
 pageAdminFocus.menu.assignOrg=Assign org. unit
 pageAdminFocus.menu.unassign=Entziehen
 pageAdminFocus.button.addShadow=Add projection
-pageAdminFocus.button.enable=Enable
-pageAdminFocus.button.disable=Disable
+pageAdminFocus.button.enable=Freigeben
+pageAdminFocus.button.disable=Sperren
 pageAdminFocus.button.unlink=Unlink
 pageAdminFocus.button.unlock=Unlock
 pageAdminFocus.button.delete=Löschen
@@ -1277,7 +1276,7 @@ PageCertCampaign.button.startRemediation=Start remediation
 PageCertCampaign.currentState=Current state
 PageCertCampaign.description=Beschreibung
 PageCertCampaign.menu.accept=Accept
-PageCertCampaign.menu.delegate=Delegate
+PageCertCampaign.menu.delegate=Delegieren
 PageCertCampaign.menu.noResponse=No Response
 PageCertCampaign.menu.notDecided=Not Decided
 PageCertCampaign.menu.reduce=Reduce
@@ -1318,7 +1317,7 @@ PageCertCampaigns.table.stage=Stage
 PageCertCampaigns.table.state=State
 PageCertCampaign.stageTime=Stage time
 PageCertCampaign.statistics.accept=Accept
-PageCertCampaign.statistics.delegate=Delegate
+PageCertCampaign.statistics.delegate=Delegieren
 PageCertCampaign.statistics.items=Items
 PageCertCampaign.statistics.noDecision=No decision (abstain)
 PageCertCampaign.statistics.noResponse=No response
@@ -1350,8 +1349,8 @@ PageCertDecisions.checkbox.showNoResponseOnly=Show "no response" cases only
 PageCertDecisions.in=in {0}
 PageCertDecisions.menu.accept=Accept
 PageCertDecisions.menu.acceptSelected=Accept selected
-PageCertDecisions.menu.delegate=Delegate
-PageCertDecisions.menu.delegateSelected=Delegate selected
+PageCertDecisions.menu.delegate=Delegieren
+PageCertDecisions.menu.delegateSelected=Auswahl delegieren
 PageCertDecisions.menu.noResponse=No Response
 PageCertDecisions.menu.noResponseSelected=Mark selected as No response
 PageCertDecisions.menu.notDecided=Not Decided
@@ -1422,7 +1421,7 @@ PageCert.in=in {0}
 PageCert.message.assignment={0} of {1} {2} to {3} {4}.
 PageCert.message.textAdministrativeState=Administrative state\: {0}.
 PageCert.message.textAssignment=Assignment
-PageCert.message.textDescription=Description\: {0}.
+PageCert.message.textDescription=Beschreibung\: [0].
 PageCert.message.textExtensions=Extensions defined\: {0}.
 PageCert.message.textInducement=Inducement
 PageCert.message.textIntent=Intent\: {0}.
@@ -1436,7 +1435,7 @@ PageCert.message.textValidTo=Valid to\: {0}.
 PageCert.now=now
 StageEditorPanel.stageDefinitionLabelName = Stage Definition \#
 StageDefinitionPanel.stageName = Name
-StageDefinitionPanel.stageDescription = Description
+StageDefinitionPanel.stageDescription = Beschreibung
 StageDefinitionPanel.stageDuration = Duration
 StageDefinitionPanel.notifyBeforeDeadline = Notify before deadline
 StageDefinitionPanel.notifyWhenNoDecision = Notify only when no decision
@@ -1476,10 +1475,15 @@ pageContentAccounts.intent=Bedeutung
 pageContentAccounts.kind=Art
 pageContentAccounts.menu.changeOwner=Change owner
 pageContentAccounts.menu.deleteAccount=Löschen
-pageContentAccounts.menu.disableAccount=Disable
-pageContentAccounts.menu.enableAccount=Enable
+pageContentAccounts.menu.disableAccount=Sperren
+pageContentAccounts.menu.enableAccount=Freigeben
 pageContentAccounts.menu.importAccount=Importieren
 pageContentAccounts.menu.removeOwner=Remove owner
+pageContentAccounts.menu.deleteAccounts=Auswahl löschen
+pageContentAccounts.menu.disableAccounts=Auswahl sperren
+pageContentAccounts.menu.enableAccounts=Auswahl freigeben
+pageContentAccounts.menu.importAccounts=Import selected
+pageContentAccounts.menu.removeOwners=Remove for selected
 pageContentAccounts.message.cantImportAccount=Can't import account, oid\={0}
 pageContentAccounts.message.cantShowAccountDetails=Can't show details for account {0} ({1}).
 pageContentAccounts.message.cantShowUserDetails=Can't show details of user {0} ({1}).
@@ -1530,21 +1534,21 @@ PageDashboard.title=Dashboard
 PageDashboard.usedRam=Used RAM
 PageDashboard.workItems=My work items
 PageDashboard.infobox.users.label=Users
-PageDashboard.infobox.users.number=enabled
+PageDashboard.infobox.users.number=freigegeben
 PageDashboard.infobox.users.total=total
-PageDashboard.infobox.users.archived=archived
+PageDashboard.infobox.users.archived=archiviert
 PageDashboard.infobox.orgs.label=Organizational units
-PageDashboard.infobox.orgs.number=enabled
+PageDashboard.infobox.orgs.number=freigegeben
 PageDashboard.infobox.orgs.total=total
-PageDashboard.infobox.orgs.archived=archived
+PageDashboard.infobox.orgs.archived=archiviert
 PageDashboard.infobox.roles.label=Roles
-PageDashboard.infobox.roles.number=enabled
+PageDashboard.infobox.roles.number=freigegeben
 PageDashboard.infobox.roles.total=total
-PageDashboard.infobox.roles.archived=archived
+PageDashboard.infobox.roles.archived=archiviert
 PageDashboard.infobox.services.label=Services
-PageDashboard.infobox.services.number=enabled
+PageDashboard.infobox.services.number=freigegeben
 PageDashboard.infobox.services.total=total
-PageDashboard.infobox.services.archived=archived
+PageDashboard.infobox.services.archived=archiviert
 PageDashboard.infobox.resources.label=Resources
 PageDashboard.infobox.resources.number=up
 PageDashboard.infobox.resources.total=total
@@ -1843,6 +1847,7 @@ pageResource.oid=Oid
 pageResource.overallStatus=Overall status
 pageResource.progress=Progress
 pageResource.resource=Ressource
+pageResource.synchronizationTasks=Synchronization tasks
 pageResources.bundle=Bundle
 pageResources.connectorType=Connector type
 pageResources.button.discoveryRemote=Discovery
@@ -1943,7 +1948,7 @@ RichHyperlinkConfigDialog.targetUrl=Target URL
 RichHyperlinkConfigDialog.color=Color
 RichHyperlinkConfigDialog.authorization=Authorization
 RichHyperlinkConfigDialog.icon=Icon (css class)
-RichHyperlinkConfigDialog.description=Description
+RichHyperlinkConfigDialog.description=Beschreibung
 RichHyperlinkConfigDialog.message.badUpdate=Can't show empty dashboard link config.
 PageTaskAdd.title=New task
 pageTask.advancedOption=Advanced option
@@ -2154,8 +2159,8 @@ pageUser.button.abort=Abort
 pageUser.button.addAccount=Konto hinzufügen
 pageUser.button.back=Back
 pageUser.button.delete=Löschen
-pageUser.button.disable=Disable
-pageUser.button.enable=Enable
+pageUser.button.disable=Sperren
+pageUser.button.enable=Freigeben
 pageUser.button.recompute.assignments=Show all assignments
 pageUser.button.save=Speichern
 pageUser.button.submit=Preview changes
@@ -2191,8 +2196,8 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Konten
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Löschen
-pageUsers.menu.disable=Disable
-pageUsers.menu.enable=Enable
+pageUsers.menu.disable=Sperren
+pageUsers.menu.enable=Freigeben
 pageUsers.menu.reconcile=Reconcile
 pageUsers.menu.unlock=Unlock
 pageUsers.message.deleteUserConfirm=Do you really want to delete selected {0} user(s)?
@@ -2577,7 +2582,7 @@ SchemaHandlingStep.label.iteration=Iteration
 SchemaHandlingStep.label.kind=Art
 SchemaHandlingStep.label.newObjectType=New object type
 SchemaHandlingStep.label.objectClass=Object class
-SchemaHandlingStep.label.objectTypes=Object Types
+SchemaHandlingStep.label.objectTypes=Object types
 SchemaHandlingStep.label.protected=Geschützt
 SchemaHandlingStep.limitations.tooltip.ignore=Flag to ignore an attribute. MidPoint will pretend that the ignored attribute does not exist at all. It will not display it in the user interface, will not apply mappings, etc.
 SchemaHandlingStep.limitations.tooltip.layers=System layers to which this limitation applies. Sometimes the limitation does not apply equally to all the layers. E.g. the attribute may be formally read-write but we want it to be only presented as read-only by the user interface and change it only through mappings. In such a case the read-only limitation applies only to "presentation" layer.
@@ -2636,6 +2641,7 @@ SchemaListPanel.message.couldntParseSchema=Couldn't parse resource schema
 SchemaListPanel.minMax=Min/max occurs
 SchemaListPanel.name=Name
 SchemaListPanel.nativeAttributeName=Native attribute name
+SchemaListPanel.objectClasses=Object classes
 SchemaListPanel.objectClass=Object class
 SchemaListPanel.returnedByDefault=Returned by default
 SchemaStep.button.reload=Reload
@@ -2923,10 +2929,10 @@ TreeTablePanel.menu.addMember=Add member
 TreeTablePanel.menu.addOrgUnit=Add org. unit
 TreeTablePanel.menu.addToHierarchy=Add to org. unit
 TreeTablePanel.menu.delete=Löschen
-TreeTablePanel.menu.disable=Disable
-TreeTablePanel.menu.enable=Enable
+TreeTablePanel.menu.disable=Sperren
+TreeTablePanel.menu.enable=Freigeben
 TreeTablePanel.menu.move=Move
-TreeTablePanel,menu.recompute=Recompute
+TreeTablePanel.menu.recompute=Recompute
 TreeTablePanel.menu.removeFromHierarchy=Remove from org. unit
 TreeTablePanel.message.deleteObjectConfirm=Do you really want to delete selected {0} object(s)?
 TreeTablePanel.message.deleteRootConfirm=Do you really want to delete {0} ({1})?
@@ -2975,7 +2981,12 @@ UserReportConfigPanel.dateFrom=Von
 UserReportConfigPanel.dateTo=Bis
 UserReportConfigPanel.exportFileType=Export Type
 UserReportConfigPanel.title.basic=Basic User Report Configuration
-User.superuser=Administrator
+user.enduser=End user
+user.noAssignments=No assignments
+user.superuser=Superuser
+user.orgManager=Manager
+user.orgMember=Member
+user.noOrgs=No organizations
 UserType.emailAddress=Email
 UserType.familyName=Family name
 UserType.fullName=Full name
@@ -2984,6 +2995,9 @@ validFromFetchStrategy.nullValid=Auswählen
 validToFetchStrategy.nullValid=Auswählen
 valueAttribute.nullValid=Auswählen
 WebModelUtils.couldntLoadObject=Couldn't load object.
+WebModelUtils.couldntSaveObject=Couldn't save object.
+WebModelUtils.couldntSearchObjects=Couldn't search objects.
+WebModelUtils.couldntDeleteObject=Couldn't delete object.
 web.security.provider.access.denied=Access denied. You don't have permission to access, please contact midPoint's administrators.
 web.security.provider.denied=Permission denied.
 web.security.provider.disabled=Anwender ist gesperrt
@@ -3058,7 +3072,7 @@ ChangePasswordPanel.enabled=Freigegeben
 ChangePasswordPanel.legendMessage.selected= - Password will be changed
 ChangePasswordPanel.legendMessage.propagated= - Automatic password propagation (based on policies defined in resources definitions)
 ChangePasswordPanel.legendMessage.deselected= - Password will not be changed
-ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changes in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons\:</p><ul><li><span class\="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class\="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.</li><li><span class\="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
+ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changed in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons\:</p><ul><li><span class\="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class\="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.</li><li><span class\="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
 ChangePasswordPanel.helpPopupTitle=Password propagation help
 PageBase.button.tooltip.clearSearch=Clear
 mainForm.uploadTooLarge = Upload must be less than ${maxSize}.
@@ -3130,7 +3144,7 @@ ScenePanel.oldValue=Old value
 ScenePanel.newValue=New value
 ScenePanel.value=Value
 operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI)
-AbstractRoleType.description=Description
+AbstractRoleType.description=Beschreibung
 AbstractRoleType.displayName=Display Name
 TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1}
 TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0}
@@ -3229,6 +3243,7 @@ TreeTablePanel.menu.removeManagersAll=Remove all managers
 TreeTablePanel.menu.recomputeMembersSelected=Recompute selected members
 TreeTablePanel.menu.recomputeManagersAll=Recompute all managers
 TreeTablePanel.move=Move
+TreeTablePanel.makeRoot=Make root
 TreeTablePanel.delete=Delete
 TreeTablePanel.recompute=Recompute
 TreeTablePanel.edit=Edit
@@ -3248,7 +3263,7 @@ PageCertDefinition.scopeSearchFilterHelp=If only a subset of objects of given ty
 PageCertDefinition.scopeAssignmentsInducementsHelp=Select what features (assignments, inducements or both) of the objects described above are to be certified.
 PageCertDefinition.scopeIncludeTargetTypesHelp=When certifying assignments or inducements, you can specify what target types are taken into account. For example, you can say that you want to certify only assignments of roles (to, for example, users).
 PageCertDefinition.scopeIncludeByStatusHelp=Whether to certify only assignments/inducements that have administrative status set to ENABLED (or not set at all). Note that what is relevant is the administrative status of the assignment, not the administrative status of the assigned object.
-StageDefinitionPanel.stageDurationHelp=Duration of this stage, used to determine stage end time. The end time is computed as the moment of stage opening plus the duration, rounded up to 23\:59\:59 of the last day. Duration is specified in ISO 8601 format, like P14D for 14 days, P3W for 3 months, P2M for 2 months, etc.
+StageDefinitionPanel.stageDurationHelp=Duration of this stage, used to determine stage end time. The end time is computed as the moment of stage opening plus the duration, rounded up to 23\:59\:59 of the last day. Duration is specified in ISO 8601 format, like P14D for 14 days, P3W for 3 weeks, P2M for 2 months, etc.
 StageDefinitionPanel.notifyBeforeDeadlineHelp=How long before the stage end the reminding notifications (to reviewers and campaign owner) will be sent. It is possible to specify more values; separate them by commas. Time interval is specified in ISO 8601 format, like PT12H for 12 hours, P2D for 2 days, P1W for 1 week, etc. An example\: PT48H, PT12H says that the first notification will be sent 48 hours before stage end, and the second one 12 hours before the end.
 StageDefinitionPanel.notifyWhenNoDecisionHelp=If checked, a 'stage end approaching' notification is sent to a reviewer only if he/she has some cases waiting for his/her decision. If not checked, reviewers always get their notifications - regardless of whether they have provided a decision or not. (Note that notifications to the campaign owner about approaching stage end are always sent, regardless of this setting.)
 StageDefinitionPanel.reviewerSpecificationTargetHelp=Selection of reviewers based on assignment/inducement target owner/approver. E.g. you can specify that the role owner is used to certify all assignments of 'his' role (to any users).
@@ -3263,3 +3278,17 @@ StageDefinitionPanel.outcomeIfNoReviewersHelp=What should be the outcome if ther
 StageDefinitionPanel.stopReviewOnHelp=What outcomes will prevent a case from being advanced to the next stage? Usually you need not change the default value. If necessary, you could do that through the XML configuration.
 StageDefinitionPanel.configurationHelpLabel=For more information about configuring certification campaign stages, please see also
 StageDefinitionPanel.configurationHelpLink=this document
+NameStep.configurationWillBeLost=The selected connector configuration schema is different from the current one. Configuration properties will be lost if you will proceed.
+resultsHandlerConfiguration=Results handlers
+enableFilteredResultsHandler=Enable additional filtering of results
+enableFilteredResultsHandlerHelp=This handler filters results retrieved from the resource by the connector, at the level of connector framework. It is used by connector implementations that do not provide complete filtering by themselves. Enabling this handler has some drawbacks e.g. in the area of paging. So it is to be used only if really necessary. If not sure, it is advisable to use filtering in validation mode. Default value for current version of ConnId\: enabled.
+filteredResultsHandlerInValidationMode=Perform filtering in validation mode only
+filteredResultsHandlerInValidationModeHelp=Switches the result filtering into validation mode\: all data produced by the connector are checked by the connector framework to see if they are properly filtered. In case of improper filtering, an exception is raised. This mode is to be used for connectors that are expected to provide complete filtering, but their functionality in this area has to be verified. Default value for current version of ConnId\: disabled.
+enableCaseInsensitiveFilter=Make filtering case insensitive
+enableCaseInsensitiveFilterHelp=This option makes filtering case insensitive, for all attributes on the resource. Used for case-insensitive resources. Default value for current version of ConnId\: disabled.
+enableNormalizingResultsHandler=Enable handler that normalizes returned data
+enableNormalizingResultsHandlerHelp=This handler normalizes each attribute that is passed from resource to the system. Usually recommended to be turned off. Default value for current version of ConnId\: enabled.
+enableAttributesToGetSearchResultsHandler=Enable 'attributes to get' results handler
+enableAttributesToGetSearchResultsHandlerHelp=This handler is used to implement 'attributes to get' option. It is advisable to keep the default setting of 'enabled' (in current version of ConnId).
+PageResourceWizard.autoSaveWarning=The resource is automatically saved on each transition between wizard steps.
+operation.com.evolveum.midpoint.web.page.admin.users.component.TreeTablePanel.recompute=Recompute (GUI)
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
index 23c720b4a40..fbb4b0d38a6 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
@@ -614,7 +614,6 @@ MultiValueField.nameNotSpecified=(Name not specified)
 MyAccountsPanel.account.name=Name
 MyAccountsPanel.account.resource=Resource
 MyAssignmentsPanel.assignment.displayName=Name
-MyAssignmentsPanel.assignment.type=Type
 MyAssignmentsPanel.type.accountConstruction=Account construction
 MyAssignmentsPanel.type.error=Error
 MyAssignmentsPanel.type.orgUnit=Org. unit
@@ -1480,6 +1479,11 @@ pageContentAccounts.menu.disableAccount=Disable
 pageContentAccounts.menu.enableAccount=Enable
 pageContentAccounts.menu.importAccount=Import
 pageContentAccounts.menu.removeOwner=Remove owner
+pageContentAccounts.menu.deleteAccounts=Delete selected
+pageContentAccounts.menu.disableAccounts=Disable selected
+pageContentAccounts.menu.enableAccounts=Enable selected
+pageContentAccounts.menu.importAccounts=Import selected
+pageContentAccounts.menu.removeOwners=Remove for selected
 pageContentAccounts.message.cantImportAccount=Can't import account, oid\={0}
 pageContentAccounts.message.cantShowAccountDetails=Can't show details for account {0} ({1}).
 pageContentAccounts.message.cantShowUserDetails=Can't show details of user {0} ({1}).
@@ -1843,6 +1847,7 @@ pageResource.oid=Oid
 pageResource.overallStatus=Overall status
 pageResource.progress=Progress
 pageResource.resource=Resource
+pageResource.synchronizationTasks=Synchronization tasks
 pageResources.bundle=Bundle
 pageResources.connectorType=Connector type
 pageResources.button.discoveryRemote=Discovery
@@ -2577,7 +2582,7 @@ SchemaHandlingStep.label.iteration=Iteration
 SchemaHandlingStep.label.kind=Kind
 SchemaHandlingStep.label.newObjectType=New object type
 SchemaHandlingStep.label.objectClass=Object class
-SchemaHandlingStep.label.objectTypes=Object Types
+SchemaHandlingStep.label.objectTypes=Object types
 SchemaHandlingStep.label.protected=Protected
 SchemaHandlingStep.limitations.tooltip.ignore=Flag to ignore an attribute. MidPoint will pretend that the ignored attribute does not exist at all. It will not display it in the user interface, will not apply mappings, etc.
 SchemaHandlingStep.limitations.tooltip.layers=System layers to which this limitation applies. Sometimes the limitation does not apply equally to all the layers. E.g. the attribute may be formally read-write but we want it to be only presented as read-only by the user interface and change it only through mappings. In such a case the read-only limitation applies only to "presentation" layer.
@@ -2636,6 +2641,7 @@ SchemaListPanel.message.couldntParseSchema=Couldn't parse resource schema
 SchemaListPanel.minMax=Min/max occurs
 SchemaListPanel.name=Name
 SchemaListPanel.nativeAttributeName=Native attribute name
+SchemaListPanel.objectClasses=Object classes
 SchemaListPanel.objectClass=Object class
 SchemaListPanel.returnedByDefault=Returned by default
 SchemaStep.button.reload=Reload
@@ -2926,7 +2932,7 @@ TreeTablePanel.menu.delete=Delete
 TreeTablePanel.menu.disable=Disable
 TreeTablePanel.menu.enable=Enable
 TreeTablePanel.menu.move=Move
-TreeTablePanel,menu.recompute=Recompute
+TreeTablePanel.menu.recompute=Recompute
 TreeTablePanel.menu.removeFromHierarchy=Remove from org. unit
 TreeTablePanel.message.deleteObjectConfirm=Do you really want to delete selected {0} object(s)?
 TreeTablePanel.message.deleteRootConfirm=Do you really want to delete {0} ({1})?
@@ -2975,7 +2981,12 @@ UserReportConfigPanel.dateFrom=From
 UserReportConfigPanel.dateTo=To
 UserReportConfigPanel.exportFileType=Export Type
 UserReportConfigPanel.title.basic=Basic User Report Configuration
-User.superuser=Superuser
+user.enduser=End user
+user.noAssignments=No assignments
+user.superuser=Superuser
+user.orgManager=Manager
+user.orgMember=Member
+user.noOrgs=No organizations
 UserType.emailAddress=Email
 UserType.familyName=Family name
 UserType.fullName=Full name
@@ -2984,6 +2995,9 @@ validFromFetchStrategy.nullValid=Choose One
 validToFetchStrategy.nullValid=Choose One
 valueAttribute.nullValid=Choose One
 WebModelUtils.couldntLoadObject=Couldn't load object.
+WebModelUtils.couldntSaveObject=Couldn't save object.
+WebModelUtils.couldntSearchObjects=Couldn't search objects.
+WebModelUtils.couldntDeleteObject=Couldn't delete object.
 web.security.provider.access.denied=Access denied. You don't have permission to access, please contact midPoint's administrators.
 web.security.provider.denied=Permission denied.
 web.security.provider.disabled=User is disabled.
@@ -3058,7 +3072,7 @@ ChangePasswordPanel.enabled=Enabled
 ChangePasswordPanel.legendMessage.selected= - Password will be changed
 ChangePasswordPanel.legendMessage.propagated= - Automatic password propagation (based on policies defined in resources definitions)
 ChangePasswordPanel.legendMessage.deselected= - Password will not be changed
-ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changes in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons\:</p><ul><li><span class\="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class\="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.</li><li><span class\="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
+ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changed in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons\:</p><ul><li><span class\="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class\="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.</li><li><span class\="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
 ChangePasswordPanel.helpPopupTitle=Password propagation help
 PageBase.button.tooltip.clearSearch=Clear
 mainForm.uploadTooLarge = Upload must be less than ${maxSize}.
@@ -3229,6 +3243,7 @@ TreeTablePanel.menu.removeManagersAll=Remove all managers
 TreeTablePanel.menu.recomputeMembersSelected=Recompute selected members
 TreeTablePanel.menu.recomputeManagersAll=Recompute all managers
 TreeTablePanel.move=Move
+TreeTablePanel.makeRoot=Make root
 TreeTablePanel.delete=Delete
 TreeTablePanel.recompute=Recompute
 TreeTablePanel.edit=Edit
@@ -3248,7 +3263,7 @@ PageCertDefinition.scopeSearchFilterHelp=If only a subset of objects of given ty
 PageCertDefinition.scopeAssignmentsInducementsHelp=Select what features (assignments, inducements or both) of the objects described above are to be certified.
 PageCertDefinition.scopeIncludeTargetTypesHelp=When certifying assignments or inducements, you can specify what target types are taken into account. For example, you can say that you want to certify only assignments of roles (to, for example, users).
 PageCertDefinition.scopeIncludeByStatusHelp=Whether to certify only assignments/inducements that have administrative status set to ENABLED (or not set at all). Note that what is relevant is the administrative status of the assignment, not the administrative status of the assigned object.
-StageDefinitionPanel.stageDurationHelp=Duration of this stage, used to determine stage end time. The end time is computed as the moment of stage opening plus the duration, rounded up to 23\:59\:59 of the last day. Duration is specified in ISO 8601 format, like P14D for 14 days, P3W for 3 months, P2M for 2 months, etc.
+StageDefinitionPanel.stageDurationHelp=Duration of this stage, used to determine stage end time. The end time is computed as the moment of stage opening plus the duration, rounded up to 23\:59\:59 of the last day. Duration is specified in ISO 8601 format, like P14D for 14 days, P3W for 3 weeks, P2M for 2 months, etc.
 StageDefinitionPanel.notifyBeforeDeadlineHelp=How long before the stage end the reminding notifications (to reviewers and campaign owner) will be sent. It is possible to specify more values; separate them by commas. Time interval is specified in ISO 8601 format, like PT12H for 12 hours, P2D for 2 days, P1W for 1 week, etc. An example\: PT48H, PT12H says that the first notification will be sent 48 hours before stage end, and the second one 12 hours before the end.
 StageDefinitionPanel.notifyWhenNoDecisionHelp=If checked, a 'stage end approaching' notification is sent to a reviewer only if he/she has some cases waiting for his/her decision. If not checked, reviewers always get their notifications - regardless of whether they have provided a decision or not. (Note that notifications to the campaign owner about approaching stage end are always sent, regardless of this setting.)
 StageDefinitionPanel.reviewerSpecificationTargetHelp=Selection of reviewers based on assignment/inducement target owner/approver. E.g. you can specify that the role owner is used to certify all assignments of 'his' role (to any users).
@@ -3263,3 +3278,17 @@ StageDefinitionPanel.outcomeIfNoReviewersHelp=What should be the outcome if ther
 StageDefinitionPanel.stopReviewOnHelp=What outcomes will prevent a case from being advanced to the next stage? Usually you need not change the default value. If necessary, you could do that through the XML configuration.
 StageDefinitionPanel.configurationHelpLabel=For more information about configuring certification campaign stages, please see also
 StageDefinitionPanel.configurationHelpLink=this document
+NameStep.configurationWillBeLost=The selected connector configuration schema is different from the current one. Configuration properties will be lost if you will proceed.
+resultsHandlerConfiguration=Results handlers
+enableFilteredResultsHandler=Enable additional filtering of results
+enableFilteredResultsHandlerHelp=This handler filters results retrieved from the resource by the connector, at the level of connector framework. It is used by connector implementations that do not provide complete filtering by themselves. Enabling this handler has some drawbacks e.g. in the area of paging. So it is to be used only if really necessary. If not sure, it is advisable to use filtering in validation mode. Default value for current version of ConnId\: enabled.
+filteredResultsHandlerInValidationMode=Perform filtering in validation mode only
+filteredResultsHandlerInValidationModeHelp=Switches the result filtering into validation mode\: all data produced by the connector are checked by the connector framework to see if they are properly filtered. In case of improper filtering, an exception is raised. This mode is to be used for connectors that are expected to provide complete filtering, but their functionality in this area has to be verified. Default value for current version of ConnId\: disabled.
+enableCaseInsensitiveFilter=Make filtering case insensitive
+enableCaseInsensitiveFilterHelp=This option makes filtering case insensitive, for all attributes on the resource. Used for case-insensitive resources. Default value for current version of ConnId\: disabled.
+enableNormalizingResultsHandler=Enable handler that normalizes returned data
+enableNormalizingResultsHandlerHelp=This handler normalizes each attribute that is passed from resource to the system. Usually recommended to be turned off. Default value for current version of ConnId\: enabled.
+enableAttributesToGetSearchResultsHandler=Enable 'attributes to get' results handler
+enableAttributesToGetSearchResultsHandlerHelp=This handler is used to implement 'attributes to get' option. It is advisable to keep the default setting of 'enabled' (in current version of ConnId).
+PageResourceWizard.autoSaveWarning=The resource is automatically saved on each transition between wizard steps.
+operation.com.evolveum.midpoint.web.page.admin.users.component.TreeTablePanel.recompute=Recompute (GUI)
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
index f94fa694fa8..b29aa2eac11 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
@@ -614,7 +614,6 @@ MultiValueField.nameNotSpecified=(Name not specified)
 MyAccountsPanel.account.name=Nombre
 MyAccountsPanel.account.resource=Resource
 MyAssignmentsPanel.assignment.displayName=Nombre
-MyAssignmentsPanel.assignment.type=Tipo
 MyAssignmentsPanel.type.accountConstruction=Account construction
 MyAssignmentsPanel.type.error=Error
 MyAssignmentsPanel.type.orgUnit=Unidad Org.
@@ -1480,6 +1479,11 @@ pageContentAccounts.menu.disableAccount=Deshabilitar
 pageContentAccounts.menu.enableAccount=Habilitar
 pageContentAccounts.menu.importAccount=Importar
 pageContentAccounts.menu.removeOwner=Eliminar dueño
+pageContentAccounts.menu.deleteAccounts=Delete selected
+pageContentAccounts.menu.disableAccounts=Disable selected
+pageContentAccounts.menu.enableAccounts=Enable selected
+pageContentAccounts.menu.importAccounts=Import selected
+pageContentAccounts.menu.removeOwners=Remove for selected
 pageContentAccounts.message.cantImportAccount=No se puede importar cuenta, oid\={0}
 pageContentAccounts.message.cantShowAccountDetails=No se puede mostrar destalles para la cuenta {0} ({1}).
 pageContentAccounts.message.cantShowUserDetails=No se puede mostrar destalle del usuario {0} ({1}).
@@ -1843,6 +1847,7 @@ pageResource.oid=Oid
 pageResource.overallStatus=Overall status
 pageResource.progress=Progress
 pageResource.resource=Resource
+pageResource.synchronizationTasks=Synchronization tasks
 pageResources.bundle=Bundle
 pageResources.connectorType=Connector type
 pageResources.button.discoveryRemote=Descubrimiento
@@ -2577,7 +2582,7 @@ SchemaHandlingStep.label.iteration=Iteration
 SchemaHandlingStep.label.kind=Tipo
 SchemaHandlingStep.label.newObjectType=New object type
 SchemaHandlingStep.label.objectClass=Clase de objeto
-SchemaHandlingStep.label.objectTypes=Object Types
+SchemaHandlingStep.label.objectTypes=Object types
 SchemaHandlingStep.label.protected=Protegido
 SchemaHandlingStep.limitations.tooltip.ignore=Flag to ignore an attribute. MidPoint will pretend that the ignored attribute does not exist at all. It will not display it in the user interface, will not apply mappings, etc.
 SchemaHandlingStep.limitations.tooltip.layers=System layers to which this limitation applies. Sometimes the limitation does not apply equally to all the layers. E.g. the attribute may be formally read-write but we want it to be only presented as read-only by the user interface and change it only through mappings. In such a case the read-only limitation applies only to "presentation" layer.
@@ -2636,6 +2641,7 @@ SchemaListPanel.message.couldntParseSchema=No se pudo procesar esquema del recur
 SchemaListPanel.minMax=Min/max occurs
 SchemaListPanel.name=Nombre
 SchemaListPanel.nativeAttributeName=Nobre nativo del atributo
+SchemaListPanel.objectClasses=Object classes
 SchemaListPanel.objectClass=Clase del objeto
 SchemaListPanel.returnedByDefault=Retornado por defecto
 SchemaStep.button.reload=Recargar
@@ -2926,7 +2932,7 @@ TreeTablePanel.menu.delete=Eliminar
 TreeTablePanel.menu.disable=Deshabilitar
 TreeTablePanel.menu.enable=Habilitar
 TreeTablePanel.menu.move=Mover
-TreeTablePanel,menu.recompute=Recomputar
+TreeTablePanel.menu.recompute=Recompute
 TreeTablePanel.menu.removeFromHierarchy=Eliminar de la Unidad Organizativa
 TreeTablePanel.message.deleteObjectConfirm=Desesa realmente eliminar el/los objeto/s seleccionado/s\: {0}?
 TreeTablePanel.message.deleteRootConfirm=Desea realmente eliminar {0} ({1})?
@@ -2975,7 +2981,12 @@ UserReportConfigPanel.dateFrom=Desde
 UserReportConfigPanel.dateTo=Hacia
 UserReportConfigPanel.exportFileType=Export Type
 UserReportConfigPanel.title.basic=Configuración Básica de Infome de Usuario
-User.superuser=Superusuario
+user.enduser=End user
+user.noAssignments=No assignments
+user.superuser=Superuser
+user.orgManager=Manager
+user.orgMember=Member
+user.noOrgs=No organizations
 UserType.emailAddress=Email
 UserType.familyName=Apellido
 UserType.fullName=Nombre completo
@@ -2984,6 +2995,9 @@ validFromFetchStrategy.nullValid=Elija uno
 validToFetchStrategy.nullValid=Choose One
 valueAttribute.nullValid=Elija uno
 WebModelUtils.couldntLoadObject=No se pudo cargar el objeto.
+WebModelUtils.couldntSaveObject=Couldn't save object.
+WebModelUtils.couldntSearchObjects=Couldn't search objects.
+WebModelUtils.couldntDeleteObject=Couldn't delete object.
 web.security.provider.access.denied=Acceso denegado. Usted no tiene permiso para acceder, por favor contacte el administrador de midPoint.
 web.security.provider.denied=Permiso denegado.
 web.security.provider.disabled=El usuario está deshabilitado.
@@ -3058,7 +3072,7 @@ ChangePasswordPanel.enabled=Enabled
 ChangePasswordPanel.legendMessage.selected= - Password will be changed
 ChangePasswordPanel.legendMessage.propagated= - Automatic password propagation (based on policies defined in resources definitions)
 ChangePasswordPanel.legendMessage.deselected= - Password will not be changed
-ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changes in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons\:</p><ul><li><span class\="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class\="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.</li><li><span class\="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
+ChangePasswordPanel.helpInfo=<p>This portion of the credentials dialog controls how the password change will be propagated to each individual system. The first line defines whether the password will be changed in the midPoint itself. Following lines represent each system for which the password can be changed. The password propagation is controlled by the icons\:</p><ul><li><span class\="fa fa-check-square-o"/> Password will be changed. Password for this system will be changed to the value specified in the password dialog above.</li><li><span class\="fa fa-sign-out"/> Automatic password propagation. The password might be changed. Whether the password is changed or not depends on the policies set up by identity administrator. This usually means that the password will be changed if it makes sense for the current situation and settings. This is the reasonable default choice.</li><li><span class\="fa fa-square-o"/> Password will not be changed for this system.</li></ul><p>You can adjust the password propagation settings by clicking on the icons and thus fine-tune how the password change is propagated to each individual system.</p>
 ChangePasswordPanel.helpPopupTitle=Password propagation help
 PageBase.button.tooltip.clearSearch=Clear
 mainForm.uploadTooLarge = Upload must be less than ${maxSize}.
@@ -3229,6 +3243,7 @@ TreeTablePanel.menu.removeManagersAll=Remove all managers
 TreeTablePanel.menu.recomputeMembersSelected=Recompute selected members
 TreeTablePanel.menu.recomputeManagersAll=Recompute all managers
 TreeTablePanel.move=Move
+TreeTablePanel.makeRoot=Make root
 TreeTablePanel.delete=Delete
 TreeTablePanel.recompute=Recompute
 TreeTablePanel.edit=Edit
@@ -3248,7 +3263,7 @@ PageCertDefinition.scopeSearchFilterHelp=If only a subset of objects of given ty
 PageCertDefinition.scopeAssignmentsInducementsHelp=Select what features (assignments, inducements or both) of the objects described above are to be certified.
 PageCertDefinition.scopeIncludeTargetTypesHelp=When certifying assignments or inducements, you can specify what target types are taken into account. For example, you can say that you want to certify only assignments of roles (to, for example, users).
 PageCertDefinition.scopeIncludeByStatusHelp=Whether to certify only assignments/inducements that have administrative status set to ENABLED (or not set at all). Note that what is relevant is the administrative status of the assignment, not the administrative status of the assigned object.
-StageDefinitionPanel.stageDurationHelp=Duration of this stage, used to determine stage end time. The end time is computed as the moment of stage opening plus the duration, rounded up to 23\:59\:59 of the last day. Duration is specified in ISO 8601 format, like P14D for 14 days, P3W for 3 months, P2M for 2 months, etc.
+StageDefinitionPanel.stageDurationHelp=Duration of this stage, used to determine stage end time. The end time is computed as the moment of stage opening plus the duration, rounded up to 23\:59\:59 of the last day. Duration is specified in ISO 8601 format, like P14D for 14 days, P3W for 3 weeks, P2M for 2 months, etc.
 StageDefinitionPanel.notifyBeforeDeadlineHelp=How long before the stage end the reminding notifications (to reviewers and campaign owner) will be sent. It is possible to specify more values; separate them by commas. Time interval is specified in ISO 8601 format, like PT12H for 12 hours, P2D for 2 days, P1W for 1 week, etc. An example\: PT48H, PT12H says that the first notification will be sent 48 hours before stage end, and the second one 12 hours before the end.
 StageDefinitionPanel.notifyWhenNoDecisionHelp=If checked, a 'stage end approaching' notification is sent to a reviewer only if he/she has some cases waiting for his/her decision. If not checked, reviewers always get their notifications - regardless of whether they have provided a decision or not. (Note that notifications to the campaign owner about approaching stage end are always sent, regardless of this setting.)
 StageDefinitionPanel.reviewerSpecificationTargetHelp=Selection of reviewers based on assignment/inducement target owner/approver. E.g. you can specify that the role owner is used to certify all assignments of 'his' role (to any users).
@@ -3263,3 +3278,17 @@ StageDefinitionPanel.outcomeIfNoReviewersHelp=What should be the outcome if ther
 StageDefinitionPanel.stopReviewOnHelp=What outcomes will prevent a case from being advanced to the next stage? Usually you need not change the default value. If necessary, you could do that through the XML configuration.
 StageDefinitionPanel.configurationHelpLabel=For more information about configuring certification campaign stages, please see also
 StageDefinitionPanel.configurationHelpLink=this document
+NameStep.configurationWillBeLost=The selected connector configuration schema is different from the current one. Configuration properties will be lost if you will proceed.
+resultsHandlerConfiguration=Results handlers
+enableFilteredResultsHandler=Enable additional filtering of results
+enableFilteredResultsHandlerHelp=This handler filters results retrieved from the resource by the connector, at the level of connector framework. It is used by connector implementations that do not provide complete filtering by themselves. Enabling this handler has some drawbacks e.g. in the area of paging. So it is to be used only if really necessary. If not sure, it is advisable to use filtering in validation mode. Default value for current version of ConnId\: enabled.
+filteredResultsHandlerInValidationMode=Perform filtering in validation mode only
+filteredResultsHandlerInValidationModeHelp=Switches the result filtering into validation mode\: all data produced by the connector are checked by the connector framework to see if they are properly filtered. In case of improper filtering, an exception is raised. This mode is to be used for connectors that are expected to provide complete filtering, but their functionality in this area has to be verified. Default value for current version of ConnId\: disabled.
+enableCaseInsensitiveFilter=Make filtering case insensitive
+enableCaseInsensitiveFilterHelp=This option makes filtering case insensitive, for all attributes on the resource. Used for case-insensitive resources. Default value for current version of ConnId\: disabled.
+enableNormalizingResultsHandler=Enable handler that normalizes returned data
+enableNormalizingResultsHandlerHelp=This handler normalizes each attribute that is passed from resource to the system. Usually recommended to be turned off. Default value for current version of ConnId\: enabled.
+enableAttributesToGetSearchResultsHandler=Enable 'attributes to get' results handler
+enableAttributesToGetSearchResultsHandlerHelp=This handler is used to implement 'attributes to get' option. It is advisable to keep the default setting of 'enabled' (in current version of ConnId).
+PageResourceWizard.autoSaveWarning=The resource is automatically saved on each transition between wizard steps.
+operation.com.evolveum.midpoint.web.page.admin.users.component.TreeTablePanel.recompute=Recompute (GUI)
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
index d82cb2104c7..d14744893d1 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
@@ -127,7 +127,7 @@ AuditEventType.ADD_OBJECT=Lisa objekt
 AuditEventType.CREATE_SESSION=Loo seanss
 AuditEventType.DELETE_OBJECT=Kustuta objekt
 AuditEventType.EXECUTE_CHANGES_RAW=Execute changes raw
-AuditEventType.GET_OBJECT=Get object
+AuditEventType.GET_OBJECT=Hangi objekt
 AuditEventType.MODIFY_OBJECT=Muuda objekti
 AuditEventType.null=Kõik
 AuditEventType.RECONCILIATION=Lepitamine
@@ -137,7 +137,7 @@ AuditEventTypeType.ADD_OBJECT=Lisa objekt
 AuditEventTypeType.CREATE_SESSION=Loo seanss
 AuditEventTypeType.DELETE_OBJECT=Kustuta objekt
 AuditEventTypeType.EXECUTE_CHANGES_RAW=Execute changes raw
-AuditEventTypeType.GET_OBJECT=Get object
+AuditEventTypeType.GET_OBJECT=Hangi objekt
 AuditEventTypeType.MODIFY_OBJECT=Muuda objekti
 AuditEventTypeType.null=Kõik
 AuditEventTypeType.RECONCILIATION=Lepitamine
@@ -285,12 +285,12 @@ DecisionsPanel.comment=Kommentaar
 DecisionsPanel.result=Tulemus
 DecisionsPanel.user=Kasutaja
 DecisionsPanel.when=When
-DefinitionScopeObjectType.FocusType=Users, roles, orgs and services
-DefinitionScopeObjectType.AbstractRoleType=Roles, orgs and services
+DefinitionScopeObjectType.FocusType=Kasutajad, rollid, org-d ja teenused
+DefinitionScopeObjectType.AbstractRoleType=Rollid, org-d ja teenused
 DefinitionScopeObjectType.RoleType=Rollid
 DefinitionScopeObjectType.UserType=Kasutajad
 DefinitionScopeObjectType.OrgType=Org.-d
-DefinitionScopeObjectType.ServiceType=Services
+DefinitionScopeObjectType.ServiceType=Teenused
 deleteAllDialog.label.accountShadowsDelete=Kustutatavaid konto varje\: {0}
 deleteAllDialog.label.nonAccountShadowsDelete=Kustutatavaid mitte-konto varje\: {0}
 deleteAllDialog.label.org=Org. üksused
@@ -475,44 +475,44 @@ LimitationsEditorDialog.label.schema=Skeem
 LockoutStatusType.LOCKED=Lukustatud
 LockoutStatusType.NORMAL=Normaalne
 LockoutStatusType.UNDEFINED=Määratlemata
-logger.duplicate=Logger with name '{0}' is already defined
-logger.emptyLogger=Logger must not be empty
+logger.duplicate=Loger nimega '{0}' on juba olemas
+logger.emptyLogger=Loger ei tohi olla tühi
 LoggingComponentType.ALL=Kõik
-LoggingComponentType.GUI=GUI logger
-LoggingComponentType.WEB=Web logger
-LoggingComponentType.MODEL=Model logger
-LoggingComponentType.NOTIFICATIONS = Notification logger
-LoggingComponentType.PROVISIONING=Provisioning logger
-LoggingComponentType.REPOSITORY=Repository logger
-LoggingComponentType.RESOURCEOBJECTCHANGELISTENER=Resource object change listener logger
-LoggingComponentType.TASKMANAGER=Task manager logger
-LoggingComponentType.WORKFLOWS = Workflow logger
+LoggingComponentType.GUI=GUI loger
+LoggingComponentType.WEB=Veebiloger
+LoggingComponentType.MODEL=Mudeli loger
+LoggingComponentType.NOTIFICATIONS = Teavituse loger
+LoggingComponentType.PROVISIONING=Varustamise loger
+LoggingComponentType.REPOSITORY=Hoidla loger
+LoggingComponentType.RESOURCEOBJECTCHANGELISTENER=Ressursiobjekti muudatuse jälgija loger
+LoggingComponentType.TASKMANAGER=Tegumihalduri loger
+LoggingComponentType.WORKFLOWS = Töövoo loger
 LoggingConfigPanel.appender=Appender
 LoggingConfigPanel.appenders=Appenders
 LoggingConfigPanel.appenders.appending=Lisav
 LoggingConfigPanel.appenders.filePath=Failitee
 LoggingConfigPanel.appenders.filePattern=Failimuster
-LoggingConfigPanel.appenders.Inherit=Inherited
+LoggingConfigPanel.appenders.Inherit=Päritud
 LoggingConfigPanel.appenders.maxFileSize=Faili maksimummaht [kB]
 LoggingConfigPanel.appenders.maxHistory=Max ajalugu
 LoggingConfigPanel.appenders.name=Nimi
 LoggingConfigPanel.appenders.pattern=Muster
 LoggingConfigPanel.audit=Audit
 LoggingConfigPanel.auditLog=Auditilogi
-LoggingConfigPanel.button.addClassLogger=Add logger
-LoggingConfigPanel.button.addComponentLogger=Add component logger
+LoggingConfigPanel.button.addClassLogger=Lisa loger
+LoggingConfigPanel.button.addComponentLogger=Lisa komponentloger
 LoggingConfigPanel.button.addConsoleAppender=Add console appender
 LoggingConfigPanel.button.addFileAppender=Add file appender
-LoggingConfigPanel.button.addStandardLogger=Add standard logger
+LoggingConfigPanel.button.addStandardLogger=Lisa standardloger
 LoggingConfigPanel.button.deleteAppender=Delete appender
-LoggingConfigPanel.button.deleteLogger=Delete logger
+LoggingConfigPanel.button.deleteLogger=Kustuta loger
 LoggingConfigPanel.button.reset=Lähtesta
 LoggingConfigPanel.button.save=Salvesta
 LoggingConfigPanel.details=Üksikasjad
-LoggingConfigPanel.logger=Logger
+LoggingConfigPanel.logger=Loger
 LoggingConfigPanel.loggersAppender=Appender
 LoggingConfigPanel.loggersLevel=Tase
-LoggingConfigPanel.loggers=Loggers
+LoggingConfigPanel.loggers=Logerid
 LoggingConfigPanel.profiling.dumpInterval=Tõmmistamise intervall
 LoggingConfigPanel.profiling.dumpInterval.placeholder=Tõmmistamise intervall
 LoggingConfigPanel.profiling.dumpInterval.tooltip=Sisesta väärtus minutites (vaikeväärtus on 30 min.)
@@ -521,10 +521,10 @@ LoggingConfigPanel.profiling.general=Profiilimine
 LoggingConfigPanel.profiling.performanceStatistics=Jõudlusstatistika
 LoggingConfigPanel.profiling.requestFilter=Päringufilter
 LoggingConfigPanel.profiling.subsystem.model=Mudel
-LoggingConfigPanel.profiling.subsystem.provisioning=Provisioning
+LoggingConfigPanel.profiling.subsystem.provisioning=Varustamine
 LoggingConfigPanel.profiling.subsystem.repository=Hoidla
 LoggingConfigPanel.profiling.subsystem.resourceObjectChangeListener=Resource Object Change Listener
-LoggingConfigPanel.profiling.subsystem.synchronizationService=Synchronization Service
+LoggingConfigPanel.profiling.subsystem.synchronizationService=Sünkimisteenus
 LoggingConfigPanel.profiling.subsystems=Profiilimise allsüsteemid
 LoggingConfigPanel.profiling.subsystem.taskManager=Tegumihaldur
 LoggingConfigPanel.profiling.subsystem.ucf=Ucf
@@ -547,7 +547,7 @@ lower.ActivationStatusType.null=määratlemata
 MailTransportSecurityType.NONE=Puudub
 MailTransportSecurityType.SSL=SSL
 MailTransportSecurityType.STARTTLS_ENABLED=StartTLS on lubatud
-MailTransportSecurityType.STARTTLS_REQUIRED=StartTLS required
+MailTransportSecurityType.STARTTLS_REQUIRED=StartTLS on kohustuslik
 mainForm.category.null=Kõik
 mainForm.mailServer.nullValid=Vali üks
 mainForm.state.null=Kõik
@@ -614,7 +614,7 @@ MultiValueField.nameNotSpecified=(Nimi on määramata)
 MyAccountsPanel.account.name=Nimi
 MyAccountsPanel.account.resource=Ressurss
 MyAssignmentsPanel.assignment.displayName=Nimi
-MyAssignmentsPanel.assignment.type=Tüüp
+MyAssignmentsPanel.assignment.type=Type
 MyAssignmentsPanel.type.accountConstruction=Account construction
 MyAssignmentsPanel.type.error=Viga
 MyAssignmentsPanel.type.orgUnit=Org. üksus
@@ -686,7 +686,7 @@ ObjectTypeGuiDescriptor.object=Objekt
 ObjectTypeGuiDescriptor.objectTemplate=Objekti mall
 ObjectTypeGuiDescriptor.orgManager=Org. juht
 ObjectTypeGuiDescriptor.org=Organisatsioon
-ObjectTypeGuiDescriptor.reportOutput=Aruande väljund
+ObjectTypeGuiDescriptor.reportOutput=Aruandeväljund
 ObjectTypeGuiDescriptor.report=Aruanne
 ObjectTypeGuiDescriptor.resource=Ressurss
 ObjectTypeGuiDescriptor.role=Roll
@@ -696,14 +696,14 @@ ObjectTypeGuiDescriptor.shadow=Vari
 ObjectTypeGuiDescriptor.systemConfiguration=Süsteemi konfiguratsioon
 ObjectTypeGuiDescriptor.task=Task
 ObjectTypeGuiDescriptor.user=Kasutaja
-ObjectTypeGuiDescriptor.service=Service
+ObjectTypeGuiDescriptor.service=Teenus
 ObjectTypeGuiDescriptor.valuePolicy=Väärtuspoliitika
 ObjectType.AbstractRoleType=Abstraktne roll
 ObjectType.AccessCertificationCampaignType=Access certification campaign
 ObjectType.AccessCertificationDefinitionType=Access certification definition
 ObjectType.AccountType=Konto
-ObjectType.ConnectorType=Connector
-ObjectType.ConnectorHostType=Connector host
+ObjectType.ConnectorType=Konnektor
+ObjectType.ConnectorHostType=Konnektorhost
 ObjectType.FocusType=Fookus
 ObjectType.GenericObjectType=Üldine objekt
 ObjectType.LookupTableType=Otsingutabel
@@ -712,7 +712,7 @@ ObjectType.ObjectType=Objekt
 ObjectType.ObjectTemplateType=Objekti mall
 ObjectType.OrgManagerType=Org. manager
 ObjectType.OrgType=Organisatsioon
-ObjectType.ReportOutputType=Report output
+ObjectType.ReportOutputType=Aruandeväljund
 ObjectType.ReportType=Aruanne
 ObjectType.ResourceType=Ressurss
 ObjectType.RoleType=Roll
@@ -720,9 +720,9 @@ ObjectType.SecurityPolicyType=Turbepoliitika
 ObjectType.SequenceType=Järjestus
 ObjectType.ShadowType=Vari
 ObjectType.SystemConfigurationType=Süsteemi konfiguratsioon
-ObjectType.TaskType=Task
+ObjectType.TaskType=Ülesanne
 ObjectType.UserType=Kasutaja
-ObjectType.ServiceType=Service
+ObjectType.ServiceType=Teenus
 ObjectType.ValuePolicyType=Väärtuspoliitika
 ObjectType.name=Nimi
 ObjectType.parentOrgRef=Parent org. units
@@ -732,7 +732,7 @@ operation.com.evolveum.midpoint.common.policy.PasswordPolicyUtils.passwordValida
 operation.com.evolveum.midpoint.common.validator.Validator.objectBasicsCheck=Üldised kontrollid
 operation.com.evolveum.midpoint.common.validator.Validator.resourceNamespaceCheck=Ressursi nimeruumi kontroll
 operation.com.evolveum.midpoint.common.validator.Validator.validateSchema=Schema validation
-operation.com.evolveum.midpoint.model.api.ModelDiagnosticService.provisioningSelfTest=Provisioning self test (Model)
+operation.com.evolveum.midpoint.model.api.ModelDiagnosticService.provisioningSelfTest=Varustamise enesetest (Mudel)
 operation.com.evolveum.midpoint.model.api.ModelDiagnosticService.repositorySelfTest=Hoidla enesetest (Mudel)
 operation.com.evolveum.midpoint.model.api.ModelInteractionService.previewChanges=Preview changes (Model)
 operation.com.evolveum.midpoint.model.api.ModelService.addObject=Lisa objekt (Mudel)
@@ -740,7 +740,7 @@ operation.com.evolveum.midpoint.model.api.ModelService.addUser=Lisa kasutaja (mu
 operation.com.evolveum.midpoint.model.api.ModelService.deleteObject=Kustuta objekt (Mudel)
 operation.com.evolveum.midpoint.model.api.ModelService.discoverConnectors=Discover connectors
 operation.com.evolveum.midpoint.model.api.ModelService.executeChanges=Täida muudatused (Mudel)
-operation.com.evolveum.midpoint.model.api.ModelService.getObject=Get object (Model)
+operation.com.evolveum.midpoint.model.api.ModelService.getObject=Hangi objekt (Mudel)
 operation.com.evolveum.midpoint.model.api.ModelService.getPropertyAvailableValues=Get Property Available Values (Model)
 operation.com.evolveum.midpoint.model.api.ModelService.importAccountsFromResource=Import accounts from resource
 operation.com.evolveum.midpoint.model.api.ModelService.importObjectsFromFile=Impordi objektid (Mudel)
@@ -756,17 +756,17 @@ operation.com.evolveum.midpoint.model.api.ModelService.testResource=Testi ressur
 operation.com.evolveum.midpoint.model.ChangeExecutor.executeChanges=Täida muudatused - muuda täitjat (Mudel)
 operation.com.evolveum.midpoint.model.common.mapping.Mapping.evaluate=Omistus - hinda (Mudel)
 operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.createAccount=Loo konto
-operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.getSystemConfiguration=Get system configuration
+operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.getSystemConfiguration=Hangi süsteemi konfiguratsioon
 operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.processUserTemplate=Töötle kasutaja mall
-operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.resolveAccountAttributes=Resolve account attributes
-operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.resolveUserAttributes=Resolve user attributes
-operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.updateAccount=Update account
+operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.resolveAccountAttributes=Lahenda konto atribuudid
+operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.resolveUserAttributes=Lahenda kasutaja atribuudid
+operation.com.evolveum.midpoint.model.controller.ModelControllerImpl.updateAccount=Värskenda kontoteavet
 operation.com.evolveum.midpoint.model.controller.ModelController.modifyObjectWithExclusion=Modify object with exclusion
 operation.com.evolveum.midpoint.model.controller.ModelController.processAddDeleteAccountFromChanges=Töötle konto muudatustest
-operation.com.evolveum.midpoint.model.controller.ModelController.searchObjectsInProvisioning=Search objects in provisioning
+operation.com.evolveum.midpoint.model.controller.ModelController.searchObjectsInProvisioning=Otsi objekte varustamisel
 operation.com.evolveum.midpoint.model.controller.ModelController.searchObjectsInRepository=Otsi hoidlast objekte
 operation.com.evolveum.midpoint.model.controller.ModelController.searchObjects=Otsi objekte (Mudel)
-operation.com.evolveum.midpoint.model.controller.ModelDiagController.repositorySelfTest.user.getObject=Get object (Model)
+operation.com.evolveum.midpoint.model.controller.ModelDiagController.repositorySelfTest.user.getObject=Hangi objekt (Mudel)
 operation.com.evolveum.midpoint.model.controller.ModelDiagController.repositorySelfTest.user.searchObjects.employeeType=Otsi objekte - employeeType (Mudel)
 operation.com.evolveum.midpoint.model.controller.ModelDiagController.repositorySelfTest.user.searchObjects.fullName=Otsi objekte - fullName (Mudel)
 operation.com.evolveum.midpoint.model.controller.ModelDiagController.repositorySelfTest.user.searchObjects.organization=Otsi objekte - organization (Mudel)
@@ -778,7 +778,7 @@ operation.com.evolveum.midpoint.model.controller.SchemaHandler.processPropertyCo
 operation.com.evolveum.midpoint.model.controller.SchemaHandler.processPropertyConstructions=Process property constructions
 operation.com.evolveum.midpoint.model.impl.controller.ModelDiagController.repositorySelfTest.user=Hoidla enesetest, kasutaja (Mudel)
 operation.com.evolveum.midpoint.model.importer.ImportAccountsFromResourceTaskHandler.launch=Import accounts from resource
-operation.com.evolveum.midpoint.model.importer.ObjectImporter.checkResourceSchema=Check resource schema
+operation.com.evolveum.midpoint.model.importer.ObjectImporter.checkResourceSchema=Kontrolli ressursi skeemi
 operation.com.evolveum.midpoint.model.importer.ObjectImporter.encryptValues=Encryption
 operation.com.evolveum.midpoint.model.importer.ObjectImporter.importObjectToRepository=Salvesta objekt hoidlasse
 operation.com.evolveum.midpoint.model.importer.ObjectImporter.resolveReference=Reference resolution
@@ -800,18 +800,18 @@ operation.com.evolveum.midpoint.model.sync.SynchronizeAccountResultHandler.handl
 operation.com.evolveum.midpoint.notifications.AccountOperationListener.notifyFailure=Teavita nurjumisest (Teavitused)
 operation.com.evolveum.midpoint.notifications.AccountOperationListener.notifyInProgress=Nofify in progress (Notifications)
 operation.com.evolveum.midpoint.notifications.AccountOperationListener.notifySuccess=Teavita edust (Teavitused)
-operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.addObject=Add object (Provisioning)
-operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.deleteObject=Delete object (Provisioning)
-operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.discoverConnectors=Discover connectors (Provisioning)
-operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.getObject=Get object (Provisioning)
-operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.modifyObject=Modify object (Provisioning)
-operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.searchObjects=Search objects (Provisioning)
-operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.testResource=Test resource (Provisioning)
+operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.addObject=Lisa objekt (Varustamine)
+operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.deleteObject=Kustuta objekt (Varustamine)
+operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.discoverConnectors=Avasta konnektoreid (Varustamine)
+operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.getObject=Hangi objekt (Varustamine)
+operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.modifyObject=Muuda objekti (Varustamine)
+operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.searchObjects=Otsi objekte (Varustamine)
+operation.com.evolveum.midpoint.provisioning.api.ProvisioningService.testResource=Testi ressurssi (Varustamine)
 operation.com.evolveum.midpoint.provisioning.api.ResourceObjectChangeListener.checkSituation=Kontrolli sünkimise olukorda
 operation.com.evolveum.midpoint.provisioning.api.ResourceObjectChangeListener.notifyChange=Notify change
 operation.com.evolveum.midpoint.provisioning.impl.ResourceManager.completeResource=Complete resource (Provisioning)
 operation.com.evolveum.midpoint.provisioning.impl.ResourceTypeManager.completeResource=Complete resource (Provisioning)
-operation.com.evolveum.midpoint.provisioning.impl.ShadowConverter.addShadow=Add shadow (Provisioning)
+operation.com.evolveum.midpoint.provisioning.impl.ShadowConverter.addShadow=Lisa vari (Varustamine)
 operation.com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance.addObject=Lisa objekt (Ucf)
 operation.com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance.configure=UCF konnektori konfiguratsioon
 operation.com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance.deleteObject=Kustuta objekt (Ucf)
@@ -821,31 +821,31 @@ operation.com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance.initializ
 operation.com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance.modifyObject=Muuda objekti (Ucf)
 operation.com.evolveum.midpoint.repo.api.RepositoryService.addObject=Lisa objekt (Hoidla)
 operation.com.evolveum.midpoint.repo.api.RepositoryService.deleteObject=Kustuta objekt (Hoidla)
-operation.com.evolveum.midpoint.repo.api.RepositoryService.getObject=Get object (Repository)
+operation.com.evolveum.midpoint.repo.api.RepositoryService.getObject=Hangi objekt (Hoidla)
 operation.com.evolveum.midpoint.repo.api.RepositoryService.modifyObject=Muuda objekti (Hoidla)
 operation.com.evolveum.midpoint.repo.api.RepositoryService.searchObjects=Otsi objekte (Hoidla)
 operation.com.evolveum.midpoint.schema.constants.ConnectorTestOperation.configurationValidation=Konfiguratsiooni valideerimine
 operation.com.evolveum.midpoint.schema.constants.ConnectorTestOperation.connectorConnection=Konnektori ühenduse test
 operation.com.evolveum.midpoint.schema.constants.ConnectorTestOperation.connectorInitialization=Konnektori lähtestamine
 operation.com.evolveum.midpoint.schema.constants.ConnectorTestOperation.testConnection=Testi ühendust
-operation.com.evolveum.midpoint.task.api.TaskManager.addTask=Add task (Task)
+operation.com.evolveum.midpoint.task.api.TaskManager.addTask=Lisa ülesanne (Ülesanne)
 operation.com.evolveum.midpoint.task.api.TaskManager.createTaskInstance=Create task instance (Task)
 operation.com.evolveum.midpoint.task.api.TaskManager.deactivateServiceThreads=Deactivate local service threads (Task)
 operation.com.evolveum.midpoint.task.api.TaskManager.deleteTask=Kustuta ülesanne (Ülesanne)
 operation.com.evolveum.midpoint.task.api.TaskManager.getNextRunStartTime=Get next task run start time (Task)
-operation.com.evolveum.midpoint.task.api.TaskManager.getTask=Get task (Task)
+operation.com.evolveum.midpoint.task.api.TaskManager.getTask=Hangi ülesanne (Ülesanne)
 operation.com.evolveum.midpoint.task.api.TaskManager.onTaskCreate=Task creation listener (Task)
 operation.com.evolveum.midpoint.task.api.TaskManager.onTaskDelete=Task deletion listener (Task)
 operation.com.evolveum.midpoint.task.api.TaskManager.reactivateServiceThreads=Reactivate local service threads (Task)
 operation.com.evolveum.midpoint.task.api.TaskManager.resumeTask=Jätka ülesannet (Ülesanne)
-operation.com.evolveum.midpoint.task.api.TaskManager.searchNodes=Search nodes (Task)
-operation.com.evolveum.midpoint.task.api.TaskManager.searchTasks=Search tasks (Task)
+operation.com.evolveum.midpoint.task.api.TaskManager.searchNodes=Otsi sõlmi (Ülesanne)
+operation.com.evolveum.midpoint.task.api.TaskManager.searchTasks=Otsi ülesandeid (Ülesanne)
 operation.com.evolveum.midpoint.task.api.TaskManager.suspendTasks=Peata ülesanded (Ülesanne)
 operation.com.evolveum.midpoint.task.api.TaskManager.switchToBackground=Switch task to background (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.cluster.ClusterManager.stopClusterManagerThread=Stop ClusterManager thread (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.cluster.NodeRegistrar.deleteNode=Kustuta sõlm (Ülesanne)
-operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.addNodeAndTaskInformation=Lisa sõlm ja ülesannete informatsioon (Ülesanne)
-operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.getClusterStatusInformation=Get cluster status information (Task)
+operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.addNodeAndTaskInformation=Lisa sõlme ja ülesannete informatsioon (Ülesanne)
+operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.getClusterStatusInformation=Hangi klastri oleku teave (Ülesanne)
 operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.scheduleTaskNow=Schedule task now (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.startScheduler=Start scheduler (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.stopAllTasksOnThisNodeAndWait=Stop all tasks on this node and wait for their completion (Task)
@@ -862,7 +862,7 @@ operation.com.evolveum.midpoint.task.quartzimpl.execution.RemoteNodesManager.sto
 operation.com.evolveum.midpoint.task.quartzimpl.execution.RemoteNodesManager.stopRemoteTaskRun=Stop remote task run (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.execution.TaskSynchronizer.synchronizeJobStores=Synchronize midPoint repository and Quartz Job Store (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.execution.TaskSynchronizer.synchronizeTask=Synchronize task in midPoint repository and Quartz Job Store (Task)
-operation.com.evolveum.midpoint.task.quartzimpl.GlobalExecutionManager.addNodeAndTaskInformation=Add node and task information (Task)
+operation.com.evolveum.midpoint.task.quartzimpl.GlobalExecutionManager.addNodeAndTaskInformation=Lisa sõlme ja ülesande informatsioon (Ülesanne)
 operation.com.evolveum.midpoint.task.quartzimpl.GlobalExecutionManager.stopSchedulersAndTasks=Stop schedulers and tasks (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.LocalExecutionManager.getLocallyRunningTasks=Get locally running tasks (Task)
 operation.com.evolveum.midpoint.task.quartzimpl.TaskManagerQuartzImpl.addTaskToRepositoryAndQuartz=Add task to repository and Quartz Job Store (Task)
@@ -877,13 +877,13 @@ operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugList.delet
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugView.loadObject=Laadi objekt (Gui)
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageDebugView.saveObject=Salvesta objekt (Gui)
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageImportObject.importFile=Impordi fail (Gui)
-operation.com.evolveum.midpoint.web.page.admin.configuration.PageImportObject.importXml=Import xml (Gui)
+operation.com.evolveum.midpoint.web.page.admin.configuration.PageImportObject.importXml=Impordi xml (Gui)
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageInternals.changeTime=Muuda aega (Gui)
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageInternals.changeTimeReset=Muuda aega - lähtesta (Gui)
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageLogging.loadLoggingConfiguration=Laadi logimise konfiguratsioon (Gui)
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageLogging.updateLoggingConfiguration=Värskenda logimise konfiguratsiooni (Gui)
-operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.getRepoDiag=Get repository diagnostics (Gui)
-operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.testRepository=Test repository (Gui)
+operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.getRepoDiag=Hangi hoidla diagnostiline informatsioon (Gui)
+operation.com.evolveum.midpoint.web.page.admin.help.PageSystem.testRepository=Testi hoidlat (Gui)
 operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadAccounts=Laadi kontod (Gui)
 operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadAssignments=Laadi omistused (Gui)
 operation.com.evolveum.midpoint.web.page.admin.home.PageDashboard.loadUser=Laadi kasutaja (Gui)
@@ -892,17 +892,17 @@ operation.com.evolveum.midpoint.web.page.admin.home.PageMyPasswords.loadAccount=
 operation.com.evolveum.midpoint.web.page.admin.home.PageMyPasswords.loadUser=Laadi kasutaja (Gui)
 operation.com.evolveum.midpoint.web.page.admin.home.PageMyPasswords.loadUserWithAccounts=Laadi kasutaja koos kontodega (Gui)
 operation.com.evolveum.midpoint.web.page.admin.home.PageMyPasswords.savePassword=Salvesta parool (Gui)
-operation.com.evolveum.midpoint.web.page.admin.reports.PageReport.saveReport=Save report (Gui)
+operation.com.evolveum.midpoint.web.page.admin.reports.PageReport.saveReport=Salvesta aruanne (Gui)
 operation.com.evolveum.midpoint.web.page.admin.reports.PageReports.loadReport=Laadi aruanne (Gui)
 operation.com.evolveum.midpoint.web.page.admin.reports.PageReports.runReport=Käivita aruanne (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.content.dto.AccountContentDataProvider.loadAccounts=Laadi kontod (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.content.PageAccount.saveAccount=Salvesta konto (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.content.PageContentAccounts.changeOwner=Muuda omanikku (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.content.PageContentAccounts.createUserFromAccount=Loo kasutaja konto põhjal (Gui)
-operation.com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDtoProvider.countResources=Count resources (Gui)
+operation.com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDtoProvider.countResources=Loenda ressursid (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDtoProvider.listResources=List resources (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.PageAdminResources.loadResource=Laadi ressurss (Gui)
-operation.com.evolveum.midpoint.web.page.admin.resources.PageResourceEdit.saveResource=Save resource (Gui)
+operation.com.evolveum.midpoint.web.page.admin.resources.PageResourceEdit.saveResource=Salvesta ressurss (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.PageResource.importFromResource=Importimine ressursist
 operation.com.evolveum.midpoint.web.page.admin.resources.PageResources.connectorDiscovery=Konnektori tuvastamine (Gui)
 operation.com.evolveum.midpoint.web.page.admin.resources.PageResources.deleteHosts=Kustuta hostid (Gui)
@@ -973,7 +973,7 @@ operation.linkShadow=Lingi konto (Mudel)
 operation.org.identityconnectors.framework.api.ConnectorFacade.addAttributeValues=Add attribute values (Icf)
 operation.org.identityconnectors.framework.api.ConnectorFacade.create=Loo (Icf)
 operation.org.identityconnectors.framework.api.ConnectorFacade.delete=Kustuta objekt (ICF)
-operation.org.identityconnectors.framework.api.ConnectorFacade.getObject=ICF get object
+operation.org.identityconnectors.framework.api.ConnectorFacade.getObject=ICF hangi objekt
 operation.org.identityconnectors.framework.api.ConnectorFacade.schema=ICF skeem
 operation.org.identityconnectors.framework.api.ConnectorFacade.update=Update (Icf)
 operationResultPanel.cause=Põhjus\:
@@ -1042,7 +1042,7 @@ OriginType.SYNC_ACTION=Sync action
 OriginType.USER_ACTION=User action
 OriginType.USER_POLICY=Kasutajapoliitika
 PageAbout.allRightsReserved=&copy;2014 Evolveum.
-PageAbout.button.testProvisioning=Provisioning self test
+PageAbout.button.testProvisioning=Varustamise enesetest
 PageAbout.button.testRepositoryCheckOrgClosure=Kontrolli ja paranda org-de sulundi ühtsus
 PageAbout.button.testRepository=Hoidla enesetest
 PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
@@ -1063,7 +1063,7 @@ PageAbout.repoDiag.repositoryUrl=Hoidla URL
 PageAbout.title=Teave midPointi kohta
 PageAbout.title.basic=Põhiteave
 PageAbout.title.jvmProperties=JVM atribuudid
-PageAbout.title.provisioning=Provisioning
+PageAbout.title.provisioning=Varustamine
 PageAbout.title.repository.additional=Lisateave
 PageAbout.title.repository=Hoidla
 PageAbout.title.systemProperties=Süsteemiatribuudid
@@ -1177,7 +1177,7 @@ PageAdminObjectDetails.title.editUserType=Redigeeri kasutajat '{0}'
 PageAdminObjectDetails.title.newUserType=Loo uus kasutaja
 PageAdminObjectDetails.title.editRoleType=Redigeeri rolli '{0}'
 PageAdminObjectDetails.title.newServiceType=Create new service
-PageAdminObjectDetails.title.editServiceType=Edit service '{0}'
+PageAdminObjectDetails.title.editServiceType=Redigeeri teenust '{0}'
 PageAdminObjectDetails.title.newRoleType=Loo uus roll
 PageAdminObjectDetails.title.editOrgType=Redigeeri organisatsiooni '{0}'
 PageAdminObjectDetails.title.newOrgType=Loo uus organisatsioon
@@ -1413,7 +1413,7 @@ PageCertDefinition.scopeIncludeInducements=Tekitused
 PageCertDefinition.scopeIncludeTargetTypes=Include target types
 PageCertDefinition.scopeIncludeRoles=Rollid
 PageCertDefinition.scopeIncludeOrgs=Org.-d
-PageCertDefinition.scopeIncludeServices=Services
+PageCertDefinition.scopeIncludeServices=Teenused
 PageCertDefinition.scopeIncludeResources=Ressursid
 PageCertDefinition.scopeIncludeByStatus=Include by activation status
 PageCertDefinition.scopeEnabledItemsOnly=Enabled items only
@@ -1505,7 +1505,7 @@ pageCreatedReports.filter.filetype=Failitüüp
 pageCreatedReports.filter.reportType=Aruandetüüp
 pageCreatedReports.inlineMenu.deleteAll=Kustuta kõik
 pageCreatedReports.inlineMenu.deleteSelected=Kustuta valitud
-pageCreatedReports.message.deleteAll=Kas soovid kindlasti kustutada kõik loodud aruande väljundid?
+pageCreatedReports.message.deleteAll=Kas soovid kindlasti kustutada kõik loodud aruandeväljundid?
 pageCreatedReports.message.deleteOutputConfirmed=Kas soovid kindlasti kustutada {0} valitud loodud aruannet?
 pageCreatedReports.message.deleteOutputSingle=Kas soovid kindlasti kustutada loodud aruannet '{0}'?
 pageCreatedReports.message.downloadError=Could not download Report.
@@ -1541,7 +1541,7 @@ PageDashboard.infobox.roles.label=Rollid
 PageDashboard.infobox.roles.number=lubatud
 PageDashboard.infobox.roles.total=kokku
 PageDashboard.infobox.roles.archived=arhiivitud
-PageDashboard.infobox.services.label=Services
+PageDashboard.infobox.services.label=Teenused
 PageDashboard.infobox.services.number=lubatud
 PageDashboard.infobox.services.total=kokku
 PageDashboard.infobox.services.archived=arhiivitud
@@ -1649,15 +1649,15 @@ pageLogging.appenders.name=Nimi
 pageLogging.appenders.pattern=Muster
 pageLogging.audit=Audit
 pageLogging.auditLog=Audit to log file\:
-pageLogging.button.addClassLogger=Add logger
-pageLogging.button.addComponentLogger=Add component logger
+pageLogging.button.addClassLogger=Lisa loger
+pageLogging.button.addComponentLogger=Lisa komponentloger
 pageLogging.button.addConsoleAppender=Add console appender
 pageLogging.button.addFileAppender=Add file appender
 pageLogging.button.addFilter=Lisa filter
 pageLogging.button.advanced=Advanced
 pageLogging.button.deleteAppender=Delete appender
 pageLogging.button.deleteFilter=Kustuta filter
-pageLogging.button.deleteLogger=Delete logger
+pageLogging.button.deleteLogger=Kustuta loger
 pageLogging.button.reset=Lähtesta
 pageLogging.button.save=Salvesta
 pageLogging.details=Üksikasjad\:
@@ -1667,26 +1667,26 @@ pageLogging.filter=Filter
 pageLogging.filter.GUI=Web filter
 pageLogging.filter.MODEL=Model filter
 pageLogging.filter.NOTIFICATIONS=Teavituste filter
-pageLogging.filter.PROVISIONING=Provisioning filter
+pageLogging.filter.PROVISIONING=Varustamise filter
 pageLogging.filter.REPOSITORY=Repository filter
 pageLogging.filter.RESOURCEOBJECTCHANGELISTENER=Resource object change listener filter
 pageLogging.filtersTable=Filters table
 pageLogging.filter.TASKMANAGER=Tegumihalduri filter
 pageLogging.filter.WORKFLOWS=Töövoo filter
 pageLogging.logger.ALL=Kõik
-pageLogging.logger.GUI=Web logger
-pageLogging.logger=Logger
-pageLogging.logger.MODEL=Model logger
-pageLogging.logger.NOTIFICATIONS=Notifications logger
-pageLogging.logger.PROVISIONING=Provisioning logger
-pageLogging.logger.REPOSITORY=Repository logger
-pageLogging.logger.RESOURCEOBJECTCHANGELISTENER=Resource object change listener logger
+pageLogging.logger.GUI=Veebiloger
+pageLogging.logger=Loger
+pageLogging.logger.MODEL=Mudeli loger
+pageLogging.logger.NOTIFICATIONS=Teavituste loger
+pageLogging.logger.PROVISIONING=Varustamise loger
+pageLogging.logger.REPOSITORY=Hoidla loger
+pageLogging.logger.RESOURCEOBJECTCHANGELISTENER=Ressursiobjekti muudatuse jälgija loger
 pageLogging.loggersAppender=Appender
 pageLogging.loggersLevel=Tase
-pageLogging.loggers=Loggers
-pageLogging.loggersTable=Loggers table
-pageLogging.logger.TASKMANAGER=Task manager logger
-pageLogging.logger.WORKFLOWS=Workflow module logger
+pageLogging.loggers=Logerid
+pageLogging.loggersTable=Logerite tabel
+pageLogging.logger.TASKMANAGER=Tegumihalduri loger
+pageLogging.logger.WORKFLOWS=Töövoo mooduli loger
 pageLogging.logSubsystemEntryExit=Log subsystem entry/exit
 pageLogging.performanceStatistics=Jõudlusstatistika\:
 pageLogging.profiling=Profiilimine
@@ -1696,7 +1696,7 @@ pageLogging.rootLevel=Juurtasandi loger\:
 pageLogging.subsystem.appender=Appender
 pageLogging.subsystem.level=Tase
 pageLogging.subsystem.model=Mudel
-pageLogging.subsystem.provisioning=Provisioning
+pageLogging.subsystem.provisioning=Varustamine
 pageLogging.subsystem.repository=Hoidla
 pageLogging.subsystem.resourceObjectChangeListener=Resource object change listener
 pageLogging.subsystems=Alamsüsteemid\:
@@ -2161,7 +2161,7 @@ pageUser.button.save=Salvesta
 pageUser.button.submit=Preview changes
 pageUser.button.unlink=Katkesta link
 pageUser.button.unlock=Lukusta lahti
-pageUser.description=User in repository
+pageUser.description=Kasutaja hoidlas
 pageUser.menu.assignAccount=Omista konto
 pageUser.menu.assignOrg=Omista org. üksus
 pageUser.menu.assignRole=Omista roll
@@ -2287,7 +2287,7 @@ pageWorkItem.trackingData=Tracking data
 pageWorkItem.workItemCreatedOn=This work item created on\:
 passwordPanel.error=Paroolid ei ühti.
 passwordPanel.passwordChange=Muuda
-passwordPanel.passwordRemove=Remove
+passwordPanel.passwordRemove=Eemalda
 passwordPanel.passwordSet=parool on seatud
 passwordPanel.passwordRemoveLabel=parool eemaldatakse
 past.ChangeType.ADD=Lisatud
@@ -2351,7 +2351,7 @@ ProvisioningStatistics.CreateSuccess=Loo OK
 ProvisioningStatistics.DeleteFailure=Fail
 ProvisioningStatistics.DeleteSuccess=Kustuta OK
 ProvisioningStatistics.GetFailure=Fail
-ProvisioningStatistics.GetSuccess=Get OK
+ProvisioningStatistics.GetSuccess=Hangi OK
 ProvisioningStatistics.MaxTime=Max
 ProvisioningStatistics.MinTime=Min
 ProvisioningStatistics.ObjectClass=Objekti klass
@@ -2509,7 +2509,7 @@ runReportPopupContent.param.class=Parameetritüüp
 runReportPopupContent.param.name.eventStage = Event Stage
 runReportPopupContent.param.name.eventType = Sündmusetüüp
 runReportPopupContent.param.name.from = Date From
-runReportPopupContent.param.name.initiatorName = Initiator Name
+runReportPopupContent.param.name.initiatorName = Algataja nimi
 runReportPopupContent.param.name.outcome = Outcome
 runReportPopupContent.param.name=Parameetri nimi
 runReportPopupContent.param.name.targetName = Target Name
@@ -2577,7 +2577,7 @@ SchemaHandlingStep.label.iteration=Iteratsioon
 SchemaHandlingStep.label.kind=Liik
 SchemaHandlingStep.label.newObjectType=Uus objektitüüp
 SchemaHandlingStep.label.objectClass=Objekti klass
-SchemaHandlingStep.label.objectTypes=Objektitüübid
+SchemaHandlingStep.label.objectTypes=Object Types
 SchemaHandlingStep.label.protected=Kaitstud
 SchemaHandlingStep.limitations.tooltip.ignore=Flag to ignore an attribute. MidPoint will pretend that the ignored attribute does not exist at all. It will not display it in the user interface, will not apply mappings, etc.
 SchemaHandlingStep.limitations.tooltip.layers=System layers to which this limitation applies. Sometimes the limitation does not apply equally to all the layers. E.g. the attribute may be formally read-write but we want it to be only presented as read-only by the user interface and change it only through mappings. In such a case the read-only limitation applies only to "presentation" layer.
@@ -2663,7 +2663,7 @@ SearchType.FULL_NAME=Täisnimi
 SearchType.GIVEN_NAME=Eesnimi
 SearchType.NAME=Nimi
 ShadowType.kind=Liik
-ShadowType.intent=Intent
+ShadowType.intent=Kavatsus
 ShadowType.objectClass=Objekti klass
 ShadowType.synchronizationSituation=Situation
 ShadowKindType.ACCOUNT=Konto
@@ -2763,7 +2763,7 @@ SynchronizationStep.label.reaction=Reaction
 SynchronizationStep.label.reconcile=Lepita
 SynchronizationStep.label.syncObjectHeader=Sünkimisobjektid
 SynchronizationStep.message.cantSave=Ei saanud salvestada ressursi sünki.
-SynchronizationStep.message.errorLoadingObjectSyncList=Couldn't load object synchronization list from resource. Error\:
+SynchronizationStep.message.errorLoadingObjectSyncList=Ressursist ei õnnestu laadida objekti sünkimise loetelu. Viga\:
 SynchronizationStep.message.errorLoadingObjectTemplates=Hoidlast ei õnnestu laadida objekti malle.
 SynchronizationStep.message.unsupportedActionFormat=You are using deprecated attribute 'ref' to define reaction action. Use element 'handlerUri' instead. Actions with 'ref' attribute will not be shown in this wizard.
 SynchronizationStep.reaction.tooltip.action=Explicit action. This setting defines what midPoint has to do as a reaction to the synchronization event.
@@ -2926,7 +2926,7 @@ TreeTablePanel.menu.delete=Kustuta
 TreeTablePanel.menu.disable=Keela
 TreeTablePanel.menu.enable=Luba
 TreeTablePanel.menu.move=Move
-TreeTablePanel,menu.recompute=Arvuta uuesti
+TreeTablePanel,menu.recompute=Recompute
 TreeTablePanel.menu.removeFromHierarchy=Eemalda org. üksusest
 TreeTablePanel.message.deleteObjectConfirm=Kas soovid kindlasti kustutada valitud {0} objekti?
 TreeTablePanel.message.deleteRootConfirm=Kas soovid kindlasti kustutada {0} ({1})?
@@ -2937,7 +2937,7 @@ TreeTablePanel.recomputeRoot=Arvuta uuesti juurüksus
 TreeTablePanel.recomputeTask=Arvuta uuesti organisatsiooni {0} kasutajad
 TreeTablePanel.search.scope.one=Üks tase
 TreeTablePanel.search.scope.subtree=Alampuu
-TreeTablePanel.fullName.displayName=Fullname/Display name
+TreeTablePanel.fullName.displayName=Täisnimi/Kuvatav nimi
 TreeTablePanel.identifier.description=Identifier/Description
 Type.AUDIT=Audit
 type.nullValid=Vali üks
@@ -2975,7 +2975,7 @@ UserReportConfigPanel.dateFrom=Aadress
 UserReportConfigPanel.dateTo=To
 UserReportConfigPanel.exportFileType=Export Type
 UserReportConfigPanel.title.basic=Basic User Report Configuration
-User.superuser=Superkasutaja
+User.superuser=Superuser
 UserType.emailAddress=Meiliaadress
 UserType.familyName=Perekonnanimi
 UserType.fullName=Täisnimi
@@ -3068,7 +3068,7 @@ roleMemberPanel.type=Vali liikme tüüp
 roleMemberPanel.tenant=Choose tenant
 roleMemberPanel.project=Vali org/projekt
 FailedOperationTypeType.ADD=Add
-FailedOperationTypeType.GET=Get
+FailedOperationTypeType.GET=Hangi
 FailedOperationTypeType.MODIFY=Modify
 FailedOperationTypeType.DELETE=Kustuta
 SearchPanel.more=More...
@@ -3079,10 +3079,10 @@ SearchItemPanel.all=All
 SearchItemPanel.update=Update
 SearchItemPanel.close=Close
 SearchItemPanel.add=Add
-SearchItemPanel.remove=Remove
+SearchItemPanel.remove=Eemalda
 SearchItemPanel.browse=Browse
 SearchItemPanel.or=or
-operation.com.evolveum.midpoint.schema.constants.ConnectorTestOperation.connectorSchema=Connector schema
+operation.com.evolveum.midpoint.schema.constants.ConnectorTestOperation.connectorSchema=Konnektori skeem
 FeedbackAlertMessageDetails.operation=Operation
 FeedbackAlertMessageDetails.message=Message
 FeedbackAlertMessageDetails.params=Parameetrid
@@ -3093,7 +3093,7 @@ operation.com.evolveum.midpoint.model.impl.lens.projector.InboundProcessor.proce
 operation.com.evolveum.midpoint.model.impl.lens.projector.Projector.project=Projitseeri (Mudel)
 operation.com.evolveum.midpoint.model.impl.lens.projector.AssignmentProcessor.processAssignmentsProjections=Töötle omistused (Mudel)
 operation.com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails.save=Salvesta (Gui)
-operation.com.evolveum.midpoint.repo.api.RepositoryService.getVersion=Get version (Repository)
+operation.com.evolveum.midpoint.repo.api.RepositoryService.getVersion=Hangi versiooni informatsioon (Hoidla)
 operation.com.evolveum.midpoint.task.quartzimpl.execution.ExecutionManager.scheduleRunnableTaskNow=Schedule runnable task now (Task)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskAdd.runNowTask=Käivita kohe (Ülesanne)
 operation.com.evolveum.midpoint.task.api.TaskManager.scheduleTasksNow=Schedule tasks now (Task)
@@ -3151,16 +3151,16 @@ ResourceContentResourcePanel.realSearch=(In fact) Searching by\:
 typedAssignablePanel.selectedOrgs=Org.-d\:
 typedAssignablePanel.selectedResources=Ressursid\:
 typedAssignablePanel.selectedRoles=Rollid\:
-typedAssignablePanel.selectedServices=Services\:
+typedAssignablePanel.selectedServices=Teenused\:
 SearchPanel.insertFilterXml=Insert filter xml (SearchFilterType)
 autoRefreshPanel.refreshNow=Värskenda kohe
 autoRefreshPanel.resumeRefreshing=Jätka värskendamist
 autoRefreshPanel.pauseRefreshing=Peata värskendamine
 autoRefreshPanel.refreshingEach=Refreshing each {0} sec
 autoRefreshPanel.noRefreshing=(no refreshing)
-PageAdmin.menu.top.services=Services
+PageAdmin.menu.top.services=Teenused
 PageAdmin.menu.top.services.list=List Services
-PageAdmin.menu.top.services.new=New Service
+PageAdmin.menu.top.services.new=Uus teenus
 taskShowAdvancedFeaturesPanel.label=Show advanced features
 taskWfParentPanel.changesNotRequiringApproval=Changes not requiring approval
 taskOtherChangesPanel.label.state=Olek\:
@@ -3179,7 +3179,7 @@ TaskDto.changesWaitingToBeApplied=Changes waiting to be applied
 TaskDto.changesWaitingToBeApproved=Changes waiting to be approved
 TaskDto.changesRejected=Changes rejected
 TaskDto.changesCanceled=Changes canceled
-PageServices.title=Service List
+PageServices.title=Teenuseloend
 LiveSyncHandlerPanel.deleteToken=Delete token
 ScannerHandlerPanel.lastScanTimestamp=Last scan timestamp
 ScriptExecutionHandlerPanel.script=Skript
@@ -3211,17 +3211,17 @@ ObjectTypes.ORG=Org
 ObjectTypes.ABSTRACT_ROLE=Abstraktne roll
 ObjectTypes.FOCUS_TYPE=Fookuse tüüp
 ObjectTypes.REPORT=Aruanne
-ObjectTypes.REPORT_OUTPUT=Aruande väljund
+ObjectTypes.REPORT_OUTPUT=Aruandeväljund
 ObjectTypes.SECURITY_POLICY=Turbepoliitika
 ObjectTypes.LOOKUP_TABLE=Otsingutabel
 ObjectTypes.ACCESS_CERTIFICATION_DEFINITION=Certification definition
 ObjectTypes.ACCESS_CERTIFICATION_CAMPAIGN=Certification campaign
 ObjectTypes.SEQUENCE=Järjestus
-ObjectTypes.SERVICE=Service
+ObjectTypes.SERVICE=Teenus
 ObjectTypes.OBJECT=Objekt
-TreeTablePanel.menu.createMember=Create member
+TreeTablePanel.menu.createMember=Loo liige
 TreeTablePanel.menu.createManager=Create manager
-TreeTablePanel.menu.addMembers=Add members
+TreeTablePanel.menu.addMembers=Lisa liikmed
 TreeTablePanel.menu.addManagers=Add managers
 TreeTablePanel.menu.removeMembersSelected=Eemalda valitud liikmed
 TreeTablePanel.menu.removeMembersAll=Eemalda kõik liikmed
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
index fe2e395b393..ddd809515d1 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
@@ -614,7 +614,7 @@ MultiValueField.nameNotSpecified=(Meno nebolo špecifikované)
 MyAccountsPanel.account.name=Meno
 MyAccountsPanel.account.resource=Zdroj
 MyAssignmentsPanel.assignment.displayName=Názov
-MyAssignmentsPanel.assignment.type=Typ
+MyAssignmentsPanel.assignment.type=Type
 MyAssignmentsPanel.type.accountConstruction=Vytvorenie účtu
 MyAssignmentsPanel.type.error=Chyba
 MyAssignmentsPanel.type.orgUnit=Org. jednotka
@@ -2577,7 +2577,7 @@ SchemaHandlingStep.label.iteration=Iterácia
 SchemaHandlingStep.label.kind=Druh
 SchemaHandlingStep.label.newObjectType=Pridať nový typ objektu
 SchemaHandlingStep.label.objectClass=Trieda objektu
-SchemaHandlingStep.label.objectTypes=Typy objektov
+SchemaHandlingStep.label.objectTypes=Object Types
 SchemaHandlingStep.label.protected=Chránený
 SchemaHandlingStep.limitations.tooltip.ignore=Flag ignorovať atribút. MidPoint bude predstierať, že ignorovaný atribút vôbec neexistuje. Nebude ho zobrazovať v užívateľskom rozhraní, nebude aplikovať mapovanie, atď
 SchemaHandlingStep.limitations.tooltip.layers=Systémové vrstvy, na ktoré sa vzťahuje toto obmedzenie. Niekedy sa obmedzenie  nevzťahuje rovnako na všetky vrstvy. Napr. atribút môže byť formálne na čítanie aj zápis, ale chceme, aby bol prezentovaný len na čítanie pomocou používateľského rozhrania a zmeniť to len prostredníctvom mapovania. V takom prípade obmedzenie len na čítanie platí len pre "prezentačnú" vrstvu.
@@ -2926,7 +2926,7 @@ TreeTablePanel.menu.delete=Zmazať
 TreeTablePanel.menu.disable=Zakázať
 TreeTablePanel.menu.enable=Povoliť
 TreeTablePanel.menu.move=Presunúť
-TreeTablePanel,menu.recompute=Prepočítať
+TreeTablePanel,menu.recompute=Recompute
 TreeTablePanel.menu.removeFromHierarchy=Odstrániť z org. jednotky
 TreeTablePanel.message.deleteObjectConfirm=Naozaj chcete zmazať vybrané {0} objekt(y)?
 TreeTablePanel.message.deleteRootConfirm=Naozaj chcete zmazať {0} ({1})?
@@ -2975,7 +2975,7 @@ UserReportConfigPanel.dateFrom=Od
 UserReportConfigPanel.dateTo=Do
 UserReportConfigPanel.exportFileType=Typ exportu
 UserReportConfigPanel.title.basic=Základná konfigurácia pre používateľský report
-User.superuser=Superužívateľ
+User.superuser=Superuser
 UserType.emailAddress=Email
 UserType.familyName=Priezvisko
 UserType.fullName=Celé meno
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
index 7b9c9ae5a3e..ade17c19467 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
@@ -614,7 +614,7 @@ MultiValueField.nameNotSpecified=(Ad belirtilmemiş)
 MyAccountsPanel.account.name=Ad
 MyAccountsPanel.account.resource=Kaynak
 MyAssignmentsPanel.assignment.displayName=Ad
-MyAssignmentsPanel.assignment.type=Tip
+MyAssignmentsPanel.assignment.type=Type
 MyAssignmentsPanel.type.accountConstruction=Hesap oluşturma
 MyAssignmentsPanel.type.error=Hata
 MyAssignmentsPanel.type.orgUnit=Organizasyon birimi
@@ -2577,7 +2577,7 @@ SchemaHandlingStep.label.iteration=Yineleme
 SchemaHandlingStep.label.kind=Tür
 SchemaHandlingStep.label.newObjectType=Yeni nesne tipi
 SchemaHandlingStep.label.objectClass=Nesne sınıfı
-SchemaHandlingStep.label.objectTypes=Nesne Tipleri
+SchemaHandlingStep.label.objectTypes=Object Types
 SchemaHandlingStep.label.protected=Korumalı
 SchemaHandlingStep.limitations.tooltip.ignore=Bir özniteliği yoksaymak için işaretleyin. Engerek yoksayılan özniteliğin hiç varolmadığı gibi davranır. Kullanıcı ara yüzünde göstermez ve eşlemelere uygulamaz vb.
 SchemaHandlingStep.limitations.tooltip.layers=Bu kısıtlamanın uygulandığı sistem katmanları. Bzen kısıtlana her katmanda aynı biçide uygulanmaz.Ör\: Öznitelik resmi olarak oku-yaz olsa da kullanıcı arayüzünde onun sadece salt-okunur olarak gösterilmesini ve sadece eşlemelerle  değiştirmek isteriz. Bu durumda saly-okunur kısıtlaması sadece "prezentasyon" katmanında uygulanır.
@@ -2926,7 +2926,7 @@ TreeTablePanel.menu.delete=Delete
 TreeTablePanel.menu.disable=Pasif yap
 TreeTablePanel.menu.enable=Aktif yap
 TreeTablePanel.menu.move=Taşı
-TreeTablePanel,menu.recompute=Tekrar hesapla
+TreeTablePanel,menu.recompute=Recompute
 TreeTablePanel.menu.removeFromHierarchy=Org. biriminden çıkar
 TreeTablePanel.message.deleteObjectConfirm=Gerçekten seçili {0} nesneyi silmek istiyor musunuz?
 TreeTablePanel.message.deleteRootConfirm=Gerçekten  {0} ({1}) kökü silmek istiyor musunuz?