diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
index 02b9b24dad3..2ec8a20bcd9 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Accounts
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Delete
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Disable
 pageUsers.menu.enable=Enable
 pageUsers.menu.reconcile=Reconcile
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
index 6f573eda635..f2d0ddf781f 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -57,10 +57,10 @@ AssignmentEditorPanel.targetError=Cíl přiřazení nebyl nalezen. Cílové OID
 AssignmentEditorPanel.target=Cíl
 AssignmentEditorPanel.tenantRef=Partaj
 AssignmentEditorPanel.undefined=Nedefinováno
-AssignmentPreviewDialog.button.cancel=Zavřít
+AssignmentPreviewDialog.button.cancel=Zrušit
 AssignmentPreviewDialog.column.description=Popis
 AssignmentPreviewDialog.column.intent=Záměr
-AssignmentPreviewDialog.column.kind=Typ
+AssignmentPreviewDialog.column.kind=Druh
 AssignmentPreviewDialog.column.name=Název
 AssignmentPreviewDialog.column.orgRef=Organizace
 AssignmentPreviewDialog.column.tenant=Partaj
@@ -218,7 +218,7 @@ deleteAllDialog.label.nonAccountShadowsDelete=Neuživatelské stínové účty k
 deleteAllDialog.label.org=Org. jednotky
 deleteAllDialog.label.orgUnitsDelete=Org. jednotky ke smazání\: {0}
 deleteAllDialog.label.shadow.account=Stínové účty
-deleteAllDialog.label.shadow.nonAccount=Neuživatelský stínový účet
+deleteAllDialog.label.shadow.nonAccount=Neuživatelské stínové účty
 deleteAllDialog.label.shadow.org=Stínové org. jednotky
 deleteAllDialog.label.shadow.role=Stínové role
 deleteAllDialog.label.totalToDelete=Celkem objektů ke smazání\: {0}
@@ -242,7 +242,7 @@ ExecuteChangeOptionsPanel.label.force=Autoritativně
 ExecuteChangeOptionsPanel.label.keepDisplayingResults=Nechat zobrazené výsledky
 ExecuteChangeOptionsPanel.label.reconcileAffected=Rekonciliovat dotčené objekty
 ExecuteChangeOptionsPanel.label.reconcile=Rekonciliovat
-ExecuteChangeOptionsPanel.options=Volby
+ExecuteChangeOptionsPanel.options=Možnosti
 existenceFetchStrategy.nullValid=Vyberte jeden
 ExportType.CSV=CSV
 ExportType.DOCX=DOCX
@@ -300,7 +300,7 @@ feedbackMessagePanel.message.expectedError=Očekávaná chyba
 feedbackMessagePanel.message.fatalError=Fatální chyba
 feedbackMessagePanel.message.info=Informace
 feedbackMessagePanel.message.inProgress=Zpracovává se
-feedbackMessagePanel.message.notApplicable=Není použitelné
+feedbackMessagePanel.message.notApplicable=Není aplikováno
 feedbackMessagePanel.message.partialError=Částečná chyba
 feedbackMessagePanel.message.success=Úspěšný
 feedbackMessagePanel.message.undefined=Nedefinovaný
@@ -311,8 +311,8 @@ feedbackMessagePanel.showStack=[ ZOBRAZIT VÝPIS CHYBY ]
 feedbackMessagePanel.times=krát
 feedtempMessagePanelbackMessagePanel.message.info=Informace
 fetchStrategy.nullValid=Vyberte jeden
-filter.duplicate=Filter se jménem '{0}' je již definován
-filter.emptyFilter=Filter nesmí být prázdný
+filter.duplicate=Filtr se jménem '{0}' je již definován
+filter.emptyFilter=Filtr nesmí být prázdný
 H3Header.label.error=Chyba
 H3Header.showMore=Více
 HandlerUriActions.ACTION_ADD_FOCUS=Vložit vzorový objekt
@@ -529,10 +529,10 @@ NavigatorPanel.lastLink=>>
 NavigatorPanel.nextLink=>
 NavigatorPanel.previousLink=<
 NodeExecutionStatus.COMMUNICATION_ERROR=Nedostupný
-NodeExecutionStatus.DOWN=Vypnuto
+NodeExecutionStatus.DOWN=Vypnutý
 NodeExecutionStatus.ERROR=Chyba
-NodeExecutionStatus.PAUSED=Zastaveno
-NodeExecutionStatus.RUNNING=Spuštěno
+NodeExecutionStatus.PAUSED=Zastavený
+NodeExecutionStatus.RUNNING=Spuštěný
 NotificationsStatistics.AverageTime=Prům. čas
 NotificationsStatistics.CountFailure=Neúspěšné
 NotificationsStatistics.CountSuccess=Úspěšné
@@ -549,7 +549,7 @@ ObjectPolicyDialog.button.save=Uložit
 ObjectPolicyDialog.label=Upravit politiku objektu
 ObjectPolicyDialog.label.oidBound.help=Vazba oid - hodnota vlastnosti bude vázána na OID. Tato vlastnost bude nastavena na hodnotu OID a nelze ji měnit.
 ObjectPolicyDialog.propertyConstraint=Omezení vlastnosti
-ObjectPolicyDialog.property.placeholder=vložit cestu vlastnosti
+ObjectPolicyDialog.property.placeholder=Vložit cestu vlastnosti
 ObjectPolicyDialog.subtype=Podtyp objektu
 ObjectPolicyDialog.template=Šablona objektu
 ObjectPolicyDialog.type=Typ objektu
@@ -918,7 +918,7 @@ 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
-PageAccounts.accounts.kind=Typ
+PageAccounts.accounts.kind=Druh
 PageAccounts.accounts.name=Název
 PageAccounts.accounts.objectClass=Třída objektu
 PageAccounts.accounts.failedOperationType=Neúspěšná operace
@@ -1301,13 +1301,13 @@ PageCertDefinition.scopeEnabledItemsOnly=Jen povolené položky
 PageCertDefinition.stagesDefinition=Definice fází
 PageCert.in=za {0}
 PageCert.message.assignment={0} z {1} {2} až {3} {4}.
-PageCert.message.textAdministrativeState=Administrativní status\: {0}.
+PageCert.message.textAdministrativeState=Administrativní stav\: {0}.
 PageCert.message.textAssignment=Přiřazení
 PageCert.message.textDescription=Popis\: {0}.
 PageCert.message.textExtensions=Definovaná rozšření\: {0}.
 PageCert.message.textInducement=Dědění
 PageCert.message.textIntent=Záměr\: {0}.
-PageCert.message.textKind=Typ\: {0}.
+PageCert.message.textKind=Druh\: {0}.
 PageCert.message.textOrder=Pořadí\: {0}.
 PageCert.message.textOrg=Organizace\: {0}.
 PageCert.message.textRelation=Vazba\: {0}.
@@ -1348,7 +1348,7 @@ pageContentAccounts.button.searchButton=Hledat
 pageContentAccounts.dialog.title.confirmDelete=Potvrzení smazání
 pageContentAccounts.identifiers=identifikátory
 pageContentAccounts.intent=Záměr
-pageContentAccounts.kind=Typ
+pageContentAccounts.kind=Druh
 pageContentAccounts.menu.changeOwner=Změna vlastníka
 pageContentAccounts.menu.deleteAccount=Smazat
 pageContentAccounts.menu.disableAccount=Zakázat
@@ -1879,7 +1879,7 @@ pageTaskEdit.execution=Stav běhu
 pageTaskEdit.handlerUri=URI manipulátoru
 pageTaskEdit.identifier=Identifikátor
 pageTaskEdit.intent=Záměr
-pageTaskEdit.kind=Typ objektu
+pageTaskEdit.kind=Druh
 pageTaskEdit.lastFinished=Poslední běh ukončen
 pageTaskEdit.lastStarted=Poslední běh spuštěn
 pageTaskEdit.message.cantTaskDetails=Nepodařilo se načíst detaily úlohy.
@@ -1933,7 +1933,7 @@ pageTaskEdit.workerThreads=Pracovní vlákna
 pageTaskEdit.workflowInformationLabel=Informace o žádostech
 pageTaskEdit.displayResultInteractive=Zobrazit výsledek interaktivním způsobem.
 pageTask.intent=Záměr
-pageTask.kind=Typ objektu
+pageTask.kind=Druh
 pageTask.misfire=Selhání akce
 pageTask.name=Název úlohy
 pageTask.notStartAfter=Nespouštět po
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Nepodporovaný stav uživatelského formulář
 pageUsers.accounts=Účty
 pageUsers.dialog.title.confirmDelete=Potvrdit smazání
 pageUsers.menu.delete=Smazat
+pageUsers.menu.merge=Sloučit
 pageUsers.menu.disable=Zakázat
 pageUsers.menu.enable=Povolit
 pageUsers.menu.reconcile=Reconciliovat
@@ -2291,7 +2292,7 @@ ResourceAssociationEditor.label.fetchStrategy=Strategie získávání
 ResourceAssociationEditor.label.inbound=Příchozí mapování
 ResourceAssociationEditor.label.intent=Cílový záměr
 ResourceAssociationEditor.label.intolerantVP=Intolerantní vzor
-ResourceAssociationEditor.label.kind=Cílový typ
+ResourceAssociationEditor.label.kind=Cílový druh
 ResourceAssociationEditor.label.limitations=Limity
 ResourceAssociationEditor.label.matchingRule=Pravidlo párování
 ResourceAssociationEditor.label.new=Vytvořit novou asociaci
@@ -2329,7 +2330,7 @@ ResourceCredentialsEditor.label.passwordPolicyRef=Politika hesel
 ResourceDependencyEditor.label.button.add=Vložit závislost aplikace
 ResourceDependencyEditor.label=Upravit závislosti
 ResourceDependencyEditor.label.intent=Závislost záměru
-ResourceDependencyEditor.label.kind=Závislost typu
+ResourceDependencyEditor.label.kind=Závislostní druh
 ResourceDependencyEditor.label.order=Pořadí
 ResourceDependencyEditor.label.resourceRef=Závislá aplikace
 ResourceDependencyEditor.label.strictness=Přísnost
@@ -2396,7 +2397,7 @@ runReportPopupContent.param.name.campaignName=Název kampaně
 runReportPopupContent.param.name.resource=Aplikace
 runReportPopupContent.param.name.intent=Záměr
 runReportPopupContent.param.name.objectClass=Název objektu
-runReportPopupContent.param.name.kind=Typ
+runReportPopupContent.param.name.kind=Druh
 runReportPopupContent.param.name.situation=Situace
 runReportPopupContent.param.name.activation=Aktivace
 runReportPopupContent.param.name.organization=Organizace
@@ -2457,7 +2458,7 @@ SchemaHandlingStep.label.description=Popis
 SchemaHandlingStep.label.displayName=Zobrazované jméno
 SchemaHandlingStep.label.intent=Záměr
 SchemaHandlingStep.label.iteration=Opakování
-SchemaHandlingStep.label.kind=Typ
+SchemaHandlingStep.label.kind=Druh
 SchemaHandlingStep.label.newObjectType=Nový typ objektu
 SchemaHandlingStep.label.objectClass=Třída objektu
 SchemaHandlingStep.label.objectTypes=Typy objektů
@@ -2515,7 +2516,7 @@ SchemaListPanel.details.description=Popis
 SchemaListPanel.details=Detaily
 SchemaListPanel.details.displayName=Zobrazované jméno
 SchemaListPanel.details.intent=Záměr
-SchemaListPanel.details.kind=Typ
+SchemaListPanel.details.kind=Druh
 SchemaListPanel.details.nativeObjectClass=Nativní třída objektu
 SchemaListPanel.displayName=Zobrazované jméno
 SchemaListPanel.displayOrder=Pořadí
@@ -2607,7 +2608,7 @@ SynchronizationPolicyDecision.DELETE=Smazat
 SynchronizationPolicyDecision.KEEP=Neměnit
 SynchronizationPolicyDecision.UNLINK=Odpojit
 SynchronizationReactionEditor.label.action=Akce
-SynchronizationReactionEditor.label.channel=Zrušit
+SynchronizationReactionEditor.label.channel=Kanál
 SynchronizationReactionEditor.label.description=Popis
 SynchronizationReactionEditor.label.edit=Upravit reakci
 SynchronizationReactionEditor.label.name=Název
@@ -2627,7 +2628,7 @@ SynchronizationStep.label.editSyncObject=Upravit '{0}'
 SynchronizationStep.label.enabled=Povoleno
 SynchronizationStep.label.focus=Vzorový objekt
 SynchronizationStep.label.intent=Záměr
-SynchronizationStep.label.kind=Typ
+SynchronizationStep.label.kind=Druh
 SynchronizationStep.label.name=Název
 SynchronizationStep.label.newObjectType=Nový typ synch. objektu
 SynchronizationStep.label.notSpecified=(název není specifikován)
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Žádost o přiřazení
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Katalog rolí není dosud zkonfigurován v konfiguračnám XML souboru systému.
 MultiButtonPanel.plusIconTitle=Přidat položku do nákupního košíku
 MultiButtonPanel.assignmentDetailsPopupTitle=Podrobnosti přiřazení
+MultiButtonPanel.detailsLink=Podrobnosti
+MultiButtonPanel.addToCartLink=Přidat do košíku
 PageAssignmentDetails.title=Podrobnosti přiřazení
 PageAssignmentDetails.backButton=Zpět
 PageAssignmentDetails.addToCartButton=Přidat do košíku
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=Seznam nových přiřazení
 PageAuditLogViewer.title=Prohlížeč auditního záznamového souboru
 PageAuditLogViewer.menuName=Prohlížeč auditního záznamového souboru
 PageAuditLogViewer.timeLabel=Čas
-PageAuditLogViewer.fromLabel=od
+PageAuditLogViewer.fromLabel=Od
+PageAuditLogViewer.toLabel=Do
+PageAuditLogViewer.initiatorNameLabel=Jméno iniciátora
+PageAuditLogViewer.channelLabel=Kanál
+PageAuditLogViewer.hostIdentifierLabel=Identifikátor hostitele
+PageAuditLogViewer.targetNameLabel=Název cíle
+PageAuditLogViewer.targetTypeLabel=Cílový typ
+PageAuditLogViewer.targetOwnerNameLabel=Jméno vlastníka cíle
+PageAuditLogViewer.eventTypeLabel=Typ události
+PageAuditLogViewer.eventStageLabel=Fáze události
+PageAuditLogViewer.outcomeLabel=Výsledek
 PageAuditLogViewer.column.time=Čas
+PageAuditLogViewer.column.initiatorRef=Iniciátor
+PageAuditLogViewer.column.taskIdentifier=Identifikátor úlohy
+PageAuditLogViewer.column.channel=Kanál
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Podrobnosti auditních záznamů
+PageAuditLogDetails.eventTimestamp=Časová značka
+PageAuditLogDetails.eventIdentifier=Identifikátor události
+PageAuditLogDetails.eventType=Typ události
+PageAuditLogDetails.eventStage=Fáze události
+PageAuditLogDetails.eventInitiatorRef=Iniciátor
+PageAuditLogDetails.eventTargetRef=Odkaz na cíl
+PageAuditLogDetails.eventTargetOwnerRef= Odkaz na vlastníka cíle
+PageAuditLogDetails.eventResult=Výsledek
+PageAuditLogDetails.eventOutcome=Výsledek
+PageAuditLogDetails.sessionIdentifier=Identifikátor sezení
+PageAuditLogDetails.taskIdentifier=Identifikátor úlohy
+PageAuditLogDetails.taskOID=Oid úlohy
+PageAuditLogDetails.hostIdentifier=Identifikátor hostitele
+PageAuditLogDetails.channel=Kanál
+PageAuditLogDetails.parameter=Parametr
+PageAuditLogDetails.message=Zpráva
+PageAuditLogDetails.deltaKey=Seznam delta změn
+ObjectDeltaOperationType.resourceName=Název aplikace
+ObjectDeltaOperationType.objectName=Název objektu
+ObjectDeltaOperationType.executionResult=Výsledek zpracování
+PageMergeObjects.noMergeResultObjectWarning=Objekt náhledu na sloučení nebyl nalezen
+PageMergeObjects.title=Sloučit objekty
+PageMergeObjects.tabTitle=Náhled sloučení
+PageMergeObjects.switchDirectionButton=Změnit směr
+PageMergeObjects.mergeButton=Sloučit
+PageMergeObjects.mergeDeltaPreviewButton=Náhled sloučení delta změn
+PageMergeObjects.backButton=Zpět
+PageMergeObjects.mergeType=Typ sloučení
+MergeType.DEFAULT=výchozí
+MergeType.EXPRESSION=výraz
+MergeType.ALL_RIGHT=vše napravo
+MergeType.ALL_LEFT=vše nalevo
+MergeType.EMPTY=prázdné
+PageMergeObjects.warningMessage=Měly by být uvedeny Oid dvou objektů
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
index 7a6f3dd2aea..a5b99ae7d7e 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Konten
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Löschen
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Sperren
 pageUsers.menu.enable=Freigeben
 pageUsers.menu.reconcile=Reconcile
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
index cf4b5c44ed2..f3e0309d9d1 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -485,7 +485,6 @@ Message.SourceMemory=task in memory (fetched {0})
 Message.SourceRepository=repository (statistics updated on {0})
 message.success=Your Answers Were Updated Successfully
 message.WrongAnswer=Questions Not Answered Correctly
-pageSecurityQuestions.message.noPolicySet=No password policy is set
 ModelOperationStatusPanel.label.focusName=Object\:
 ModelOperationStatusPanel.label.focusType=of type\:
 ModelOperationStatusPanel.label.primaryDelta=Primary delta\:
@@ -2079,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Accounts
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Delete
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Disable
 pageUsers.menu.enable=Enable
 pageUsers.menu.reconcile=Reconcile
@@ -3302,4 +3302,53 @@ PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
 PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
index 5ac4d02ffa7..7c2b4b5d396 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Estado de usuario no soportado '{0}'.
 pageUsers.accounts=Cuentas
 pageUsers.dialog.title.confirmDelete=Confirmar eliminación
 pageUsers.menu.delete=Eliminar
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Deshabilitar
 pageUsers.menu.enable=Habilitar
 pageUsers.menu.reconcile=Reconciliar
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
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 92b459dd3ba..249b8640c84 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
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Accounts
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Delete
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Disable
 pageUsers.menu.enable=Enable
 pageUsers.menu.reconcile=Reconcile
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
index b5fc0f9ff49..54d95125889 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Toetuseta kasutaja vormi olek '{0}'.
 pageUsers.accounts=Kontod
 pageUsers.dialog.title.confirmDelete=Kustutuse kinnitamine
 pageUsers.menu.delete=Kustuta
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Keela
 pageUsers.menu.enable=Luba
 pageUsers.menu.reconcile=Lepita
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Üksikasjad
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3292,11 +3295,60 @@ AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view
 AssignmentViewType.ROLE_TYPE=All roles view
 AssignmentViewType.ORG_TYPE=All organizations view
 AssignmentViewType.SERVICE_TYPE=All services view
-PageAssignmentsList.requestButton = Request
+PageAssignmentsList.requestButton = Taotlus
 operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Request assignment
 PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Kanal
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Kanal
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Ajatempel
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Kanal
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
index 92b459dd3ba..249b8640c84 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Accounts
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Delete
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Disable
 pageUsers.menu.enable=Enable
 pageUsers.menu.reconcile=Reconcile
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
index 042891d9bb0..6f31ecad61b 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Accounts
 pageUsers.dialog.title.confirmDelete=Törlés megerősítése
 pageUsers.menu.delete=Törlés
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Disable
 pageUsers.menu.enable=Enable
 pageUsers.menu.reconcile=Reconcile
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
index 92b459dd3ba..249b8640c84 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Accounts
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Delete
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Disable
 pageUsers.menu.enable=Enable
 pageUsers.menu.reconcile=Reconcile
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
index d690698ecb1..24417db84ee 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Unsupported user form state '{0}'.
 pageUsers.accounts=Accounts
 pageUsers.dialog.title.confirmDelete=Confirm delete
 pageUsers.menu.delete=Delete
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Disable
 pageUsers.menu.enable=Enable
 pageUsers.menu.reconcile=Reconcile
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
index ef822ca739c..1484df19652 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Nepodporovaný stav formulára spoužívateľo
 pageUsers.accounts=Účty
 pageUsers.dialog.title.confirmDelete=Potvrdenie zmazania
 pageUsers.menu.delete=Zmazať
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Zakázať
 pageUsers.menu.enable=Povoliť
 pageUsers.menu.reconcile=Odsúhlasiť
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
index a2eb6e7c706..01462d02802 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
@@ -2078,6 +2078,7 @@ pageUser.message.unsupportedState=Desteklenmeyen kullanıcı durumu '{0}' .
 pageUsers.accounts=Hesaplar
 pageUsers.dialog.title.confirmDelete=Silmeyi onayla
 pageUsers.menu.delete=Sil
+pageUsers.menu.merge=Merge
 pageUsers.menu.disable=Pasifleştir
 pageUsers.menu.enable=Aktifleştir
 pageUsers.menu.reconcile=Hesap eşleme
@@ -3284,6 +3285,8 @@ PageAssignmentShoppingKart.title=Assignment request
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Role catalog is not configured in the system configuration xml
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
+MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.addToCartLink=Add to cart
 PageAssignmentDetails.title=Assignment detail
 PageAssignmentDetails.backButton=Back
 PageAssignmentDetails.addToCartButton=Add to cart
@@ -3298,5 +3301,54 @@ PageAssignmentsList.title=New assignments list
 PageAuditLogViewer.title=Audit Log Viewer
 PageAuditLogViewer.menuName=Audit Log Viewer
 PageAuditLogViewer.timeLabel=Time
-PageAuditLogViewer.fromLabel=from
+PageAuditLogViewer.fromLabel=From
+PageAuditLogViewer.toLabel=To
+PageAuditLogViewer.initiatorNameLabel=Initiator name
+PageAuditLogViewer.channelLabel=Channel
+PageAuditLogViewer.hostIdentifierLabel=Host Identifier
+PageAuditLogViewer.targetNameLabel=Target Name
+PageAuditLogViewer.targetTypeLabel=Target Type
+PageAuditLogViewer.targetOwnerNameLabel=Target Owner Name
+PageAuditLogViewer.eventTypeLabel=Event Type
+PageAuditLogViewer.eventStageLabel=Event Stage
+PageAuditLogViewer.outcomeLabel=Outcome
 PageAuditLogViewer.column.time=Time
+PageAuditLogViewer.column.initiatorRef=Initiator
+PageAuditLogViewer.column.taskIdentifier=Task Identifier
+PageAuditLogViewer.column.channel=Channel
+PageAuditLogViewer.column.delta=Delta
+PageAuditLogDetails.title=Audit Log Details
+PageAuditLogDetails.eventTimestamp=Timestamp
+PageAuditLogDetails.eventIdentifier=Event Identifier
+PageAuditLogDetails.eventType=Event Type
+PageAuditLogDetails.eventStage=Event Stage
+PageAuditLogDetails.eventInitiatorRef=Initiator
+PageAuditLogDetails.eventTargetRef=Target ref.
+PageAuditLogDetails.eventTargetOwnerRef= Target Owner ref.
+PageAuditLogDetails.eventResult=Result
+PageAuditLogDetails.eventOutcome=Outcome
+PageAuditLogDetails.sessionIdentifier=Session Identifier
+PageAuditLogDetails.taskIdentifier=Task Identifier
+PageAuditLogDetails.taskOID=Task oid
+PageAuditLogDetails.hostIdentifier=Host Indentifier
+PageAuditLogDetails.channel=Channel
+PageAuditLogDetails.parameter=Parameter
+PageAuditLogDetails.message=Message
+PageAuditLogDetails.deltaKey=Delta List
+ObjectDeltaOperationType.resourceName=Resource name
+ObjectDeltaOperationType.objectName=Object name
+ObjectDeltaOperationType.executionResult=Execution result
+PageMergeObjects.noMergeResultObjectWarning=Merge preview object wasn't found
+PageMergeObjects.title=Merge objects
+PageMergeObjects.tabTitle=Merge preview
+PageMergeObjects.switchDirectionButton=Switch direction
+PageMergeObjects.mergeButton=Merge
+PageMergeObjects.mergeDeltaPreviewButton=Merge delta preview
+PageMergeObjects.backButton=Back
+PageMergeObjects.mergeType=Merge type
+MergeType.DEFAULT=default
+MergeType.EXPRESSION=expression
+MergeType.ALL_RIGHT=allRight
+MergeType.ALL_LEFT=allLeft
+MergeType.EMPTY=empty
+PageMergeObjects.warningMessage=Two objects' oids should be specified