From 92299be04683730e5ec62c444b9cb742cab74154 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Thu, 28 May 2026 01:09:05 +0400
Subject: [PATCH 01/27] Utilize real default password settings

---
 src/adldap/ad_defines.h                       | 11 ++++++
 .../pso_results_widget/pso_edit_widget.cpp    | 39 ++++++++++++-------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/adldap/ad_defines.h b/src/adldap/ad_defines.h
index 825b6209e..d68e59bfa 100644
--- a/src/adldap/ad_defines.h
+++ b/src/adldap/ad_defines.h
@@ -149,6 +149,10 @@ enum SystemFlagsBit {
 #define ATTRIBUTE_MAX_PWD_AGE "maxPwdAge"
 #define ATTRIBUTE_MIN_PWD_AGE "minPwdAge"
 #define ATTRIBUTE_LOCKOUT_DURATION "lockoutDuration"
+#define ATTRIBUTE_PWD_PROPERTIES "pwdProperties"
+#define ATTRIBUTE_PWD_HISTORY_LENGTH "pwdHistoryLength"
+#define ATTRIBUTE_MIN_PWD_LENGTH "minPwdLength"
+#define ATTRIBUTE_LOCKOUT_THRESHOLD "lockoutThreshold"
 #define ATTRIBUTE_IS_CRITICAL_SYSTEM_OBJECT "isCriticalSystemObject"
 #define ATTRIBUTE_GPC_FILE_SYS_PATH "gPCFileSysPath"
 #define ATTRIBUTE_GPC_FUNCTIONALITY_VERSION "gpCFunctionalityVersion"
@@ -407,6 +411,13 @@ const long long MILLIS_TO_100_NANOS = 10000LL;
 #define ETYPES_AES128_CTS_HMAC_SHA1_96 0x00000008
 #define ETYPES_AES256_CTS_HMAC_SHA1_96 0x00000010
 
+#define SAM_MASK_DOMAIN_PASSWORD_COMPLEX 1
+#define SAM_MASK_DOMAIN_PASSWORD_NO_ANON_CHANGE 2
+#define SAM_MASK_DOMAIN_PASSWORD_NO_CLEAR_CHANGE 4
+#define SAM_MASK_DOMAIN_LOCKOUT_ADMINS 8
+#define SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT 16
+#define SAM_MASK_DOMAIN_REFUSE_PASSWORD_CHANGE 32
+
 enum SearchScope {
     SearchScope_Object,
     SearchScope_Children,
diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index cc9acb73b..fa8ccf64a 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "pso_edit_widget.h"
+#include "ad_defines.h"
 #include "ui_pso_edit_widget.h"
 #include "ad_interface.h"
 #include "ad_object.h"
@@ -26,6 +27,7 @@
 #include "managers/icon_manager.h"
 #include "status.h"
 #include "globals.h"
+#include "ad_config.h"
 
 #include <chrono>
 
@@ -189,19 +191,30 @@ bool PSOEditWidget::settings_are_default() {
 }
 
 void PSOEditWidget::update_defaults() {
-    // TODO: Get defaults from Default Domain Policy.
-
-    ui->min_passwd_len_spinbox->setValue(7);
-    ui->history_length_spinbox->setValue(24);
-    ui->logon_attempts_spinbox->setValue(0);
-
-    ui->lockout_duration_spinbox->setValue(30);
-    ui->reset_lockout_spinbox->setValue(30);
-    ui->min_age_spinbox->setValue(1);
-    ui->max_age_spinbox->setValue(42);
-
-    ui->complexity_req_checkbox->setChecked(true);
-    ui->store_passwd_checkbox->setChecked(false);
+    AdInterface ad;
+    if (!ad.is_connected()) {
+        return;
+    }
+    AdObject result = ad.search_object(g_adconfig->domain_dn(), {ATTRIBUTE_PWD_PROPERTIES,
+                                                                    ATTRIBUTE_PWD_HISTORY_LENGTH,
+                                                                    ATTRIBUTE_MIN_PWD_LENGTH,
+                                                                    ATTRIBUTE_MIN_PWD_AGE,
+                                                                    ATTRIBUTE_MAX_PWD_AGE,
+                                                                    ATTRIBUTE_LOCKOUT_DURATION,
+                                                                    ATTRIBUTE_LOCKOUT_THRESHOLD,
+                                                                    ATTRIBUTE_LOCKOUT_OBSERVATION_WINDOW});
+
+    ui->min_passwd_len_spinbox->setValue(result.get_int(ATTRIBUTE_MIN_PWD_LENGTH));
+    ui->history_length_spinbox->setValue(result.get_int(ATTRIBUTE_PWD_HISTORY_LENGTH));
+    ui->logon_attempts_spinbox->setValue(result.get_int(ATTRIBUTE_LOCKOUT_THRESHOLD));
+
+    ui->lockout_duration_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_LOCKOUT_DURATION));
+    ui->reset_lockout_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_LOCKOUT_OBSERVATION_WINDOW));
+    ui->min_age_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_MIN_PWD_AGE));
+    ui->max_age_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_MAX_PWD_AGE));
+
+    ui->complexity_req_checkbox->setChecked(result.get_int(ATTRIBUTE_PWD_PROPERTIES) & SAM_MASK_DOMAIN_PASSWORD_COMPLEX);
+    ui->store_passwd_checkbox->setChecked(result.get_int(ATTRIBUTE_PWD_PROPERTIES) & SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT);
 
     ui->applied_list_widget->clear();
 }

From 0d34b9d8c691b37d7ba705d73ae3795049e648ed Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Thu, 11 Jun 2026 16:28:08 +0400
Subject: [PATCH 02/27] Put default password settings in PSO containet widget

---
 src/admc/CMakeLists.txt                       |   1 +
 src/admc/console_impls/item_type.h            |   1 +
 .../object_impl/console_object_operations.cpp |  10 +-
 .../console_impls/password_settings_impl.cpp  | 130 ++++++++++++++++++
 .../console_impls/password_settings_impl.h    |  57 ++++++++
 src/admc/main_window.cpp                      |   4 +
 6 files changed, 201 insertions(+), 2 deletions(-)
 create mode 100644 src/admc/console_impls/password_settings_impl.cpp
 create mode 100644 src/admc/console_impls/password_settings_impl.h

diff --git a/src/admc/CMakeLists.txt b/src/admc/CMakeLists.txt
index b1e0c9197..a644cdbda 100644
--- a/src/admc/CMakeLists.txt
+++ b/src/admc/CMakeLists.txt
@@ -254,6 +254,7 @@ set(ADMC_SOURCES
     console_impls/policy_ou_impl.cpp
     console_impls/found_policy_impl.cpp
     console_impls/domain_info_impl.cpp
+    console_impls/password_settings_impl.cpp
 
     permission_control_widgets/permissions_widget.cpp
     permission_control_widgets/creation_deletion_permissions_widget.cpp
diff --git a/src/admc/console_impls/item_type.h b/src/admc/console_impls/item_type.h
index 71181d43f..17bcfdbb6 100644
--- a/src/admc/console_impls/item_type.h
+++ b/src/admc/console_impls/item_type.h
@@ -34,6 +34,7 @@ enum ItemType {
     ItemType_FindPolicy,
     ItemType_FoundPolicy,
     ItemType_DomainInfo,
+    ItemType_PasswordSettings,
 
     ItemType_LAST,
 };
diff --git a/src/admc/console_impls/object_impl/console_object_operations.cpp b/src/admc/console_impls/object_impl/console_object_operations.cpp
index 3e25314d9..a5b616d92 100644
--- a/src/admc/console_impls/object_impl/console_object_operations.cpp
+++ b/src/admc/console_impls/object_impl/console_object_operations.cpp
@@ -613,6 +613,11 @@ bool ConsoleObjectTreeOperations::console_object_deletion_dialog(ConsoleWidget *
 }
 
 void ConsoleObjectTreeOperations::console_tree_add_password_settings(ConsoleWidget *console, AdInterface &ad) {
+    const QList<QStandardItem *> head_row = console->add_scope_item(ItemType_PasswordSettings, console->domain_info_index());
+    auto password_settings_root = head_row[0];
+    password_settings_root->setText(QCoreApplication::translate("password_settings_impl", "Password settings"));
+    password_settings_root->setIcon(g_icon_manager->item_icon(ItemIcon_Password_Settings_Object));
+    password_settings_root->setDragEnabled(false);
     const QString filter = filter_CONDITION(Condition_Equals, ATTRIBUTE_OBJECT_CLASS, CLASS_PSO_CONTAINER);
     auto search_results = ad.search(g_adconfig->domain_dn(), SearchScope_All, filter, {});
     const QString err = QObject::tr("Password settings container is not available");
@@ -621,9 +626,10 @@ void ConsoleObjectTreeOperations::console_tree_add_password_settings(ConsoleWidg
         return;
     }
 
+    console_object_item_data_load(password_settings_root, search_results.values()[0]);
+
     const int pso_container_sort_idx = 3;
-    console_tree_add_root_child(console, search_results.values()[0], pso_container_sort_idx,
-                                QObject::tr("Fine-grained password policies"));
+    console->set_item_sort_index(password_settings_root->index(), pso_container_sort_idx);
 }
 
 QString ConsoleObjectTreeOperations::console_object_count_string(ConsoleWidget *console, const QModelIndex &index) {
diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
new file mode 100644
index 000000000..34041956e
--- /dev/null
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -0,0 +1,130 @@
+/*
+ * ADMC - AD Management Center
+ *
+ * Copyright (C) 2020-2026 BaseALT Ltd.
+ * Copyright (C) 2026 Yuri Kozyrev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "console_impls/password_settings_impl.h"
+
+#include "ad_defines.h"
+#include "adldap.h"
+#include "console_impls/item_type.h"
+#include "console_impls/object_impl/object_impl.h"
+#include "console_impls/policy_impl.h"
+#include "console_widget/results_view.h"
+#include "create_dialogs/create_policy_dialog.h"
+#include "fsmo/fsmo_utils.h"
+#include "globals.h"
+#include "object_impl/console_object_operations.h"
+#include "results_widgets/pso_results_widget/pso_results_widget.h"
+#include "status.h"
+#include "utils.h"
+
+#include <QAction>
+#include <QList>
+#include <QMessageBox>
+#include <QStandardItem>
+
+PasswordSettingsImpl::PasswordSettingsImpl(ConsoleWidget *console_arg)
+: ConsoleImpl(console_arg) {
+    set_results_widget(new PSOResultsWidget(console_arg));
+
+    create_pso_action = new QAction(tr("Create password settings object"), this);
+
+    connect(
+        create_pso_action, &QAction::triggered,
+        this, [this]() {
+            const QString parent_dn = get_selected_target_dn(console, ItemType_PasswordSettings, ObjectRole_DN);
+            ConsoleObjectTreeOperations::console_object_create({console}, CLASS_PSO, parent_dn);
+        });
+}
+
+void PasswordSettingsImpl::fetch(const QModelIndex &index) {
+    AdInterface ad;
+    if (ad_failed(ad, console)) {
+        return;
+    }
+
+    const QString base = g_adconfig->pso_container_dn();
+    const SearchScope scope = SearchScope_Children;
+    const QString filter = filter_CONDITION(Condition_Equals, ATTRIBUTE_OBJECT_CLASS, CLASS_PSO_CONTAINER);
+    const QList<QString> attributes = QList<QString>();
+    const QHash<QString, AdObject> results = ad.search(base, scope, "", attributes);
+
+    ConsoleObjectTreeOperations::add_objects_to_console(console, results.values(), index);
+}
+
+void PasswordSettingsImpl::refresh(const QList<QModelIndex> &index_list) {
+    const QModelIndex index = index_list[0];
+
+    console->delete_children(index);
+    fetch(index);
+}
+
+QList<QAction *> PasswordSettingsImpl::get_all_custom_actions() const {
+    QList<QAction *> out;
+
+    out.append(create_pso_action);
+
+    return out;
+}
+
+QSet<QAction *> PasswordSettingsImpl::get_custom_actions(const QModelIndex &index, const bool single_selection) const {
+    UNUSED_ARG(index);
+    UNUSED_ARG(single_selection);
+
+    QSet<QAction *> out;
+
+    out.insert(create_pso_action);
+
+    return out;
+}
+
+QSet<StandardAction> PasswordSettingsImpl::get_standard_actions(const QModelIndex &index, const bool single_selection) const {
+    UNUSED_ARG(index);
+    UNUSED_ARG(single_selection);
+
+    QSet<StandardAction> out;
+
+    out.insert(StandardAction_Refresh);
+
+    return out;
+}
+
+void password_settings_impl_add_objects(ConsoleWidget *console, const QList<AdObject> &object_list, const QModelIndex &parent) {
+    if (!parent.isValid()) {
+        return;
+    }
+
+    const bool parent_was_fetched = console_item_get_was_fetched(parent);
+    if (!parent_was_fetched) {
+        return;
+    }
+
+    for (const AdObject &object : object_list) {
+        const QList<QStandardItem *> row = console->add_scope_item(ItemType_Object, parent);
+        ConsoleObjectTreeOperations::console_object_load(row, object);
+    }
+}
+
+QList<QString> PasswordSettingsImpl::column_labels() const {
+    return ConsoleObjectTreeOperations::object_impl_column_labels();
+}
+
+QList<int> PasswordSettingsImpl::default_columns() const {
+    return ConsoleObjectTreeOperations::object_impl_default_columns();
+}
diff --git a/src/admc/console_impls/password_settings_impl.h b/src/admc/console_impls/password_settings_impl.h
new file mode 100644
index 000000000..cd8beb7f9
--- /dev/null
+++ b/src/admc/console_impls/password_settings_impl.h
@@ -0,0 +1,57 @@
+/*
+ * ADMC - AD Management Center
+ *
+ * Copyright (C) 2020-2026 BaseALT Ltd.
+ * Copyright (C) 2026 Yuri Kozyrev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PASSWORD_SETTINGS_IMPL_H
+#define PASSWORD_SETTINGS_IMPL_H
+
+#include "console_widget/console_impl.h"
+#include "console_widget/console_widget.h"
+
+class AdObject;
+class AdInterface;
+
+/**
+ * @class
+ * @brief Impl for Password Settings Container. Displays global password 
+ * settings for the domain they are applied whenever no PSO can't be used.
+ */
+class PasswordSettingsImpl final : public ConsoleImpl {
+    Q_OBJECT
+
+public:
+    PasswordSettingsImpl(ConsoleWidget *console_arg);
+
+    void fetch(const QModelIndex &index) override;
+    void refresh(const QList<QModelIndex> &index_list) override;
+
+    QList<QAction *> get_all_custom_actions() const override;
+    QSet<QAction *> get_custom_actions(const QModelIndex &index, const bool single_selection) const override;
+    QSet<StandardAction> get_standard_actions(const QModelIndex &index, const bool single_selection) const override;
+
+    QList<QString> column_labels() const override;
+    QList<int> default_columns() const override;
+
+private:
+    QAction *create_pso_action;
+};
+
+void password_settings_impl_add_objects(ConsoleWidget *console, const QList<AdObject> &object_list, const QModelIndex &parent);
+
+#endif /* PASSWORD_SETTINGS_IMPL_H */
diff --git a/src/admc/main_window.cpp b/src/admc/main_window.cpp
index 63f39384c..4c62be0ec 100644
--- a/src/admc/main_window.cpp
+++ b/src/admc/main_window.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "main_window.h"
+#include "console_impls/password_settings_impl.h"
 #include "ui_main_window.h"
 
 #include "about_dialog.h"
@@ -483,6 +484,9 @@ void MainWindow::init_on_connect(AdInterface &ad) {
     auto policy_impl = new PolicyImpl(ui->console);
     ui->console->register_impl(ItemType_Policy, policy_impl);
 
+    auto pso_impl = new PasswordSettingsImpl(ui->console);
+    ui->console->register_impl(ItemType_PasswordSettings, pso_impl);
+
     auto query_item_impl = new QueryItemImpl(ui->console);
     ui->console->register_impl(ItemType_QueryItem, query_item_impl);
 

From d5811944181b039874695a23c515f30b15bab8d9 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Fri, 12 Jun 2026 03:52:30 +0400
Subject: [PATCH 03/27] Remove some unneeded vars

---
 .../console_impls/object_impl/console_object_operations.cpp    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/admc/console_impls/object_impl/console_object_operations.cpp b/src/admc/console_impls/object_impl/console_object_operations.cpp
index a5b616d92..ffa688324 100644
--- a/src/admc/console_impls/object_impl/console_object_operations.cpp
+++ b/src/admc/console_impls/object_impl/console_object_operations.cpp
@@ -613,8 +613,7 @@ bool ConsoleObjectTreeOperations::console_object_deletion_dialog(ConsoleWidget *
 }
 
 void ConsoleObjectTreeOperations::console_tree_add_password_settings(ConsoleWidget *console, AdInterface &ad) {
-    const QList<QStandardItem *> head_row = console->add_scope_item(ItemType_PasswordSettings, console->domain_info_index());
-    auto password_settings_root = head_row[0];
+    QStandardItem *password_settings_root = console->add_scope_item(ItemType_PasswordSettings, console->domain_info_index())[0];
     password_settings_root->setText(QCoreApplication::translate("password_settings_impl", "Password settings"));
     password_settings_root->setIcon(g_icon_manager->item_icon(ItemIcon_Password_Settings_Object));
     password_settings_root->setDragEnabled(false);

From 3e22954e4e8d970ad34dc96df7067de53cf9a601 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Fri, 12 Jun 2026 05:36:48 +0400
Subject: [PATCH 04/27] Make default PSO readonly

---
 .../results_widgets/pso_results_widget/pso_edit_widget.cpp   | 2 ++
 .../pso_results_widget/pso_results_widget.cpp                | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index fa8ccf64a..00ce5e1ba 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -217,6 +217,8 @@ void PSOEditWidget::update_defaults() {
     ui->store_passwd_checkbox->setChecked(result.get_int(ATTRIBUTE_PWD_PROPERTIES) & SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT);
 
     ui->applied_list_widget->clear();
+
+    ui->name_edit->setReadOnly(true);
 }
 
 void PSOEditWidget::on_add() {
diff --git a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
index e948d823c..85460b5c8 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
@@ -32,6 +32,11 @@ PSOResultsWidget::PSOResultsWidget(QWidget *parent) :
     ResultsWidgetBase(parent), pso_edit_widget(new PSOEditWidget(this)) {
 
     ui->verticalLayout->addWidget(pso_edit_widget);
+
+    ui->edit_button->setDisabled(true);
+    ui->cancel_button->setDisabled(true);
+    ui->apply_button->setDisabled(true);
+    pso_edit_widget->set_read_only(true);
 }
 
 void PSOResultsWidget::update(const QModelIndex &index) {

From cbb09dbae3d61e848e4e98b6d72cb6024fa3b8c6 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Fri, 12 Jun 2026 05:37:10 +0400
Subject: [PATCH 05/27] Remove comented out code

---
 src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp | 2 --
 .../results_widgets/pso_results_widget/pso_results_widget.cpp   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index 00ce5e1ba..c472ab09e 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -31,8 +31,6 @@
 
 #include <chrono>
 
-// #include <QDebug>
-
 PSOEditWidget::PSOEditWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::PSOEditWidget) {
diff --git a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
index 85460b5c8..a529ee9a1 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp
@@ -25,8 +25,6 @@
 #include "../ui_results_widget_base.h"
 
 #include <QModelIndex>
-// #include <QDebug>
-
 
 PSOResultsWidget::PSOResultsWidget(QWidget *parent) :
     ResultsWidgetBase(parent), pso_edit_widget(new PSOEditWidget(this)) {

From 4c2bece11233569ede1394a1997f224a718592c2 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 17 Jun 2026 19:07:04 +0400
Subject: [PATCH 06/27] Remove unused function

---
 .../console_impls/password_settings_impl.cpp     | 16 ----------------
 src/admc/console_impls/password_settings_impl.h  |  2 --
 2 files changed, 18 deletions(-)

diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
index 34041956e..8ecdef1fd 100644
--- a/src/admc/console_impls/password_settings_impl.cpp
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -105,22 +105,6 @@ QSet<StandardAction> PasswordSettingsImpl::get_standard_actions(const QModelInde
     return out;
 }
 
-void password_settings_impl_add_objects(ConsoleWidget *console, const QList<AdObject> &object_list, const QModelIndex &parent) {
-    if (!parent.isValid()) {
-        return;
-    }
-
-    const bool parent_was_fetched = console_item_get_was_fetched(parent);
-    if (!parent_was_fetched) {
-        return;
-    }
-
-    for (const AdObject &object : object_list) {
-        const QList<QStandardItem *> row = console->add_scope_item(ItemType_Object, parent);
-        ConsoleObjectTreeOperations::console_object_load(row, object);
-    }
-}
-
 QList<QString> PasswordSettingsImpl::column_labels() const {
     return ConsoleObjectTreeOperations::object_impl_column_labels();
 }
diff --git a/src/admc/console_impls/password_settings_impl.h b/src/admc/console_impls/password_settings_impl.h
index cd8beb7f9..192a3101a 100644
--- a/src/admc/console_impls/password_settings_impl.h
+++ b/src/admc/console_impls/password_settings_impl.h
@@ -52,6 +52,4 @@ class PasswordSettingsImpl final : public ConsoleImpl {
     QAction *create_pso_action;
 };
 
-void password_settings_impl_add_objects(ConsoleWidget *console, const QList<AdObject> &object_list, const QModelIndex &parent);
-
 #endif /* PASSWORD_SETTINGS_IMPL_H */

From a56750e1a4785d8cb3e869dbb7a20c5149221755 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 24 Jun 2026 18:06:12 +0400
Subject: [PATCH 07/27] Move global password settings retrieval to utils

---
 src/admc/utils.cpp | 15 +++++++++++++++
 src/admc/utils.h   |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/src/admc/utils.cpp b/src/admc/utils.cpp
index 5b20b65b0..e38f4b152 100755
--- a/src/admc/utils.cpp
+++ b/src/admc/utils.cpp
@@ -495,3 +495,18 @@ bool creds_is_saved(const QString &username) {
             remembered_users.toStringList().contains(username);
     return saved;
 }
+
+AdObject global_password_settings() {
+    AdInterface ad;
+    if (!ad.is_connected()) {
+        return AdObject();
+    }
+    return ad.search_object(g_adconfig->domain_dn(), {ATTRIBUTE_PWD_PROPERTIES,
+                                                         ATTRIBUTE_PWD_HISTORY_LENGTH,
+                                                         ATTRIBUTE_MIN_PWD_LENGTH,
+                                                         ATTRIBUTE_MIN_PWD_AGE,
+                                                         ATTRIBUTE_MAX_PWD_AGE,
+                                                         ATTRIBUTE_LOCKOUT_DURATION,
+                                                         ATTRIBUTE_LOCKOUT_THRESHOLD,
+                                                         ATTRIBUTE_LOCKOUT_OBSERVATION_WINDOW});
+}
diff --git a/src/admc/utils.h b/src/admc/utils.h
index db346ef55..88695a50e 100755
--- a/src/admc/utils.h
+++ b/src/admc/utils.h
@@ -139,4 +139,6 @@ QString current_dc_dns_host_name(AdInterface &ad);
 
 bool creds_is_saved(const QString &username);
 
+AdObject global_password_settings();
+
 #endif /* UTILS_H */

From 6acdda3b9a3d5662fad4436f4537eef306fd6bff Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 24 Jun 2026 18:11:39 +0400
Subject: [PATCH 08/27] Rework PSOEditWidget update and get_settings to work
 with global password settings

---
 .../pso_results_widget/pso_edit_widget.cpp    | 78 ++++++++++++-------
 .../pso_results_widget/pso_edit_widget.h      | 14 +++-
 2 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index c472ab09e..54f897adf 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -28,6 +28,7 @@
 #include "status.h"
 #include "globals.h"
 #include "ad_config.h"
+#include "utils.h"
 
 #include <chrono>
 
@@ -46,7 +47,6 @@ PSOEditWidget::PSOEditWidget(QWidget *parent) :
     connect(ui->remove_button, &QPushButton::clicked, this, &PSOEditWidget::on_remove);
 
     update_defaults();
-    default_setting_values = pso_settings_values();
 }
 
 PSOEditWidget::~PSOEditWidget() {
@@ -54,18 +54,28 @@ PSOEditWidget::~PSOEditWidget() {
 }
 
 void PSOEditWidget::update(const AdObject &passwd_settings_obj) {
-    ui->name_edit->setText(passwd_settings_obj.get_string(ATTRIBUTE_CN));
+    if (is_global != !passwd_settings_obj.contains(ATTRIBUTE_CN)) {
+        is_global = !passwd_settings_obj.contains(ATTRIBUTE_CN);
+        ui->name_edit->setVisible(!is_global);
+        ui->name_label->setVisible(!is_global);
+        ui->precedence_label->setVisible(!is_global);
+        ui->precedence_spinbox->setVisible(!is_global);
+        ui->groupBox->setVisible(!is_global);
+        ui->line->setVisible(!is_global);
+    }
+
+    ui->name_edit->setText(passwd_settings_obj.get_string(replace_attribute(ATTRIBUTE_CN)));
     ui->name_edit->setReadOnly(true);
 
-    ui->precedence_spinbox->setValue(passwd_settings_obj.get_int(ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE));
-    ui->min_passwd_len_spinbox->setValue(passwd_settings_obj.get_int(ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH));
-    ui->history_length_spinbox->setValue(passwd_settings_obj.get_int(ATTRIBUTE_MS_DS_PASSWORD_HISTORY_LENGTH));
-    ui->logon_attempts_spinbox->setValue(passwd_settings_obj.get_int(ATTRIBUTE_MS_DS_LOCKOUT_THRESHOLD));
+    ui->precedence_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE)));
+    ui->min_passwd_len_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH)));
+    ui->history_length_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_HISTORY_LENGTH)));
+    ui->logon_attempts_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_THRESHOLD)));
 
-    ui->lockout_duration_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, ATTRIBUTE_MS_DS_LOCKOUT_DURATION));
-    ui->reset_lockout_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW));
-    ui->min_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE));
-    ui->max_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE));
+    ui->lockout_duration_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_DURATION)));
+    ui->reset_lockout_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW)));
+    ui->min_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE)));
+    ui->max_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE)));
 
     ui->complexity_req_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED));
     ui->store_passwd_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_REVERSIBLE_ENCRYPTION_ENABLED));
@@ -100,30 +110,33 @@ QHash<QString, QList<QByteArray>> PSOEditWidget::pso_settings_values() {
 
     QHash<QString, QList<QByteArray>> settings;
 
-    settings[ATTRIBUTE_CN] = {ui->name_edit->text().trimmed().toUtf8()};
+    settings[replace_attribute(ATTRIBUTE_CN)] = {ui->name_edit->text().trimmed().toUtf8()};
 
-    settings[ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE] = {QByteArray::number(ui->precedence_spinbox->value())};
-    settings[ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH] = {QByteArray::number(ui->min_passwd_len_spinbox->value())};
-    settings[ATTRIBUTE_MS_DS_PASSWORD_HISTORY_LENGTH] = {QByteArray::number(ui->history_length_spinbox->value())};
-    settings[ATTRIBUTE_MS_DS_LOCKOUT_THRESHOLD] = {QByteArray::number(ui->logon_attempts_spinbox->value())};
+    settings[replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE)] = {QByteArray::number(ui->precedence_spinbox->value())};
+    settings[replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH)] = {QByteArray::number(ui->min_passwd_len_spinbox->value())};
+    settings[replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_HISTORY_LENGTH)] = {QByteArray::number(ui->history_length_spinbox->value())};
+    settings[replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_THRESHOLD)] = {QByteArray::number(ui->logon_attempts_spinbox->value())};
 
-    settings[ATTRIBUTE_MS_DS_LOCKOUT_DURATION] = {
+    settings[replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_DURATION)] = {
         QByteArray::number(-duration_cast<milliseconds>(
-        minutes(ui->lockout_duration_spinbox->value())).count() * MILLIS_TO_100_NANOS)
-    };
-    settings[ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW] = {
+                               minutes(ui->lockout_duration_spinbox->value()))
+                               .count() *
+                           MILLIS_TO_100_NANOS)};
+    settings[replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW)] = {
         QByteArray::number(-duration_cast<milliseconds>(
         minutes(ui->reset_lockout_spinbox->value())).count() * MILLIS_TO_100_NANOS)
     };
 
-    settings[ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE] = {
+    settings[replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE)] = {
         QByteArray::number(-duration_cast<milliseconds>(
-        hours(24 * ui->min_age_spinbox->value())).count() * MILLIS_TO_100_NANOS)
-    };
-    settings[ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE] = {
+                               hours(24 * ui->min_age_spinbox->value()))
+                               .count() *
+                           MILLIS_TO_100_NANOS)};
+    settings[replace_attribute(ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE)] = {
         QByteArray::number(-duration_cast<milliseconds>(
-        hours(24 * ui->max_age_spinbox->value())).count() * MILLIS_TO_100_NANOS)
-    };
+                               hours(24 * ui->max_age_spinbox->value()))
+                               .count() *
+                           MILLIS_TO_100_NANOS)};
 
     settings[ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED] = {
         QString(ui->complexity_req_checkbox->isChecked() ? LDAP_BOOL_TRUE :
@@ -173,14 +186,14 @@ bool PSOEditWidget::settings_are_default() {
     const QStringList excluded_attrs = {
         ATTRIBUTE_CN,
         ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE,
-        ATTRIBUTE_APPLIES_TO
-    };
-    for (const QString &attr : default_setting_values.keys()) {
+        ATTRIBUTE_APPLIES_TO};
+    auto defaults = global_password_settings().get_attributes_data();
+    for (const QString &attr : defaults.keys()) {
         if (excluded_attrs.contains(attr)) {
             continue;
         }
 
-        if (default_setting_values[attr] != current_values[attr]) {
+        if (defaults[pso_attributes_to_global_attributes[attr]] != current_values[attr]) {
             return false;
         }
     }
@@ -277,3 +290,10 @@ int PSOEditWidget::spinbox_timespan_units(const AdObject &obj, const QString &at
 
     return 0;
 }
+
+QString PSOEditWidget::replace_attribute(QString attribute_name) {
+    return is_global ? (pso_attributes_to_global_attributes.contains(attribute_name) ?
+                                pso_attributes_to_global_attributes[attribute_name] :
+                                QString()) :
+                        attribute_name;
+};
diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
index f9fbb962a..7331d9bde 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
@@ -22,6 +22,8 @@
 
 #include <QWidget>
 
+#include "ad_defines.h"
+
 namespace Ui {
 class PSOEditWidget;
 }
@@ -60,11 +62,21 @@ class PSOEditWidget final : public QWidget {
 private:
     Ui::PSOEditWidget *ui;
     QStringList dn_applied_list;
-    QHash<QString, QList<QByteArray>> default_setting_values;
+    bool is_global;
+    QHash<QString, QString> pso_attributes_to_global_attributes = {
+        {ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH, ATTRIBUTE_MIN_PWD_LENGTH},
+        {ATTRIBUTE_MS_DS_PASSWORD_HISTORY_LENGTH, ATTRIBUTE_PWD_HISTORY_LENGTH},
+        {ATTRIBUTE_MS_DS_LOCKOUT_THRESHOLD, ATTRIBUTE_LOCKOUT_THRESHOLD},
+        {ATTRIBUTE_MS_DS_LOCKOUT_DURATION, ATTRIBUTE_LOCKOUT_DURATION},
+        {ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW, ATTRIBUTE_LOCKOUT_OBSERVATION_WINDOW},
+        {ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE, ATTRIBUTE_MIN_PWD_AGE},
+        {ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE, ATTRIBUTE_MAX_PWD_AGE}};
 
     void on_add();
     void on_remove();
 
+    QString replace_attribute(QString attribute_name);
+
     /*!
      * Returns appropriate timespan unit value depending on given attribute.
      * It is used to fill password timespan setting checkboxes.

From 6ec0aca090d11b413941b45207cfe215f96e0e55 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 24 Jun 2026 18:16:30 +0400
Subject: [PATCH 09/27] Utilize new pso update logic

---
 src/admc/console_impls/password_settings_impl.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
index 8ecdef1fd..01acff9d1 100644
--- a/src/admc/console_impls/password_settings_impl.cpp
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -41,7 +41,9 @@
 
 PasswordSettingsImpl::PasswordSettingsImpl(ConsoleWidget *console_arg)
 : ConsoleImpl(console_arg) {
-    set_results_widget(new PSOResultsWidget(console_arg));
+    auto result_widget(new PSOResultsWidget(console_arg));
+    result_widget->update(global_password_settings());
+    set_results_widget(result_widget);
 
     create_pso_action = new QAction(tr("Create password settings object"), this);
 

From 7febcec2eea4ab2c9f1de950a06248ab8a23b7a5 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 24 Jun 2026 18:37:07 +0400
Subject: [PATCH 10/27] Refactor update defaults in PSOEditWidget

---
 .../pso_results_widget/pso_edit_widget.cpp      | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index 54f897adf..ca84ecb41 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -202,18 +202,7 @@ bool PSOEditWidget::settings_are_default() {
 }
 
 void PSOEditWidget::update_defaults() {
-    AdInterface ad;
-    if (!ad.is_connected()) {
-        return;
-    }
-    AdObject result = ad.search_object(g_adconfig->domain_dn(), {ATTRIBUTE_PWD_PROPERTIES,
-                                                                    ATTRIBUTE_PWD_HISTORY_LENGTH,
-                                                                    ATTRIBUTE_MIN_PWD_LENGTH,
-                                                                    ATTRIBUTE_MIN_PWD_AGE,
-                                                                    ATTRIBUTE_MAX_PWD_AGE,
-                                                                    ATTRIBUTE_LOCKOUT_DURATION,
-                                                                    ATTRIBUTE_LOCKOUT_THRESHOLD,
-                                                                    ATTRIBUTE_LOCKOUT_OBSERVATION_WINDOW});
+    const AdObject &result = global_password_settings();
 
     ui->min_passwd_len_spinbox->setValue(result.get_int(ATTRIBUTE_MIN_PWD_LENGTH));
     ui->history_length_spinbox->setValue(result.get_int(ATTRIBUTE_PWD_HISTORY_LENGTH));
@@ -226,10 +215,6 @@ void PSOEditWidget::update_defaults() {
 
     ui->complexity_req_checkbox->setChecked(result.get_int(ATTRIBUTE_PWD_PROPERTIES) & SAM_MASK_DOMAIN_PASSWORD_COMPLEX);
     ui->store_passwd_checkbox->setChecked(result.get_int(ATTRIBUTE_PWD_PROPERTIES) & SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT);
-
-    ui->applied_list_widget->clear();
-
-    ui->name_edit->setReadOnly(true);
 }
 
 void PSOEditWidget::on_add() {

From de92cf0a1878ed8e719c3fa15da7a8e1b0fa0b8e Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 24 Jun 2026 23:33:23 +0400
Subject: [PATCH 11/27] Add boolean attributes support in global password
 settings

---
 .../pso_results_widget/pso_edit_widget.cpp    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index ca84ecb41..8bdeb01dc 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -77,8 +77,14 @@ void PSOEditWidget::update(const AdObject &passwd_settings_obj) {
     ui->min_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE)));
     ui->max_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE)));
 
-    ui->complexity_req_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED));
-    ui->store_passwd_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_REVERSIBLE_ENCRYPTION_ENABLED));
+    if (is_global) {
+        int pwd_properties = passwd_settings_obj.get_int(ATTRIBUTE_PWD_PROPERTIES);
+        ui->complexity_req_checkbox->setChecked(pwd_properties & SAM_MASK_DOMAIN_PASSWORD_COMPLEX);
+        ui->store_passwd_checkbox->setChecked(pwd_properties & SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT);
+    } else {
+        ui->complexity_req_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED));
+        ui->store_passwd_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_REVERSIBLE_ENCRYPTION_ENABLED));
+    }
 
     ui->applied_list_widget->clear();
     dn_applied_list = passwd_settings_obj.get_strings(ATTRIBUTE_PSO_APPLIES_TO);
@@ -138,14 +144,19 @@ QHash<QString, QList<QByteArray>> PSOEditWidget::pso_settings_values() {
                                .count() *
                            MILLIS_TO_100_NANOS)};
 
-    settings[ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED] = {
-        QString(ui->complexity_req_checkbox->isChecked() ? LDAP_BOOL_TRUE :
-        LDAP_BOOL_FALSE).toUtf8()
-    };
-    settings[ATTRIBUTE_MS_DS_PASSWORD_REVERSIBLE_ENCRYPTION_ENABLED] = {
-        QString(ui->store_passwd_checkbox->isChecked() ? LDAP_BOOL_TRUE :
-        LDAP_BOOL_FALSE).toUtf8()
-    };
+    if (is_global) {
+        settings[ATTRIBUTE_PWD_PROPERTIES] = {QByteArray::number(ui->complexity_req_checkbox->isChecked() * SAM_MASK_DOMAIN_PASSWORD_COMPLEX +
+                                                                 ui->store_passwd_checkbox->isChecked() * SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT)};
+    } else {
+        settings[ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED] = {
+            QString(ui->complexity_req_checkbox->isChecked() ? LDAP_BOOL_TRUE :
+                                                               LDAP_BOOL_FALSE)
+                .toUtf8()};
+        settings[ATTRIBUTE_MS_DS_PASSWORD_REVERSIBLE_ENCRYPTION_ENABLED] = {
+            QString(ui->store_passwd_checkbox->isChecked() ? LDAP_BOOL_TRUE :
+                                                             LDAP_BOOL_FALSE)
+                .toUtf8()};
+    }
 
     if (dn_applied_list.isEmpty()) {
         settings[ATTRIBUTE_PSO_APPLIES_TO] = QList<QByteArray>();

From 9376a014227858168829489ab84557d26665f77d Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 24 Jun 2026 23:53:48 +0400
Subject: [PATCH 12/27] Move part of PSOEditWidget update function in a new one

---
 .../pso_results_widget/pso_edit_widget.cpp    | 96 ++++++++++---------
 .../pso_results_widget/pso_edit_widget.h      |  2 +
 2 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index 8bdeb01dc..764b35787 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -46,7 +46,7 @@ PSOEditWidget::PSOEditWidget(QWidget *parent) :
     connect(ui->add_button, &QPushButton::clicked, this, &PSOEditWidget::on_add);
     connect(ui->remove_button, &QPushButton::clicked, this, &PSOEditWidget::on_remove);
 
-    update_defaults();
+    update_fields(global_password_settings());
 }
 
 PSOEditWidget::~PSOEditWidget() {
@@ -64,51 +64,7 @@ void PSOEditWidget::update(const AdObject &passwd_settings_obj) {
         ui->line->setVisible(!is_global);
     }
 
-    ui->name_edit->setText(passwd_settings_obj.get_string(replace_attribute(ATTRIBUTE_CN)));
-    ui->name_edit->setReadOnly(true);
-
-    ui->precedence_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE)));
-    ui->min_passwd_len_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH)));
-    ui->history_length_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_HISTORY_LENGTH)));
-    ui->logon_attempts_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_THRESHOLD)));
-
-    ui->lockout_duration_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_DURATION)));
-    ui->reset_lockout_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW)));
-    ui->min_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE)));
-    ui->max_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE)));
-
-    if (is_global) {
-        int pwd_properties = passwd_settings_obj.get_int(ATTRIBUTE_PWD_PROPERTIES);
-        ui->complexity_req_checkbox->setChecked(pwd_properties & SAM_MASK_DOMAIN_PASSWORD_COMPLEX);
-        ui->store_passwd_checkbox->setChecked(pwd_properties & SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT);
-    } else {
-        ui->complexity_req_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED));
-        ui->store_passwd_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_REVERSIBLE_ENCRYPTION_ENABLED));
-    }
-
-    ui->applied_list_widget->clear();
-    dn_applied_list = passwd_settings_obj.get_strings(ATTRIBUTE_PSO_APPLIES_TO);
-
-    if (dn_applied_list.isEmpty()) {
-        ui->remove_button->setDisabled(true);
-        return;
-    }
-
-    AdInterface ad;
-    if (!ad.is_connected()) {
-        return;
-    }
-
-    for (const QString &dn : dn_applied_list) {
-        AdObject applied_object = ad.search_object(dn, {ATTRIBUTE_OBJECT_CATEGORY});
-        if (applied_object.is_empty()) {
-            continue;
-        }
-        QListWidgetItem *item = new QListWidgetItem(g_icon_manager->object_icon(applied_object),
-                                                    dn_get_name(dn),
-                                                    ui->applied_list_widget);
-        item->setData(AppliedItemRole_DN, dn);
-    }
+    update_fields(passwd_settings_obj);
 }
 
 QHash<QString, QList<QByteArray>> PSOEditWidget::pso_settings_values() {
@@ -293,3 +249,51 @@ QString PSOEditWidget::replace_attribute(QString attribute_name) {
                                 QString()) :
                         attribute_name;
 };
+
+void PSOEditWidget::update_fields(const AdObject &passwd_settings_obj) {
+    ui->name_edit->setText(passwd_settings_obj.get_string(replace_attribute(ATTRIBUTE_CN)));
+    ui->name_edit->setReadOnly(true);
+
+    ui->precedence_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE)));
+    ui->min_passwd_len_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH)));
+    ui->history_length_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_HISTORY_LENGTH)));
+    ui->logon_attempts_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_THRESHOLD)));
+
+    ui->lockout_duration_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_DURATION)));
+    ui->reset_lockout_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW)));
+    ui->min_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE)));
+    ui->max_age_spinbox->setValue(spinbox_timespan_units(passwd_settings_obj, replace_attribute(ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE)));
+
+    if (is_global) {
+        int pwd_properties = passwd_settings_obj.get_int(ATTRIBUTE_PWD_PROPERTIES);
+        ui->complexity_req_checkbox->setChecked(pwd_properties & SAM_MASK_DOMAIN_PASSWORD_COMPLEX);
+        ui->store_passwd_checkbox->setChecked(pwd_properties & SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT);
+    } else {
+        ui->complexity_req_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_COMPLEXITY_ENABLED));
+        ui->store_passwd_checkbox->setChecked(passwd_settings_obj.get_bool(ATTRIBUTE_MS_DS_PASSWORD_REVERSIBLE_ENCRYPTION_ENABLED));
+    }
+
+    ui->applied_list_widget->clear();
+    dn_applied_list = passwd_settings_obj.get_strings(ATTRIBUTE_PSO_APPLIES_TO);
+
+    if (dn_applied_list.isEmpty()) {
+        ui->remove_button->setDisabled(true);
+        return;
+    }
+
+    AdInterface ad;
+    if (!ad.is_connected()) {
+        return;
+    }
+
+    for (const QString &dn : dn_applied_list) {
+        AdObject applied_object = ad.search_object(dn, {ATTRIBUTE_OBJECT_CATEGORY});
+        if (applied_object.is_empty()) {
+            continue;
+        }
+        QListWidgetItem *item = new QListWidgetItem(g_icon_manager->object_icon(applied_object),
+            dn_get_name(dn),
+            ui->applied_list_widget);
+        item->setData(AppliedItemRole_DN, dn);
+    }
+}
diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
index 7331d9bde..8bd320b24 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
@@ -75,6 +75,8 @@ class PSOEditWidget final : public QWidget {
     void on_add();
     void on_remove();
 
+    void update_fields(const AdObject &passwd_settings_obj);
+
     QString replace_attribute(QString attribute_name);
 
     /*!

From 833950a19735725254bb008340d04f061514bd96 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 24 Jun 2026 23:55:12 +0400
Subject: [PATCH 13/27] Remove update_default form PSOEditWidget

---
 .../pso_results_widget/pso_edit_widget.cpp       | 16 ----------------
 .../pso_results_widget/pso_edit_widget.h         |  1 -
 2 files changed, 17 deletions(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index 764b35787..2763e0ed2 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -168,22 +168,6 @@ bool PSOEditWidget::settings_are_default() {
     return true;
 }
 
-void PSOEditWidget::update_defaults() {
-    const AdObject &result = global_password_settings();
-
-    ui->min_passwd_len_spinbox->setValue(result.get_int(ATTRIBUTE_MIN_PWD_LENGTH));
-    ui->history_length_spinbox->setValue(result.get_int(ATTRIBUTE_PWD_HISTORY_LENGTH));
-    ui->logon_attempts_spinbox->setValue(result.get_int(ATTRIBUTE_LOCKOUT_THRESHOLD));
-
-    ui->lockout_duration_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_LOCKOUT_DURATION));
-    ui->reset_lockout_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_LOCKOUT_OBSERVATION_WINDOW));
-    ui->min_age_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_MIN_PWD_AGE));
-    ui->max_age_spinbox->setValue(spinbox_timespan_units(result, ATTRIBUTE_MAX_PWD_AGE));
-
-    ui->complexity_req_checkbox->setChecked(result.get_int(ATTRIBUTE_PWD_PROPERTIES) & SAM_MASK_DOMAIN_PASSWORD_COMPLEX);
-    ui->store_passwd_checkbox->setChecked(result.get_int(ATTRIBUTE_PWD_PROPERTIES) & SAM_MASK_DOMAIN_PASSWORD_STORE_CLEARTEXT);
-}
-
 void PSOEditWidget::on_add() {
     auto dialog = new SelectObjectDialog({CLASS_USER, CLASS_GROUP}, SelectObjectDialogMultiSelection_Yes, this);
     dialog->setWindowTitle(tr("Add applied users/group"));
diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
index 8bd320b24..448f41111 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
@@ -42,7 +42,6 @@ class PSOEditWidget final : public QWidget {
     ~PSOEditWidget();
 
     void update(const AdObject &passwd_settings_obj);
-    void update_defaults();
     void set_read_only(bool read_only);
 
     /*!

From 91f3fe676a5a275412dbac7988af8f59075cb92b Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Fri, 26 Jun 2026 02:09:54 +0400
Subject: [PATCH 14/27] Fix uneditable PSO name

---
 src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index 2763e0ed2..6201f8734 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -193,6 +193,7 @@ void PSOEditWidget::on_remove() {
 
 void PSOEditWidget::set_read_only(bool read_only) {
     QList<QSpinBox*> spinbox_children = findChildren<QSpinBox*>(QString(), Qt::FindChildrenRecursively);
+    ui->name_edit->setReadOnly(true);
     for (auto spinbox : spinbox_children) {
         spinbox->setReadOnly(read_only);
     }
@@ -236,7 +237,6 @@ QString PSOEditWidget::replace_attribute(QString attribute_name) {
 
 void PSOEditWidget::update_fields(const AdObject &passwd_settings_obj) {
     ui->name_edit->setText(passwd_settings_obj.get_string(replace_attribute(ATTRIBUTE_CN)));
-    ui->name_edit->setReadOnly(true);
 
     ui->precedence_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE)));
     ui->min_passwd_len_spinbox->setValue(passwd_settings_obj.get_int(replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_LENGTH)));

From b54b8730a23fe0e2735c38caac038892a14ba53e Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 30 Jun 2026 04:00:00 +0400
Subject: [PATCH 15/27] Fix zeroes in global PSO

---
 .../results_widgets/pso_results_widget/pso_edit_widget.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index 6201f8734..821445b79 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -215,12 +215,15 @@ int PSOEditWidget::spinbox_timespan_units(const AdObject &obj, const QString &at
     qint64 hundred_nanos = -obj.get_value(attribute).toLongLong();
     milliseconds msecs(hundred_nanos / MILLIS_TO_100_NANOS);
 
-    if (attribute == ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW || attribute == ATTRIBUTE_MS_DS_LOCKOUT_DURATION) {
+    if (attribute ==
+            replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_OBSERVATION_WINDOW) ||
+        attribute == replace_attribute(ATTRIBUTE_MS_DS_LOCKOUT_DURATION)) {
         int mins = duration_cast<minutes>(msecs).count();
         return mins;
     }
 
-    if (attribute == ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE || attribute == ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE) {
+    if (attribute == replace_attribute(ATTRIBUTE_MS_DS_MIN_PASSWORD_AGE) ||
+        attribute == replace_attribute(ATTRIBUTE_MS_DS_MAX_PASSWORD_AGE)) {
         int days = duration_cast<hours>(msecs).count() / 24;
         return days;
     }

From 744d369de7d91678076a91b4ff3354c4566072c3 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 30 Jun 2026 08:34:39 +0400
Subject: [PATCH 16/27] Add some Doxygen coments

---
 .../pso_results_widget/pso_edit_widget.cpp    | 48 +++++++++++++++++++
 .../pso_results_widget/pso_edit_widget.h      |  5 ++
 src/admc/utils.cpp                            |  4 ++
 3 files changed, 57 insertions(+)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index 821445b79..a28cd4dd5 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -35,6 +35,9 @@
 PSOEditWidget::PSOEditWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::PSOEditWidget) {
+/**
+* @brief Creates PSOEditWidget and initializes it with global values  
+*/
 
     ui->setupUi(this);
 
@@ -53,6 +56,15 @@ PSOEditWidget::~PSOEditWidget() {
     delete ui;
 }
 
+/** 
+* @brief Sets fields of PSOEditWidget according to a given object
+* @param passwd_settings_obj The object with new values
+* @details Object can be a PSO or object representing global password settings 
+* those types of objects are distiguished based on objects' CN, if CN is present 
+* the object is considered to be a PSO, othervise it's treated as global 
+* settings object. If settings are global the following fields are not 
+* displayed: name, precedence and list of users policy is applied to
+*/
 void PSOEditWidget::update(const AdObject &passwd_settings_obj) {
     if (is_global != !passwd_settings_obj.contains(ATTRIBUTE_CN)) {
         is_global = !passwd_settings_obj.contains(ATTRIBUTE_CN);
@@ -67,6 +79,10 @@ void PSOEditWidget::update(const AdObject &passwd_settings_obj) {
     update_fields(passwd_settings_obj);
 }
 
+/**
+* @brief Returns current values of widget fieds set by the user
+* @return Hashmap of new values
+*/
 QHash<QString, QList<QByteArray>> PSOEditWidget::pso_settings_values() {
     using namespace std::chrono;
 
@@ -126,6 +142,10 @@ QHash<QString, QList<QByteArray>> PSOEditWidget::pso_settings_values() {
 }
 
 QHash<QString, QList<QString> > PSOEditWidget::pso_settings_string_values() {
+/**
+* @brief Returns current values of widget fieds set by the user
+* @return Hashmap of new values
+*/
     QHash<QString, QList<QString>> string_value_settings;
     QHash<QString, QList<QByteArray>> byte_value_settings = pso_settings_values();
 
@@ -140,14 +160,24 @@ QHash<QString, QList<QString> > PSOEditWidget::pso_settings_string_values() {
     return string_value_settings;
 }
 
+/**
+* @brief Returns list of users to which the PSO applies
+*/
 QStringList PSOEditWidget::applied_dn_list() const {
     return dn_applied_list;
 }
 
+/**
+* @brief Returns the name edit object
+*/
 QLineEdit *PSOEditWidget::name_line_edit() {
     return ui->name_edit;
 }
 
+/**
+* @brief Compares current field values to their respective defaults (global 
+* settings)
+*/
 bool PSOEditWidget::settings_are_default() {
     auto current_values = pso_settings_values();
     const QStringList excluded_attrs = {
@@ -210,6 +240,13 @@ void PSOEditWidget::set_read_only(bool read_only) {
 }
 
 int PSOEditWidget::spinbox_timespan_units(const AdObject &obj, const QString &attribute) {
+/**
+* @brief Reads specified timespan attribute from given PSO object and converts 
+* it to apropriate units
+* @param obj PSO object to read attribute from
+* @param attribute The attribute to retrieve
+* @return Attribute value in specified units
+*/
     using namespace std::chrono;
 
     qint64 hundred_nanos = -obj.get_value(attribute).toLongLong();
@@ -231,6 +268,13 @@ int PSOEditWidget::spinbox_timespan_units(const AdObject &obj, const QString &at
     return 0;
 }
 
+/**
+* @brief Deduces apropriate attribute name from PSO atribute name based on 
+* whether or not PSO is global. Basicaly method converts PSO attributes to 
+* global password settings attributes if needed
+* @param attribute_name Initial attribute to be converted
+* @return The apropriate attribute considering object type
+*/
 QString PSOEditWidget::replace_attribute(QString attribute_name) {
     return is_global ? (pso_attributes_to_global_attributes.contains(attribute_name) ?
                                 pso_attributes_to_global_attributes[attribute_name] :
@@ -238,6 +282,10 @@ QString PSOEditWidget::replace_attribute(QString attribute_name) {
                         attribute_name;
 };
 
+/** 
+* @brief Sets fields of PSOEditWidget according to a given object
+* @param passwd_settings_obj The object with new values
+*/
 void PSOEditWidget::update_fields(const AdObject &passwd_settings_obj) {
     ui->name_edit->setText(passwd_settings_obj.get_string(replace_attribute(ATTRIBUTE_CN)));
 
diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
index 448f41111..61290e768 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.h
@@ -34,6 +34,11 @@ class QLineEdit;
 class QSpinBox;
 class QCheckBox;
 
+/**
+ * @class PSOEditWidget 
+ * @brief Used to represent password settings including global settings and PSOs
+ * in PSOResultsWidget and new PSO being created in CreatePSOWidget
+*/
 class PSOEditWidget final : public QWidget {
     Q_OBJECT
 
diff --git a/src/admc/utils.cpp b/src/admc/utils.cpp
index e38f4b152..f2be54ffd 100755
--- a/src/admc/utils.cpp
+++ b/src/admc/utils.cpp
@@ -496,6 +496,10 @@ bool creds_is_saved(const QString &username) {
     return saved;
 }
 
+/**
+* @brief Gets global password settings as AD object 
+* @return An AD object representing global password settings
+*/
 AdObject global_password_settings() {
     AdInterface ad;
     if (!ad.is_connected()) {

From 2f26471c182e56e2e79a06d2135184622407080b Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 30 Jun 2026 23:41:06 +0400
Subject: [PATCH 17/27] Remove unneeded code from console object impl

---
 .../console_impls/object_impl/object_impl.cpp | 28 ++++---------------
 .../console_impls/object_impl/object_impl.h   |  1 -
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/admc/console_impls/object_impl/object_impl.cpp b/src/admc/console_impls/object_impl/object_impl.cpp
index 89dcadbea..9ade1417d 100755
--- a/src/admc/console_impls/object_impl/object_impl.cpp
+++ b/src/admc/console_impls/object_impl/object_impl.cpp
@@ -212,22 +212,11 @@ void ObjectImpl::activate(const QModelIndex &index) {
 }
 
 QList<QAction *> ObjectImpl::get_all_custom_actions() const {
-    QList<QAction *> out = {
-        new_action,
-        find_action,
-        add_to_group_action,
-        enable_action,
-        disable_action,
-        reset_password_action,
-        reset_account_action,
-        edit_upn_suffixes_action,
-        move_action,
-        create_pso_action,
-        create_subnet_action,
-        create_site_action,
-        create_site_link_action,
-        create_site_link_bridge_action
-    };
+    QList<QAction *> out = {new_action, find_action, add_to_group_action,
+        enable_action, disable_action, reset_password_action,
+        reset_account_action, edit_upn_suffixes_action, move_action,
+        create_subnet_action, create_site_action, create_site_link_action,
+        create_site_link_bridge_action};
 
     return out;
 }
@@ -247,7 +236,6 @@ QSet<QAction *> ObjectImpl::get_custom_actions(const QModelIndex &index, const b
     const bool is_group = (object_class == CLASS_GROUP);
     const bool is_domain = (object_class == CLASS_DOMAIN);
     const bool is_computer = (object_class == CLASS_COMPUTER);
-    const bool is_pso_container = (object_class == CLASS_PSO_CONTAINER);
     const bool is_sites_container = (object_class == CLASS_SITES_CONTAINER);
     const bool is_subnet_container = (object_class == CLASS_SUBNET_CONTAINER);
     const bool is_site_links_container = (object_class == CLASS_INTER_SITE_TRANSPORT);
@@ -285,10 +273,6 @@ QSet<QAction *> ObjectImpl::get_custom_actions(const QModelIndex &index, const b
             out.insert(edit_upn_suffixes_action);
         }
 
-        if (is_pso_container) {
-            out.insert(create_pso_action);
-        }
-
         if (is_sites_container) {
             out.insert(create_site_action);
         }
@@ -1003,14 +987,12 @@ void ObjectImpl::setup_actions() {
         new_menu->addAction(action);
     }
 
-    create_pso_action = new QAction(tr("Create password setting object"), this);
     create_subnet_action = new QAction(tr("Create subnet"), this);
     create_site_action = new QAction(tr("Create site"), this);
     create_site_link_action = new QAction(tr("Create site link"), this);
     create_site_link_bridge_action = new QAction(tr("Create site link bridge"), this);
 
     QHash<QString, QAction *> all_create_action_map {standard_create_action_map};
-    all_create_action_map[CLASS_PSO] = create_pso_action;
     all_create_action_map[CLASS_SUBNET] = create_subnet_action;
     all_create_action_map[CLASS_SITE] = create_site_action;
     all_create_action_map[CLASS_SITE_LINK] = create_site_link_action;
diff --git a/src/admc/console_impls/object_impl/object_impl.h b/src/admc/console_impls/object_impl/object_impl.h
index 647b2cbc7..f2435ef92 100644
--- a/src/admc/console_impls/object_impl/object_impl.h
+++ b/src/admc/console_impls/object_impl/object_impl.h
@@ -136,7 +136,6 @@ private slots:
     QAction *reset_account_action;
     QAction *edit_upn_suffixes_action;
     QAction *new_action;
-    QAction *create_pso_action;
     QAction *create_subnet_action;
     QAction *create_site_action;
     QAction *create_site_link_action;

From 84f0131464e8428174b4d3f92984b2b5b8c610a4 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 1 Jul 2026 22:03:03 +0400
Subject: [PATCH 18/27] Fix PSO container actions

---
 .../console_impls/password_settings_impl.cpp  | 24 +++++++------------
 .../console_impls/password_settings_impl.h    |  1 +
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
index 01acff9d1..a19d1ea6b 100644
--- a/src/admc/console_impls/password_settings_impl.cpp
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -78,33 +78,22 @@ void PasswordSettingsImpl::refresh(const QList<QModelIndex> &index_list) {
 }
 
 QList<QAction *> PasswordSettingsImpl::get_all_custom_actions() const {
-    QList<QAction *> out;
-
-    out.append(create_pso_action);
-
-    return out;
+    return {create_pso_action};
 }
 
 QSet<QAction *> PasswordSettingsImpl::get_custom_actions(const QModelIndex &index, const bool single_selection) const {
     UNUSED_ARG(index);
     UNUSED_ARG(single_selection);
 
-    QSet<QAction *> out;
-
-    out.insert(create_pso_action);
-
-    return out;
+    auto all_actions = get_all_custom_actions();
+    return {all_actions.begin(), all_actions.end()};
 }
 
 QSet<StandardAction> PasswordSettingsImpl::get_standard_actions(const QModelIndex &index, const bool single_selection) const {
     UNUSED_ARG(index);
     UNUSED_ARG(single_selection);
 
-    QSet<StandardAction> out;
-
-    out.insert(StandardAction_Refresh);
-
-    return out;
+    return {StandardAction_Refresh, StandardAction_Properties};
 }
 
 QList<QString> PasswordSettingsImpl::column_labels() const {
@@ -114,3 +103,8 @@ QList<QString> PasswordSettingsImpl::column_labels() const {
 QList<int> PasswordSettingsImpl::default_columns() const {
     return ConsoleObjectTreeOperations::object_impl_default_columns();
 }
+
+void PasswordSettingsImpl::properties(const QList<QModelIndex> &index_list) {
+    ConsoleObjectTreeOperations::console_object_properties(
+        {console}, index_list, ObjectRole_DN, {CLASS_PSO_CONTAINER});
+}
diff --git a/src/admc/console_impls/password_settings_impl.h b/src/admc/console_impls/password_settings_impl.h
index 192a3101a..2b4ae7de6 100644
--- a/src/admc/console_impls/password_settings_impl.h
+++ b/src/admc/console_impls/password_settings_impl.h
@@ -40,6 +40,7 @@ class PasswordSettingsImpl final : public ConsoleImpl {
 
     void fetch(const QModelIndex &index) override;
     void refresh(const QList<QModelIndex> &index_list) override;
+    void properties(const QList<QModelIndex> &index_list) override;
 
     QList<QAction *> get_all_custom_actions() const override;
     QSet<QAction *> get_custom_actions(const QModelIndex &index, const bool single_selection) const override;

From 28029ddac89a7c665679b2bda77255fdef788435 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 1 Jul 2026 22:20:34 +0400
Subject: [PATCH 19/27] chore: Format PasswordSettingsImpl

---
 .../console_impls/password_settings_impl.cpp  | 32 +++++++++++--------
 .../console_impls/password_settings_impl.h    |  6 ++--
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
index a19d1ea6b..5c0c2430a 100644
--- a/src/admc/console_impls/password_settings_impl.cpp
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -45,14 +45,15 @@ PasswordSettingsImpl::PasswordSettingsImpl(ConsoleWidget *console_arg)
     result_widget->update(global_password_settings());
     set_results_widget(result_widget);
 
-    create_pso_action = new QAction(tr("Create password settings object"), this);
-
-    connect(
-        create_pso_action, &QAction::triggered,
-        this, [this]() {
-            const QString parent_dn = get_selected_target_dn(console, ItemType_PasswordSettings, ObjectRole_DN);
-            ConsoleObjectTreeOperations::console_object_create({console}, CLASS_PSO, parent_dn);
-        });
+    create_pso_action =
+        new QAction(tr("Create password settings object"), this);
+
+    connect(create_pso_action, &QAction::triggered, this, [this]() {
+        const QString parent_dn = get_selected_target_dn(
+            console, ItemType_PasswordSettings, ObjectRole_DN);
+        ConsoleObjectTreeOperations::console_object_create(
+            {console}, CLASS_PSO, parent_dn);
+    });
 }
 
 void PasswordSettingsImpl::fetch(const QModelIndex &index) {
@@ -63,11 +64,14 @@ void PasswordSettingsImpl::fetch(const QModelIndex &index) {
 
     const QString base = g_adconfig->pso_container_dn();
     const SearchScope scope = SearchScope_Children;
-    const QString filter = filter_CONDITION(Condition_Equals, ATTRIBUTE_OBJECT_CLASS, CLASS_PSO_CONTAINER);
+    const QString filter = filter_CONDITION(
+        Condition_Equals, ATTRIBUTE_OBJECT_CLASS, CLASS_PSO_CONTAINER);
     const QList<QString> attributes = QList<QString>();
-    const QHash<QString, AdObject> results = ad.search(base, scope, "", attributes);
+    const QHash<QString, AdObject> results =
+        ad.search(base, scope, "", attributes);
 
-    ConsoleObjectTreeOperations::add_objects_to_console(console, results.values(), index);
+    ConsoleObjectTreeOperations::add_objects_to_console(
+        console, results.values(), index);
 }
 
 void PasswordSettingsImpl::refresh(const QList<QModelIndex> &index_list) {
@@ -81,7 +85,8 @@ QList<QAction *> PasswordSettingsImpl::get_all_custom_actions() const {
     return {create_pso_action};
 }
 
-QSet<QAction *> PasswordSettingsImpl::get_custom_actions(const QModelIndex &index, const bool single_selection) const {
+QSet<QAction *> PasswordSettingsImpl::get_custom_actions(
+    const QModelIndex &index, const bool single_selection) const {
     UNUSED_ARG(index);
     UNUSED_ARG(single_selection);
 
@@ -89,7 +94,8 @@ QSet<QAction *> PasswordSettingsImpl::get_custom_actions(const QModelIndex &inde
     return {all_actions.begin(), all_actions.end()};
 }
 
-QSet<StandardAction> PasswordSettingsImpl::get_standard_actions(const QModelIndex &index, const bool single_selection) const {
+QSet<StandardAction> PasswordSettingsImpl::get_standard_actions(
+    const QModelIndex &index, const bool single_selection) const {
     UNUSED_ARG(index);
     UNUSED_ARG(single_selection);
 
diff --git a/src/admc/console_impls/password_settings_impl.h b/src/admc/console_impls/password_settings_impl.h
index 2b4ae7de6..96fcdeca4 100644
--- a/src/admc/console_impls/password_settings_impl.h
+++ b/src/admc/console_impls/password_settings_impl.h
@@ -43,8 +43,10 @@ class PasswordSettingsImpl final : public ConsoleImpl {
     void properties(const QList<QModelIndex> &index_list) override;
 
     QList<QAction *> get_all_custom_actions() const override;
-    QSet<QAction *> get_custom_actions(const QModelIndex &index, const bool single_selection) const override;
-    QSet<StandardAction> get_standard_actions(const QModelIndex &index, const bool single_selection) const override;
+    QSet<QAction *> get_custom_actions(
+        const QModelIndex &index, const bool single_selection) const override;
+    QSet<StandardAction> get_standard_actions(
+        const QModelIndex &index, const bool single_selection) const override;
 
     QList<QString> column_labels() const override;
     QList<int> default_columns() const override;

From 08c0bd94e657f3d09d1c345febee5c615240d89e Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 1 Jul 2026 22:27:38 +0400
Subject: [PATCH 20/27] style: Add title for global password settings

---
 src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
index a28cd4dd5..0c398ccc3 100644
--- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
+++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.cpp
@@ -74,6 +74,8 @@ void PSOEditWidget::update(const AdObject &passwd_settings_obj) {
         ui->precedence_spinbox->setVisible(!is_global);
         ui->groupBox->setVisible(!is_global);
         ui->line->setVisible(!is_global);
+        ui->groupBox_2->setTitle(is_global ? tr("Global password settings") :
+                                             tr("Password settings"));
     }
 
     update_fields(passwd_settings_obj);

From c4cec425cfb440f48d6b711386f658f422f901a1 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Wed, 8 Jul 2026 22:40:19 +0400
Subject: [PATCH 21/27] fix(PSO): Disable create pso action when pso container
 is unavailable

---
 src/admc/console_impls/password_settings_impl.cpp | 10 ++++++++++
 src/admc/console_impls/password_settings_impl.h   |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
index 5c0c2430a..96f95e33d 100644
--- a/src/admc/console_impls/password_settings_impl.cpp
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -69,6 +69,7 @@ void PasswordSettingsImpl::fetch(const QModelIndex &index) {
     const QList<QString> attributes = QList<QString>();
     const QHash<QString, AdObject> results =
         ad.search(base, scope, "", attributes);
+    is_PSO_container_available = !results.isEmpty();
 
     ConsoleObjectTreeOperations::add_objects_to_console(
         console, results.values(), index);
@@ -94,6 +95,15 @@ QSet<QAction *> PasswordSettingsImpl::get_custom_actions(
     return {all_actions.begin(), all_actions.end()};
 }
 
+QSet<QAction *> PasswordSettingsImpl::get_disabled_custom_actions(
+    const QModelIndex &index, const bool single_selection) const {
+    UNUSED_ARG(index);
+    UNUSED_ARG(single_selection);
+
+    return is_PSO_container_available ? QSet<QAction *>{} :
+                                        QSet<QAction *>{create_pso_action};
+}
+
 QSet<StandardAction> PasswordSettingsImpl::get_standard_actions(
     const QModelIndex &index, const bool single_selection) const {
     UNUSED_ARG(index);
diff --git a/src/admc/console_impls/password_settings_impl.h b/src/admc/console_impls/password_settings_impl.h
index 96fcdeca4..14c2e5efb 100644
--- a/src/admc/console_impls/password_settings_impl.h
+++ b/src/admc/console_impls/password_settings_impl.h
@@ -45,6 +45,8 @@ class PasswordSettingsImpl final : public ConsoleImpl {
     QList<QAction *> get_all_custom_actions() const override;
     QSet<QAction *> get_custom_actions(
         const QModelIndex &index, const bool single_selection) const override;
+    QSet<QAction *> get_disabled_custom_actions(
+        const QModelIndex &index, const bool single_selection) const override;
     QSet<StandardAction> get_standard_actions(
         const QModelIndex &index, const bool single_selection) const override;
 
@@ -53,6 +55,7 @@ class PasswordSettingsImpl final : public ConsoleImpl {
 
 private:
     QAction *create_pso_action;
+    bool is_PSO_container_available = false;
 };
 
 #endif /* PASSWORD_SETTINGS_IMPL_H */

From a6249fd1c97763807333c8dfbf36c8eebb785288 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 14 Jul 2026 01:31:39 +0400
Subject: [PATCH 22/27] refactor: Remove some unneeded vars in password
 settings impl

---
 src/admc/console_impls/password_settings_impl.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
index 96f95e33d..7c98a1d09 100644
--- a/src/admc/console_impls/password_settings_impl.cpp
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -62,14 +62,13 @@ void PasswordSettingsImpl::fetch(const QModelIndex &index) {
         return;
     }
 
-    const QString base = g_adconfig->pso_container_dn();
-    const SearchScope scope = SearchScope_Children;
-    const QString filter = filter_CONDITION(
-        Condition_Equals, ATTRIBUTE_OBJECT_CLASS, CLASS_PSO_CONTAINER);
-    const QList<QString> attributes = QList<QString>();
-    const QHash<QString, AdObject> results =
-        ad.search(base, scope, "", attributes);
+    QHash<QString, AdObject> results = ad.search(
+        g_adconfig->pso_container_dn(), SearchScope_All, "", QStringList());
     is_PSO_container_available = !results.isEmpty();
+    results.removeIf([](QHash<QString, AdObject>::iterator object) {
+        return object.value().get_string(ATTRIBUTE_OBJECT_CLASS) ==
+               CLASS_PSO_CONTAINER;
+    });
 
     ConsoleObjectTreeOperations::add_objects_to_console(
         console, results.values(), index);

From eaaa2d34de1fe1fa109477fe65dc88f963ea748b Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 14 Jul 2026 02:28:01 +0400
Subject: [PATCH 23/27] refactor: Make result widget and view protected in
 console impls

---
 src/admc/console_widget/console_impl.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/admc/console_widget/console_impl.h b/src/admc/console_widget/console_impl.h
index d4f32c335..9faaa4532 100644
--- a/src/admc/console_widget/console_impl.h
+++ b/src/admc/console_widget/console_impl.h
@@ -141,7 +141,6 @@ class ConsoleImpl : public QObject {
     void set_results_view(ResultsView *view);
     void set_results_widget(QWidget *widget);
 
-private:
     ResultsView *results_view;
     QWidget *results_widget;
 };

From 09c18bf63aa4e2095a6ef1fcd7db9c9473291d93 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 14 Jul 2026 02:42:00 +0400
Subject: [PATCH 24/27] fix: Fix refresh of pso console impl

---
 src/admc/console_impls/password_settings_impl.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/admc/console_impls/password_settings_impl.cpp b/src/admc/console_impls/password_settings_impl.cpp
index 7c98a1d09..28dd2b3bf 100644
--- a/src/admc/console_impls/password_settings_impl.cpp
+++ b/src/admc/console_impls/password_settings_impl.cpp
@@ -41,9 +41,7 @@
 
 PasswordSettingsImpl::PasswordSettingsImpl(ConsoleWidget *console_arg)
 : ConsoleImpl(console_arg) {
-    auto result_widget(new PSOResultsWidget(console_arg));
-    result_widget->update(global_password_settings());
-    set_results_widget(result_widget);
+    results_widget = new PSOResultsWidget(console_arg);
 
     create_pso_action =
         new QAction(tr("Create password settings object"), this);
@@ -62,6 +60,10 @@ void PasswordSettingsImpl::fetch(const QModelIndex &index) {
         return;
     }
 
+    //TODO:(kozyrevid) refactor this cast and other like it
+    dynamic_cast<PSOResultsWidget *>(results_widget)
+        ->update(global_password_settings());
+
     QHash<QString, AdObject> results = ad.search(
         g_adconfig->pso_container_dn(), SearchScope_All, "", QStringList());
     is_PSO_container_available = !results.isEmpty();

From 182d244822a54f83b97d96155c5d99f972a35dc9 Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 14 Jul 2026 02:55:53 +0400
Subject: [PATCH 25/27] style: Remove extra var

---
 .../console_impls/object_impl/console_object_operations.cpp    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/admc/console_impls/object_impl/console_object_operations.cpp b/src/admc/console_impls/object_impl/console_object_operations.cpp
index ffa688324..e36761551 100644
--- a/src/admc/console_impls/object_impl/console_object_operations.cpp
+++ b/src/admc/console_impls/object_impl/console_object_operations.cpp
@@ -624,11 +624,10 @@ void ConsoleObjectTreeOperations::console_tree_add_password_settings(ConsoleWidg
         g_status->add_message(err, StatusType_Info);
         return;
     }
+    console->set_item_sort_index(password_settings_root->index(), 3);
 
     console_object_item_data_load(password_settings_root, search_results.values()[0]);
 
-    const int pso_container_sort_idx = 3;
-    console->set_item_sort_index(password_settings_root->index(), pso_container_sort_idx);
 }
 
 QString ConsoleObjectTreeOperations::console_object_count_string(ConsoleWidget *console, const QModelIndex &index) {

From ddabca7227df1b8d1a47590641f23140de00924d Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Tue, 14 Jul 2026 02:57:41 +0400
Subject: [PATCH 26/27] fix: Fix order of pso impl when pso container is not
 available

---
 .../object_impl/console_object_operations.cpp             | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/admc/console_impls/object_impl/console_object_operations.cpp b/src/admc/console_impls/object_impl/console_object_operations.cpp
index e36761551..4ed90b9d3 100644
--- a/src/admc/console_impls/object_impl/console_object_operations.cpp
+++ b/src/admc/console_impls/object_impl/console_object_operations.cpp
@@ -620,14 +620,10 @@ void ConsoleObjectTreeOperations::console_tree_add_password_settings(ConsoleWidg
     const QString filter = filter_CONDITION(Condition_Equals, ATTRIBUTE_OBJECT_CLASS, CLASS_PSO_CONTAINER);
     auto search_results = ad.search(g_adconfig->domain_dn(), SearchScope_All, filter, {});
     const QString err = QObject::tr("Password settings container is not available");
-    if (search_results.isEmpty() || search_results.values()[0].is_empty()) {
-        g_status->add_message(err, StatusType_Info);
-        return;
+    if (!search_results.isEmpty() && !search_results.values()[0].is_empty()) {
+        console_object_item_data_load(password_settings_root, search_results.values()[0]);
     }
     console->set_item_sort_index(password_settings_root->index(), 3);
-
-    console_object_item_data_load(password_settings_root, search_results.values()[0]);
-
 }
 
 QString ConsoleObjectTreeOperations::console_object_count_string(ConsoleWidget *console, const QModelIndex &index) {

From 29f2002edf122a353885c6ca98ce2b7125a4f1af Mon Sep 17 00:00:00 2001
From: Kozyrev Yuri <kozyrevid@altlinux.org>
Date: Sun, 2 Aug 2026 21:23:31 +0400
Subject: [PATCH 27/27] chore(translations): Update translations for PSO
 container

---
 src/admc/admc_en.ts | 2885 +++++++++++++++++++++++++++++++------------
 src/admc/admc_ru.ts | 1386 +++++++++------------
 2 files changed, 2676 insertions(+), 1595 deletions(-)

diff --git a/src/admc/admc_en.ts b/src/admc/admc_en.ts
index 3afdd52bf..55e141c79 100644
--- a/src/admc/admc_en.ts
+++ b/src/admc/admc_en.ts
@@ -15,8 +15,9 @@
     </message>
     <message>
         <location filename="about_dialog.ui" line="50"/>
-        <source>Copyright (C) 2022 BaseALT Ltd.</source>
-        <translation></translation>
+        <source>Copyright (C) 2025 BaseALT Ltd.</source>
+        <oldsource>Copyright (C) 2022 BaseALT Ltd.</oldsource>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -105,50 +106,60 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="145"/>
+        <location filename="tabs/account_tab.ui" line="161"/>
         <source>Account disabled</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="152"/>
+        <location filename="tabs/account_tab.ui" line="168"/>
         <source>User cannot change password</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="159"/>
+        <location filename="tabs/account_tab.ui" line="175"/>
         <source>User must change password on next logon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="166"/>
+        <location filename="tabs/account_tab.ui" line="182"/>
         <source>Don&apos;t expire password</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="173"/>
+        <location filename="tabs/account_tab.ui" line="189"/>
         <source>Store password using reversible encryption</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="180"/>
+        <location filename="tabs/account_tab.ui" line="196"/>
         <source>Smartcard is required for interactive logon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="187"/>
+        <location filename="tabs/account_tab.ui" line="203"/>
         <source>Account is sensitive and cannot be delegated</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="194"/>
+        <location filename="tabs/account_tab.ui" line="210"/>
         <source>Use Kerberos DES encryption types for this account</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="201"/>
+        <location filename="tabs/account_tab.ui" line="217"/>
         <source>Don&apos;t require Kerberos pre-authentication</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="tabs/account_tab.ui" line="233"/>
+        <source>Password settings:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/account_tab.ui" line="240"/>
+        <source>PLACEHOLDER</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddressMultiTab</name>
@@ -214,12 +225,12 @@
 <context>
     <name>AllPoliciesFolderImpl</name>
     <message>
-        <location filename="console_impls/all_policies_folder_impl.cpp" line="42"/>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="45"/>
         <source>Create policy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/all_policies_folder_impl.cpp" line="102"/>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="105"/>
         <source>Name</source>
         <translation></translation>
     </message>
@@ -227,23 +238,23 @@
 <context>
     <name>AttributeDialog</name>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="112"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="137"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="114"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="139"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="123"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="148"/>
         <source>%1 Multi-Valued %2</source>
         <comment>This is a dialog title for attribute editors. Example: &quot;Edit Multi-Valued String&quot;</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="149"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="174"/>
         <source>Attribute: %1</source>
         <translation></translation>
     </message>
@@ -261,7 +272,17 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/attributes_tab.ui" line="65"/>
+        <location filename="tabs/attributes_tab.ui" line="52"/>
+        <source>Loads optional attribute values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/attributes_tab.ui" line="55"/>
+        <source>Load optional attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/attributes_tab.ui" line="75"/>
         <source>Filter</source>
         <translation></translation>
     </message>
@@ -269,20 +290,25 @@
 <context>
     <name>AttributesTabEdit</name>
     <message>
-        <location filename="tabs/attributes_tab.cpp" line="62"/>
+        <location filename="tabs/attributes_tab.cpp" line="67"/>
         <source>Name</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/attributes_tab.cpp" line="63"/>
+        <location filename="tabs/attributes_tab.cpp" line="68"/>
         <source>Value</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/attributes_tab.cpp" line="64"/>
+        <location filename="tabs/attributes_tab.cpp" line="69"/>
         <source>Type</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="tabs/attributes_tab.cpp" line="189"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AttributesTabFilterMenu</name>
@@ -348,7 +374,7 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="changelog_dialog.cpp" line="39"/>
+        <location filename="changelog_dialog.cpp" line="40"/>
         <source>Failed to open changelog file.</source>
         <translation></translation>
     </message>
@@ -403,33 +429,93 @@
     </message>
     <message>
         <location filename="connection_options_dialog.ui" line="60"/>
-        <source>Host:</source>
-        <translation></translation>
+        <source>Domain:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="connection_options_dialog.ui" line="76"/>
-        <source>No hosts found.</source>
-        <translation></translation>
+        <location filename="connection_options_dialog.ui" line="81"/>
+        <source>Get hosts from default kerberos credential cache.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.ui" line="84"/>
+        <source>Default:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.ui" line="94"/>
+        <source>Get custom domain hosts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.ui" line="114"/>
+        <source>CUSTOM.DOMAIN.COM</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="connection_options_dialog.ui" line="86"/>
-        <source>Select:</source>
+        <location filename="connection_options_dialog.ui" line="121"/>
+        <source>Find hosts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.ui" line="157"/>
+        <source>Restore defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.ui" line="134"/>
+        <source>No hosts found.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="connection_options_dialog.ui" line="99"/>
+        <location filename="connection_options_dialog.ui" line="97"/>
         <source>Custom:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="connection_options_dialog.cpp" line="133"/>
+        <location filename="connection_options_dialog.cpp" line="38"/>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.cpp" line="39"/>
+        <source>hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.cpp" line="40"/>
+        <source>demand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.cpp" line="41"/>
+        <source>allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.cpp" line="42"/>
+        <source>try</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.cpp" line="136"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="connection_options_dialog.cpp" line="133"/>
-        <source>Select or enter a host.</source>
-        <translation></translation>
+        <location filename="connection_options_dialog.cpp" line="136"/>
+        <source>Select a host.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.cpp" line="192"/>
+        <source>You are connected to DC without PDC-Emulator role. Group policy editing is prohibited by the setting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="connection_options_dialog.cpp" line="195"/>
+        <source>You are connected to DC without PDC-Emulator role. Group policy editing is available.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -468,42 +554,42 @@
 <context>
     <name>ConsoleWidget</name>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="137"/>
+        <location filename="console_widget/console_widget.cpp" line="133"/>
         <source>Copy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="138"/>
+        <location filename="console_widget/console_widget.cpp" line="134"/>
         <source>Cut</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="139"/>
+        <location filename="console_widget/console_widget.cpp" line="135"/>
         <source>Rename</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="140"/>
+        <location filename="console_widget/console_widget.cpp" line="136"/>
         <source>Delete</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="141"/>
+        <location filename="console_widget/console_widget.cpp" line="137"/>
         <source>Paste</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="142"/>
+        <location filename="console_widget/console_widget.cpp" line="138"/>
         <source>Print</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="143"/>
+        <location filename="console_widget/console_widget.cpp" line="139"/>
         <source>Refresh</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="144"/>
+        <location filename="console_widget/console_widget.cpp" line="140"/>
         <source>Properties</source>
         <translation></translation>
     </message>
@@ -511,17 +597,17 @@
 <context>
     <name>CreateComputerDialog</name>
     <message>
-        <location filename="create_computer_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_computer_dialog.ui" line="14"/>
         <source>Create Computer</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_computer_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_computer_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_computer_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_computer_dialog.ui" line="32"/>
         <source>Logon name (pre-Windows 2000):</source>
         <translation></translation>
     </message>
@@ -529,61 +615,66 @@
 <context>
     <name>CreateContactDialog</name>
     <message>
-        <location filename="create_contact_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="14"/>
         <source>Create Contact</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="22"/>
         <source>First name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="29"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="29"/>
         <source>Last name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="36"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="36"/>
         <source>Initials:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="43"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="43"/>
         <source>Full name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="50"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="50"/>
         <source>Display name:</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="75"/>
+        <source>Middle name:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateGroupDialog</name>
     <message>
-        <location filename="create_group_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="14"/>
         <source>Create Group</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="32"/>
         <source>Group name (pre-Windows 2000):</source>
         <oldsource>Logon name (pre-Windows 2000):</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="53"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="53"/>
         <source>Group scope:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="63"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="63"/>
         <source>Group type:</source>
         <translation></translation>
     </message>
@@ -591,17 +682,17 @@
 <context>
     <name>CreateOUDialog</name>
     <message>
-        <location filename="create_ou_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_ou_dialog.ui" line="14"/>
         <source>Create OU</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_ou_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_ou_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_ou_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_ou_dialog.ui" line="32"/>
         <source>Protect against deletion</source>
         <translation></translation>
     </message>
@@ -609,41 +700,69 @@
 <context>
     <name>CreateObjectHelper</name>
     <message>
-        <location filename="create_object_helper.cpp" line="83"/>
+        <location filename="create_object_helper.cpp" line="72"/>
         <source>Failed to create object %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_object_helper.cpp" line="146"/>
+        <location filename="create_object_helper.cpp" line="149"/>
         <source>Object %1 was created</source>
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>CreatePSODialog</name>
+    <message>
+        <location filename="create_dialogs/create_pso_dialog.ui" line="14"/>
+        <source>Password settings object creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="create_dialogs/create_pso_dialog.ui" line="23"/>
+        <source>Protect against deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="create_dialogs/create_pso_dialog.cpp" line="66"/>
+        <source>At least one password setting (except precedence) should not be default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="create_dialogs/create_pso_dialog.cpp" line="83"/>
+        <source>Failed to create password settings object %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="create_dialogs/create_pso_dialog.cpp" line="89"/>
+        <source>Password settings object %1 has been successfully created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CreatePolicyDialog</name>
     <message>
-        <location filename="create_policy_dialog.ui" line="26"/>
+        <location filename="create_dialogs/create_policy_dialog.ui" line="26"/>
         <source>Create Policy</source>
         <oldsource>Create GPO</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.ui" line="34"/>
+        <location filename="create_dialogs/create_policy_dialog.ui" line="34"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.cpp" line="57"/>
+        <location filename="create_dialogs/create_policy_dialog.cpp" line="60"/>
         <source>New Group Policy Object</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.cpp" line="101"/>
+        <location filename="create_dialogs/create_policy_dialog.cpp" line="107"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.cpp" line="101"/>
+        <location filename="create_dialogs/create_policy_dialog.cpp" line="107"/>
         <source>Group Policy Object with this name already exists.</source>
         <translation></translation>
     </message>
@@ -651,28 +770,28 @@
 <context>
     <name>CreateQueryFolderDialog</name>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="14"/>
         <source>Create Query Folder</source>
         <oldsource>Create query folder</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="36"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="36"/>
         <source>Description:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="29"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="29"/>
         <source>New folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.cpp" line="54"/>
+        <location filename="create_dialogs/create_query_folder_dialog.cpp" line="54"/>
         <source>New Folder</source>
         <translation></translation>
     </message>
@@ -680,7 +799,7 @@
 <context>
     <name>CreateQueryItemDialog</name>
     <message>
-        <location filename="create_query_item_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_query_item_dialog.ui" line="14"/>
         <source>Create Query</source>
         <translation></translation>
     </message>
@@ -688,287 +807,579 @@
 <context>
     <name>CreateSharedFolderDialog</name>
     <message>
-        <location filename="create_shared_folder_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_shared_folder_dialog.ui" line="14"/>
         <source>Create Shared Folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_shared_folder_dialog.ui" line="25"/>
+        <location filename="create_dialogs/create_shared_folder_dialog.ui" line="25"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="create_shared_folder_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_shared_folder_dialog.ui" line="32"/>
         <source>Network path:</source>
         <translation></translation>
     </message>
 </context>
 <context>
-    <name>CreateUserDialog</name>
+    <name>CreateSiteDialog</name>
     <message>
-        <location filename="create_user_dialog.ui" line="14"/>
-        <source>Create User</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_site_dialog.ui" line="14"/>
+        <source>Create site</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="22"/>
-        <source>First name:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_site_dialog.ui" line="22"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="32"/>
-        <source>Last name:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_site_dialog.ui" line="47"/>
+        <source>Select the site link object for this site.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="42"/>
-        <source>Full name:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_site_dialog.cpp" line="21"/>
+        <source>Chain name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="52"/>
-        <source>Initials:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_site_dialog.cpp" line="21"/>
+        <source>Transport</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CreateSitesLinkDialog</name>
     <message>
-        <location filename="create_user_dialog.ui" line="62"/>
-        <source>Logon name:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.ui" line="14"/>
+        <source>Create sites link</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="69"/>
-        <source>Logon name (pre-Windows 2000):</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.ui" line="28"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="76"/>
-        <source>Password:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.ui" line="43"/>
+        <source>PLACEHOLDER</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="90"/>
-        <source>Confirm password:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="30"/>
+        <source>Site link object must link two or more sites</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="128"/>
-        <source>Show password</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="31"/>
+        <source>Create site link</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="137"/>
-        <source>Account options:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="36"/>
+        <source>Link bridge object must link two or more site links</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="143"/>
-        <source>User must change password on next logon</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="37"/>
+        <source>Create site link bridge</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="153"/>
-        <source>User cannot change password</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="60"/>
+        <source>Site link object must link at least two sites</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="160"/>
-        <source>Don&apos;t expire password</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="61"/>
+        <source>Link bridge object must link at least two site links</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.ui" line="167"/>
-        <source>Account disabled</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="62"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="create_user_dialog.cpp" line="98"/>
-        <source>Create %1</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="93"/>
+        <source>Failed to create site link object %1</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CustomizeColumnsDialog</name>
     <message>
-        <location filename="console_widget/customize_columns_dialog.cpp" line="43"/>
-        <source>Customize Columns</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="94"/>
+        <source>Failed to create site link bridge object %1</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DelegationTab</name>
     <message>
-        <location filename="tabs/delegation_tab.ui" line="20"/>
-        <source>Do not trust for delegation</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="100"/>
+        <source>Site link object %1 has been successfully created.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/delegation_tab.ui" line="27"/>
-        <source>Trust for delegation to any service using Kerberos</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="101"/>
+        <source>Site link bridge object %1 has been successfully created.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EditQueryFolderDialog</name>
-    <message>
-        <location filename="edit_query_folder_dialog.ui" line="14"/>
-        <source>Edit Query Folder</source>
-        <oldsource>Edit query folder</oldsource>
-        <translation></translation>
-    </message>
+    <name>CreateSubnetDialog</name>
     <message>
-        <location filename="edit_query_folder_dialog.ui" line="22"/>
-        <source>Name:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.ui" line="14"/>
+        <source>Create subnet</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="edit_query_folder_dialog.ui" line="32"/>
-        <source>Description:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.ui" line="26"/>
+        <source>Enter the prefix in network prefix notation (address/prefix length). Both IPv4 and IPv6 subnet prefixes are supported.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditQueryItemDialog</name>
     <message>
-        <location filename="edit_query_item_dialog.ui" line="14"/>
-        <source>Edit Query</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.ui" line="36"/>
+        <source>IPv4 example: 172.16.0.0/16  </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditQueryItemWidget</name>
     <message>
-        <location filename="edit_query_item_widget.ui" line="58"/>
-        <source>Recursive search</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.ui" line="43"/>
+        <source>IPv6 example: 2001:db8:abcd:0001::/64 </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="28"/>
-        <source>Name:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.ui" line="62"/>
+        <source>Prefix:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="38"/>
-        <source>Description:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.ui" line="72"/>
+        <source>Active Directory prefix name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="48"/>
-        <source>Search in:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.ui" line="86"/>
+        <source>Site object:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="67"/>
-        <source>Filter:</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.cpp" line="63"/>
+        <source>Failed to create subnet object %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="83"/>
-        <source>Edit filter</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_subnet_dialog.cpp" line="68"/>
+        <source>Subnet object %1 has been successfully created.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ErrorLogDialog</name>
+    <name>CreateUserDialog</name>
     <message>
-        <location filename="error_log_dialog.ui" line="14"/>
-        <source>Errors Occured</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="14"/>
+        <source>Create User</source>
         <translation></translation>
     </message>
-</context>
-<context>
-    <name>ErrorTab</name>
     <message>
-        <location filename="tabs/error_tab.ui" line="20"/>
-        <source>Failed to load object information. Check your connection.</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="22"/>
+        <source>First name:</source>
         <translation></translation>
     </message>
-</context>
-<context>
-    <name>ExpiryWidget</name>
     <message>
-        <location filename="attribute_edits/expiry_widget.ui" line="20"/>
-        <source>Never</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="32"/>
+        <source>Last name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_edits/expiry_widget.ui" line="29"/>
-        <source>End of:</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="42"/>
+        <source>Full name:</source>
         <translation></translation>
     </message>
-</context>
-<context>
-    <name>FSMODialog</name>
     <message>
-        <location filename="fsmo_dialog.ui" line="14"/>
-        <source>Operations Masters</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="52"/>
+        <source>Initials:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="53"/>
-        <source>Domain DNS</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="62"/>
+        <source>Logon name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="54"/>
-        <source>Forest DNS</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="69"/>
+        <source>Logon name (pre-Windows 2000):</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="55"/>
-        <source>PDC Emulation</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="76"/>
+        <source>Password:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="56"/>
-        <source>Schema</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="90"/>
+        <source>Confirm password:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="57"/>
-        <source>Domain Naming</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="128"/>
+        <source>Show password</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="58"/>
-        <source>Infrastructure</source>
-        <translation></translation>
+        <location filename="create_dialogs/create_user_dialog.ui" line="138"/>
+        <source>Middle Name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="59"/>
-        <source>Rid Allocation</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="147"/>
+        <source>Account options:</source>
         <translation></translation>
     </message>
-</context>
-<context>
-    <name>FSMOTab</name>
     <message>
-        <location filename="fsmo_tab.ui" line="27"/>
-        <source>Current master:</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="153"/>
+        <source>User must change password on next logon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_tab.ui" line="41"/>
-        <source>Change to:</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="163"/>
+        <source>User cannot change password</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_tab.ui" line="70"/>
-        <source>Change</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="170"/>
+        <source>Don&apos;t expire password</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_tab.cpp" line="80"/>
-        <source>Error</source>
+        <location filename="create_dialogs/create_user_dialog.ui" line="177"/>
+        <source>Account disabled</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="fsmo_tab.cpp" line="80"/>
-        <source>This machine is already a master for this role. Switch to a different machine in Connection Options to change master.</source>
+        <location filename="create_dialogs/create_user_dialog.cpp" line="108"/>
+        <source>Create %1</source>
         <translation></translation>
     </message>
 </context>
 <context>
-    <name>FilterDialog</name>
+    <name>CreationDeletionPermissionsWidget</name>
+    <message>
+        <location filename="permission_control_widgets/creation_deletion_permissions_widget.cpp" line="85"/>
+        <source>Create </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/creation_deletion_permissions_widget.cpp" line="85"/>
+        <location filename="permission_control_widgets/creation_deletion_permissions_widget.cpp" line="88"/>
+        <source> objects</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/creation_deletion_permissions_widget.cpp" line="88"/>
+        <source>Delete </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/creation_deletion_permissions_widget.cpp" line="91"/>
+        <source>Undefined</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CustomizeColumnsDialog</name>
+    <message>
+        <location filename="console_widget/customize_columns_dialog.cpp" line="43"/>
+        <source>Customize Columns</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>DelegationPermissionsWidget</name>
+    <message>
+        <location filename="permission_control_widgets/delegation_permissions_widget.cpp" line="44"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/delegation_permissions_widget.cpp" line="45"/>
+        <source>Assigned</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DelegationTab</name>
+    <message>
+        <location filename="tabs/delegation_tab.ui" line="20"/>
+        <source>Do not trust for delegation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/delegation_tab.ui" line="27"/>
+        <source>Trust for delegation to any service using Kerberos</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>DomainInfoImpl</name>
+    <message>
+        <location filename="console_impls/domain_info_impl.cpp" line="47"/>
+        <source>Edit FSMO roles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/domain_info_impl.cpp" line="48"/>
+        <source>Open connection options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/domain_info_impl.cpp" line="97"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/domain_info_impl.cpp" line="101"/>
+        <source>Host not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/domain_info_impl.cpp" line="106"/>
+        <source>Active directory managment center [</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/domain_info_impl.cpp" line="129"/>
+        <source>Connected to host </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DomainInfoResultsWidget</name>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="97"/>
+        <source>Domain about</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="120"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="127"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="134"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="155"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="176"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="197"/>
+        <source>PLACEHOLDER</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="141"/>
+        <source>Domain functionality level:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="148"/>
+        <source>Sites count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="162"/>
+        <source>Forest functionality level:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="169"/>
+        <source>Domain schema version:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="183"/>
+        <source>Domain controllers count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="190"/>
+        <source>Domain controller version:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.cpp" line="192"/>
+        <source>Undefined</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditQueryFolderDialog</name>
+    <message>
+        <location filename="edit_query_widgets/edit_query_folder_dialog.ui" line="14"/>
+        <source>Edit Query Folder</source>
+        <oldsource>Edit query folder</oldsource>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="edit_query_widgets/edit_query_folder_dialog.ui" line="22"/>
+        <source>Name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="edit_query_widgets/edit_query_folder_dialog.ui" line="32"/>
+        <source>Description:</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>EditQueryItemDialog</name>
+    <message>
+        <location filename="edit_query_widgets/edit_query_item_dialog.ui" line="14"/>
+        <source>Edit Query</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>EditQueryItemWidget</name>
+    <message>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="58"/>
+        <source>Recursive search</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="28"/>
+        <source>Name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="38"/>
+        <source>Description:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="48"/>
+        <source>Search in:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="67"/>
+        <source>Filter:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="83"/>
+        <source>Edit filter</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorLogDialog</name>
+    <message>
+        <location filename="error_log_dialog.ui" line="14"/>
+        <source>Errors Occured</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorTab</name>
+    <message>
+        <location filename="tabs/error_tab.ui" line="20"/>
+        <source>Failed to load object information. Check your connection.</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ExpiryWidget</name>
+    <message>
+        <location filename="attribute_edits/expiry_widget.ui" line="20"/>
+        <source>Never</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/expiry_widget.ui" line="29"/>
+        <source>End of:</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>FSMODialog</name>
+    <message>
+        <location filename="fsmo/fsmo_dialog.ui" line="20"/>
+        <source>Operations Masters</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.ui" line="45"/>
+        <source>Edit policies only under PDC Emulator connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.ui" line="116"/>
+        <source>Warning! If unchecking this option, group policy edition will be allowed on domain controllers that do not have the PDC-Emulator role.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.cpp" line="45"/>
+        <source>Domain DNS</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.cpp" line="46"/>
+        <source>Forest DNS</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.cpp" line="47"/>
+        <source>PDC Emulation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.cpp" line="48"/>
+        <source>Schema</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.cpp" line="49"/>
+        <source>Domain Naming</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.cpp" line="50"/>
+        <source>Infrastructure</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_dialog.cpp" line="51"/>
+        <source>Rid Allocation</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>FSMOTab</name>
+    <message>
+        <location filename="fsmo/fsmo_tab.ui" line="27"/>
+        <source>Current master:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_tab.ui" line="41"/>
+        <source>Change to:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_tab.ui" line="70"/>
+        <source>Change</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_tab.cpp" line="67"/>
+        <source>Error</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_tab.cpp" line="67"/>
+        <source>This machine is already a master for this role. Switch to a different machine in Connection Options to change master.</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>FilterDialog</name>
     <message>
         <location filename="filter_widget/filter_dialog.ui" line="14"/>
         <source>Edit Filter</source>
@@ -1065,17 +1476,17 @@
 <context>
     <name>FindObjectDialog</name>
     <message>
-        <location filename="find_object_dialog.ui" line="14"/>
+        <location filename="find_widgets/find_object_dialog.ui" line="14"/>
         <source>Find Objects</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_object_dialog.cpp" line="41"/>
+        <location filename="find_widgets/find_object_dialog.cpp" line="41"/>
         <source>&amp;Action</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_object_dialog.cpp" line="43"/>
+        <location filename="find_widgets/find_object_dialog.cpp" line="43"/>
         <source>&amp;View</source>
         <translation></translation>
     </message>
@@ -1083,105 +1494,105 @@
 <context>
     <name>FindPolicyDialog</name>
     <message>
-        <location filename="find_policy_dialog.ui" line="14"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="14"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="41"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="41"/>
         <source>Search item:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="51"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="51"/>
         <source>Condition:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="61"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="61"/>
         <source>Value:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="75"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="75"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="97"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="97"/>
         <source>Filters:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="114"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="114"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="121"/>
-        <location filename="find_policy_dialog.ui" line="164"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="121"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="164"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="150"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="150"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="157"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="157"/>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="48"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="48"/>
         <source>&amp;Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="50"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="50"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="63"/>
-        <location filename="find_policy_dialog.cpp" line="192"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="63"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="64"/>
-        <location filename="find_policy_dialog.cpp" line="193"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="64"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="193"/>
         <source>GUID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="95"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="95"/>
         <source>&amp;Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="97"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="97"/>
         <source>&amp;List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="99"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="99"/>
         <source>&amp;Detail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="101"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="101"/>
         <source>&amp;Customize Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="102"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="102"/>
         <source>&amp;Description Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="137"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="137"/>
         <source>Find results</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,57 +1613,57 @@
 <context>
     <name>FindWidget</name>
     <message>
-        <location filename="find_widget.ui" line="80"/>
+        <location filename="find_widgets/find_widget.ui" line="80"/>
         <source>Find</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.ui" line="96"/>
+        <location filename="find_widgets/find_widget.ui" line="96"/>
         <source>Stop</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.ui" line="103"/>
+        <location filename="find_widgets/find_widget.ui" line="103"/>
         <source>Clear</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.ui" line="47"/>
+        <location filename="find_widgets/find_widget.ui" line="47"/>
         <source>Search in:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="42"/>
+        <location filename="find_widgets/find_widget.cpp" line="42"/>
         <source>&amp;Icons</source>
         <oldsource>Icons</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="44"/>
+        <location filename="find_widgets/find_widget.cpp" line="44"/>
         <source>&amp;List</source>
         <oldsource>List</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="46"/>
+        <location filename="find_widgets/find_widget.cpp" line="46"/>
         <source>&amp;Detail</source>
         <oldsource>Detail</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="48"/>
+        <location filename="find_widgets/find_widget.cpp" line="48"/>
         <source>&amp;Customize Columns</source>
         <oldsource>Customize Columns</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="49"/>
+        <location filename="find_widgets/find_widget.cpp" line="49"/>
         <source>&amp;Description Bar</source>
         <oldsource>Description Bar</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="84"/>
+        <location filename="find_widgets/find_widget.cpp" line="84"/>
         <source>Find results</source>
         <translation></translation>
     </message>
@@ -1260,36 +1671,92 @@
 <context>
     <name>FoundPolicyImpl</name>
     <message>
-        <location filename="console_impls/found_policy_impl.cpp" line="38"/>
+        <location filename="console_impls/found_policy_impl.cpp" line="40"/>
         <source>Add link...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="console_impls/found_policy_impl.cpp" line="39"/>
+        <location filename="console_impls/found_policy_impl.cpp" line="41"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FsmoTableWidget</name>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.ui" line="38"/>
+        <source>FSMO roles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="22"/>
+        <source>FSMO role</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="22"/>
+        <source>Host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="22"/>
+        <source>Role capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="62"/>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="129"/>
+        <source>Capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="68"/>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="89"/>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="121"/>
+        <source>Captured</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="111"/>
+        <source>FSMO capture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="111"/>
+        <source>Take over the role </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/domain_info_results_widget/fsmo_table_widget.cpp" line="127"/>
+        <source>Failed to capture role</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GeneralComputerTab</name>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="36"/>
+        <location filename="tabs/general_computer_tab.ui" line="48"/>
         <source>Logon name (pre-Windows 2000):</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="43"/>
+        <location filename="tabs/general_computer_tab.ui" line="55"/>
         <source>DNS Host Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="57"/>
+        <location filename="tabs/general_computer_tab.ui" line="69"/>
         <source>Description:</source>
         <oldsource>Description</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="67"/>
+        <location filename="tabs/general_computer_tab.ui" line="79"/>
         <source>Location:</source>
         <translation></translation>
     </message>
@@ -1297,33 +1764,33 @@
 <context>
     <name>GeneralGroupTab</name>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="36"/>
+        <location filename="tabs/general_group_tab.ui" line="48"/>
         <source>Group name (pre-Windows 2000):</source>
         <oldsource>Logon name (pre-Windows 2000):</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="57"/>
+        <location filename="tabs/general_group_tab.ui" line="69"/>
         <source>Description:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="67"/>
+        <location filename="tabs/general_group_tab.ui" line="79"/>
         <source>E-mail:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="77"/>
+        <location filename="tabs/general_group_tab.ui" line="89"/>
         <source>Notes:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="87"/>
+        <location filename="tabs/general_group_tab.ui" line="99"/>
         <source>Group Scope:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="94"/>
+        <location filename="tabs/general_group_tab.ui" line="106"/>
         <source>Group Type:</source>
         <translation></translation>
     </message>
@@ -1331,32 +1798,32 @@
 <context>
     <name>GeneralOUTab</name>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="36"/>
+        <location filename="tabs/general_ou_tab.ui" line="48"/>
         <source>Description:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="46"/>
+        <location filename="tabs/general_ou_tab.ui" line="58"/>
         <source>Street Address:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="56"/>
+        <location filename="tabs/general_ou_tab.ui" line="68"/>
         <source>City:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="66"/>
+        <location filename="tabs/general_ou_tab.ui" line="78"/>
         <source>State/Province:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="76"/>
+        <location filename="tabs/general_ou_tab.ui" line="88"/>
         <source>ZIP/Postal Code:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="86"/>
+        <location filename="tabs/general_ou_tab.ui" line="98"/>
         <source>Country:</source>
         <translation></translation>
     </message>
@@ -1382,7 +1849,7 @@
 <context>
     <name>GeneralOtherTab</name>
     <message>
-        <location filename="tabs/general_other_tab.ui" line="36"/>
+        <location filename="tabs/general_other_tab.ui" line="48"/>
         <source>Description:</source>
         <translation></translation>
     </message>
@@ -1390,27 +1857,27 @@
 <context>
     <name>GeneralPolicyTab</name>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="36"/>
+        <location filename="tabs/general_policy_tab.ui" line="48"/>
         <source>Created:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="50"/>
+        <location filename="tabs/general_policy_tab.ui" line="62"/>
         <source>Modified:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="64"/>
+        <location filename="tabs/general_policy_tab.ui" line="76"/>
         <source>User version:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="78"/>
+        <location filename="tabs/general_policy_tab.ui" line="90"/>
         <source>Computer version:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="92"/>
+        <location filename="tabs/general_policy_tab.ui" line="104"/>
         <source>Unique ID:</source>
         <translation></translation>
     </message>
@@ -1426,16 +1893,39 @@
 <context>
     <name>GeneralSharedFolderTab</name>
     <message>
-        <location filename="tabs/general_shared_folder_tab.ui" line="36"/>
+        <location filename="tabs/general_shared_folder_tab.ui" line="48"/>
         <source>Description:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_shared_folder_tab.ui" line="46"/>
+        <location filename="tabs/general_shared_folder_tab.ui" line="58"/>
         <source>Keywords</source>
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>GeneralSiteTab</name>
+    <message>
+        <location filename="tabs/general_site_tab.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="tabs/general_site_tab.ui" line="23"/>
+        <source>PLACEHOLDER</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/general_site_tab.ui" line="42"/>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/general_site_tab.ui" line="52"/>
+        <source>Subnets:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GeneralUserMultiTab</name>
     <message>
@@ -1482,73 +1972,341 @@
 <context>
     <name>GeneralUserTab</name>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="36"/>
+        <location filename="tabs/general_user_tab.ui" line="48"/>
         <source>Description:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="46"/>
+        <location filename="tabs/general_user_tab.ui" line="58"/>
         <source>First Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="56"/>
+        <location filename="tabs/general_user_tab.ui" line="68"/>
         <source>Last Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="66"/>
+        <location filename="tabs/general_user_tab.ui" line="78"/>
         <source>Display Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="76"/>
+        <location filename="tabs/general_user_tab.ui" line="88"/>
         <source>Initials:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="86"/>
-        <source>E-mail Address:</source>
-        <translation></translation>
+        <location filename="tabs/general_user_tab.ui" line="98"/>
+        <source>E-mail Address:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/general_user_tab.ui" line="108"/>
+        <source>Office Location:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/general_user_tab.ui" line="118"/>
+        <source>Telephone Number:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/general_user_tab.ui" line="125"/>
+        <source>Web Page Address:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/general_user_tab.ui" line="137"/>
+        <location filename="tabs/general_user_tab.ui" line="151"/>
+        <source>Other...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/general_user_tab.ui" line="163"/>
+        <source>Middle Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupPolicyTab</name>
+    <message>
+        <location filename="tabs/group_policy_tab.ui" line="26"/>
+        <source>Inherited Policies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/group_policy_tab.cpp" line="48"/>
+        <source>Block policy inheritance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HexNumberAttributeDialog</name>
+    <message>
+        <location filename="attribute_dialogs/hex_number_attribute_dialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_dialogs/hex_number_attribute_dialog.ui" line="29"/>
+        <source>0x</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InheritedPoliciesWidget</name>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp" line="48"/>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp" line="49"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp" line="50"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KrbAuthDialog</name>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="26"/>
+        <source>Kerberos authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="55"/>
+        <source>Principal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="74"/>
+        <source>user@REALM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="81"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="98"/>
+        <source>Show password</source>
+        <translation type="unfinished">Show password</translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="119"/>
+        <source>Ticket available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="139"/>
+        <source>Use system credentials</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="145"/>
+        <source>System cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="189"/>
+        <source>Sign in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="210"/>
+        <source>PLACEHOLDER</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="220"/>
+        <source>Remember credentials</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="89"/>
+        <source>Enter your Kerberos principal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="94"/>
+        <source>Account already in use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="99"/>
+        <source>Enter the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="140"/>
+        <source>Authentication failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="197"/>
+        <source>Failed to find system credentials</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LAPSTab</name>
+    <message>
+        <location filename="tabs/laps_tab.ui" line="22"/>
+        <source>Password:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_tab.ui" line="36"/>
+        <source>Password expires:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_tab.ui" line="63"/>
+        <source>Reset expiry</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>LAPSV2Tab</name>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="92"/>
+        <source>LAPS local admin account password:</source>
+        <translation>LAPS local admin account password:</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="132"/>
+        <source>Current LAPS password expiration:</source>
+        <translation>Current LAPS password expiration:</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="99"/>
+        <source>Local Administrator Password Solution</source>
+        <translation>Local Administrator Password Solution</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="139"/>
+        <source>Set new LAPS password expiration:</source>
+        <translation>Set new LAPS password expiration:</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="119"/>
+        <source>Show password</source>
+        <translation>Show password</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="55"/>
+        <source>Expire now</source>
+        <translation>Expire now</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="42"/>
+        <source>Copy password</source>
+        <translation>Copy password</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.ui" line="35"/>
+        <source>LAPS local admin account name:</source>
+        <translation>LAPS local admin account name:</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.cpp" line="84"/>
+        <source>Failed to decode LAPS data.</source>
+        <translation>Failed to decode LAPS data.</translation>
+    </message>
+    <message>
+        <location filename="tabs/laps_v2_tab.cpp" line="84"/>
+        <source>Verify that you have the necessary permissions to access LAPS attributes!</source>
+        <translation>Verify that you have the necessary permissions to access LAPS attributes!</translation>
+    </message>
+</context>
+<context>
+    <name>LinkedPoliciesWidget</name>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="36"/>
+        <source>Remove link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="37"/>
+        <source>Move up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="38"/>
+        <source>Move down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="39"/>
+        <source>Set all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="40"/>
+        <source>Unset all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="41"/>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="54"/>
+        <source>Order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="96"/>
-        <source>Office Location:</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="55"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="106"/>
-        <source>Telephone Number:</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="56"/>
+        <source>Enforced</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="113"/>
-        <source>Web Page Address:</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="57"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="125"/>
-        <location filename="tabs/general_user_tab.ui" line="139"/>
-        <source>Other...</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="126"/>
+        <source>Organizational unit </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>LAPSTab</name>
     <message>
-        <location filename="tabs/laps_tab.ui" line="22"/>
-        <source>Password:</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="126"/>
+        <source>&apos;s link orders have been succesfuly changed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/laps_tab.ui" line="36"/>
-        <source>Password expires:</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="393"/>
+        <source>Not found</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/laps_tab.ui" line="63"/>
-        <source>Reset expiry</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="423"/>
+        <source>The GPO for this link could not be found. It maybe have been recently created and is being replicated or it could have been deleted.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1592,86 +2350,33 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_edits/logon_computers_dialog.ui" line="22"/>
-        <source>New value:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_computers_dialog.ui" line="55"/>
-        <source>Add</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_computers_dialog.ui" line="62"/>
-        <source>Remove</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_computers_dialog.ui" line="34"/>
-        <source>Values:</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>LogonHoursDialog</name>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="14"/>
-        <source>Edit Logon Hours</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="79"/>
-        <source>Logon allowed:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="102"/>
-        <source>Logon denied:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="42"/>
-        <source>Sunday</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="43"/>
-        <source>Monday</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="44"/>
-        <source>Tuesday</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="45"/>
-        <source>Wednesday</source>
-        <translation></translation>
+        <location filename="attribute_edits/logon_computers_dialog.ui" line="20"/>
+        <source>On all computers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="46"/>
-        <source>Thursday</source>
-        <translation></translation>
+        <location filename="attribute_edits/logon_computers_dialog.ui" line="37"/>
+        <source>Only on specified computers</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="47"/>
-        <source>Friday</source>
-        <translation></translation>
+        <location filename="attribute_edits/logon_computers_dialog.ui" line="65"/>
+        <source>In the &apos;Computer Name&apos; field, enter the NetBIOS name or domain name (DNS name) of the computer.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="48"/>
-        <source>Saturday</source>
-        <translation></translation>
+        <location filename="attribute_edits/logon_computers_dialog.ui" line="77"/>
+        <source>Computer name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="47"/>
-        <source>Local time</source>
+        <location filename="attribute_edits/logon_computers_dialog.ui" line="128"/>
+        <source>Add</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="40"/>
-        <source>UTC time</source>
+        <location filename="attribute_edits/logon_computers_dialog.ui" line="135"/>
+        <source>Remove</source>
         <translation></translation>
     </message>
 </context>
@@ -1684,314 +2389,371 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="38"/>
+        <location filename="main_window.ui" line="39"/>
         <source>&amp;Action</source>
         <oldsource>Action</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="43"/>
+        <location filename="main_window.ui" line="44"/>
         <source>&amp;View</source>
         <oldsource>View</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="59"/>
+        <location filename="main_window.ui" line="48"/>
+        <source>&amp;Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="66"/>
         <source>&amp;Preferences</source>
         <oldsource>Preferences</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="63"/>
+        <location filename="main_window.ui" line="70"/>
         <source>&amp;Language</source>
         <oldsource>Language</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="76"/>
+        <location filename="main_window.ui" line="86"/>
         <source>&amp;Help</source>
         <oldsource>Help</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="95"/>
+        <location filename="main_window.ui" line="105"/>
         <source>Tool Bar</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="116"/>
+        <location filename="main_window.ui" line="132"/>
         <source>Message Log</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="129"/>
+        <location filename="main_window.ui" line="145"/>
         <source>&amp;Connection Options</source>
         <oldsource>Connection Options</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="134"/>
+        <location filename="main_window.ui" line="150"/>
         <source>&amp;Quit</source>
         <oldsource>Quit</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="137"/>
+        <location filename="main_window.ui" line="153"/>
         <source>Ctrl+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="146"/>
+        <location filename="main_window.ui" line="162"/>
         <source>&amp;Manual</source>
         <oldsource>Manual</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="149"/>
+        <location filename="main_window.ui" line="165"/>
         <source>Manual (Alt + 8)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="152"/>
+        <location filename="main_window.ui" line="168"/>
         <source>Alt+8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="157"/>
+        <location filename="main_window.ui" line="173"/>
         <source>&amp;Changelog</source>
         <oldsource>Changelog</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="162"/>
+        <location filename="main_window.ui" line="178"/>
         <source>&amp;About ADMC</source>
         <oldsource>About ADMC</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="170"/>
+        <location filename="main_window.ui" line="186"/>
         <source>&amp;Icons</source>
         <oldsource>Icons</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="178"/>
+        <location filename="main_window.ui" line="194"/>
         <source>&amp;List</source>
         <oldsource>List</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="186"/>
+        <location filename="main_window.ui" line="202"/>
         <source>&amp;Detail</source>
         <oldsource>Detail</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="210"/>
+        <location filename="main_window.ui" line="226"/>
         <source>&amp;Console Tree</source>
         <oldsource>Console Tree</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="218"/>
+        <location filename="main_window.ui" line="234"/>
         <source>Description &amp;Bar</source>
         <oldsource>Description Bar</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="223"/>
+        <location filename="main_window.ui" line="239"/>
         <source>C&amp;ustomize Columns...</source>
         <oldsource>Customize Columns...</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="228"/>
+        <location filename="main_window.ui" line="244"/>
         <source>&amp;Filter Objects...</source>
         <oldsource>Filter Objects...</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="236"/>
+        <location filename="main_window.ui" line="252"/>
         <source>&amp;Advanced Features</source>
         <oldsource>Advanced Features</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="244"/>
+        <location filename="main_window.ui" line="260"/>
         <source>&amp;Confirm Actions</source>
         <oldsource>Confirm Actions</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="252"/>
+        <location filename="main_window.ui" line="268"/>
         <source>&amp;Put Last Name Before First Name</source>
         <oldsource>Put Last Name Before First Name</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="260"/>
+        <location filename="main_window.ui" line="276"/>
         <source>&amp;Log Searches</source>
         <oldsource>Log Searches</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="268"/>
+        <location filename="main_window.ui" line="284"/>
         <source>&amp;Timestamps in Message Log</source>
         <oldsource>Timestamps in Message Log</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="276"/>
+        <location filename="main_window.ui" line="292"/>
         <source>&amp;Show Non-Container Objects in Console Tree</source>
         <oldsource>Show Non-Container Objects in Console Tree</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="300"/>
+        <location filename="main_window.ui" line="316"/>
         <source>Navigate Back (Alt + -)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="315"/>
+        <location filename="main_window.ui" line="331"/>
         <source>Navigate Forward (Alt + =)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="330"/>
+        <location filename="main_window.ui" line="346"/>
         <source>Refresh (Alt + 9)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="333"/>
+        <location filename="main_window.ui" line="349"/>
         <source>Alt+9</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="341"/>
+        <location filename="main_window.ui" line="357"/>
         <source>Show Login</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="346"/>
+        <location filename="main_window.ui" line="362"/>
         <source>&amp;Operations Masters</source>
         <oldsource>Operations Masters</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="355"/>
+        <location filename="main_window.ui" line="371"/>
         <source>Create user</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="358"/>
+        <location filename="main_window.ui" line="374"/>
         <source>Create user (Alt + 7)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="361"/>
+        <location filename="main_window.ui" line="377"/>
         <source>Alt+7</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="370"/>
+        <location filename="main_window.ui" line="386"/>
         <source>Create group</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="373"/>
+        <location filename="main_window.ui" line="389"/>
         <source>Create group (Alt  + 6)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="376"/>
+        <location filename="main_window.ui" line="392"/>
         <source>Alt+6</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="385"/>
+        <location filename="main_window.ui" line="401"/>
         <source>Create organization unit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="388"/>
+        <location filename="main_window.ui" line="404"/>
         <source>Create organization unit (Alt + 5)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="391"/>
+        <location filename="main_window.ui" line="407"/>
         <source>Alt+5</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="285"/>
+        <location filename="main_window.ui" line="415"/>
+        <source>Load optional attribute values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="423"/>
+        <source>Show middle name when creating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="431"/>
+        <source>Change user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="442"/>
+        <source>Use system credentials on start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="447"/>
+        <source>Logout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="455"/>
+        <source>Show login window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.ui" line="301"/>
         <source>Navigate Up</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="288"/>
+        <location filename="main_window.ui" line="304"/>
         <source>Alt+0</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="297"/>
+        <location filename="main_window.ui" line="313"/>
         <source>Navigate Back</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="303"/>
+        <location filename="main_window.ui" line="319"/>
         <source>Alt+-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="312"/>
+        <location filename="main_window.ui" line="328"/>
         <source>Navigate Forward</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="318"/>
+        <location filename="main_window.ui" line="334"/>
         <source>Alt+=</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="327"/>
+        <location filename="main_window.ui" line="343"/>
         <source>Refresh</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="227"/>
+        <location filename="main_window.cpp" line="88"/>
+        <location filename="main_window.cpp" line="595"/>
+        <source>Authentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.cpp" line="140"/>
+        <source>Connected to host </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.cpp" line="250"/>
         <source>Info</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="227"/>
+        <location filename="main_window.cpp" line="250"/>
         <source>Restart the app to switch to the selected language.</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="main_window.cpp" line="533"/>
+        <source>You are connected to DC without PDC-Emulator role</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main_window.cpp" line="576"/>
+        <source>Logged in successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindowConnectionError</name>
     <message>
         <location filename="main_window_connection_error.ui" line="14"/>
-        <source>Connection Error</source>
-        <translation></translation>
+        <source>Connection error</source>
+        <oldsource>Connection Error</oldsource>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="34"/>
+        <location filename="main_window_connection_error.ui" line="33"/>
         <source>Failed to connect to domain.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="69"/>
+        <location filename="main_window_connection_error.ui" line="68"/>
         <source>Retry</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="76"/>
+        <location filename="main_window_connection_error.ui" line="75"/>
         <source>Connection Options</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="83"/>
+        <location filename="main_window_connection_error.ui" line="82"/>
         <source>Quit</source>
         <translation></translation>
     </message>
@@ -2105,32 +2867,32 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="292"/>
+        <location filename="tabs/membership_tab.cpp" line="299"/>
         <source>Add Member</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="293"/>
+        <location filename="tabs/membership_tab.cpp" line="300"/>
         <source>Add to Group</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="335"/>
+        <location filename="tabs/membership_tab.cpp" line="342"/>
         <source>Can&apos;t remove because this group is a primary group to selected user.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="336"/>
+        <location filename="tabs/membership_tab.cpp" line="343"/>
         <source>Can&apos;t remove because selected group is a primary group to this user.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="341"/>
+        <location filename="tabs/membership_tab.cpp" line="348"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="412"/>
+        <location filename="tabs/membership_tab.cpp" line="419"/>
         <source>Primary group: </source>
         <translation></translation>
     </message>
@@ -2156,115 +2918,150 @@
 <context>
     <name>ObjectImpl</name>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="93"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="960"/>
         <source>User</source>
         <oldsource>&amp;User</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="94"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="961"/>
         <source>Computer</source>
         <oldsource>&amp;Computer</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="95"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="962"/>
         <source>OU</source>
         <oldsource>&amp;OU</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="96"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="963"/>
         <source>Group</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="97"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="964"/>
         <source>Shared Folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="98"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="965"/>
         <source>inetOrgPerson</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="99"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="966"/>
         <source>Contact</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="100"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="967"/>
         <source>Find...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="101"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="968"/>
         <source>Move...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="102"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="969"/>
         <source>Add to group...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="103"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="970"/>
         <source>Enable</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="104"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="971"/>
         <source>Disable</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="105"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="972"/>
         <source>Reset password</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="106"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="973"/>
         <source>Reset account</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="107"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="974"/>
         <source>Edit UPN suffixes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="109"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="976"/>
         <source>New</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="301"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="990"/>
+        <source>Create subnet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="991"/>
+        <source>Create site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="992"/>
+        <source>Create site link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="993"/>
+        <source>Create site link bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="204"/>
         <source> [Filtering enabled]</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="668"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="587"/>
         <source>Are you sure you want to delete this object?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="879"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="590"/>
+        <source>Are you sure you want to delete these objects?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="601"/>
+        <source> It contains other objects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="604"/>
+        <source> Containers to be deleted contain other objects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="662"/>
         <source>Add to Group</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="947"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="730"/>
         <source>Edit UPN Suffixes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="967"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="750"/>
         <source>Are you sure you want to reset this account?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="1262"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="171"/>
         <source>Query may be out of date</source>
         <translation></translation>
     </message>
@@ -2307,11 +3104,6 @@
         <source>Protect against deletion:</source>
         <translation></translation>
     </message>
-    <message>
-        <location filename="tabs/object_tab.ui" line="116"/>
-        <source>Block inheritance:</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>OctetAttributeDialog</name>
@@ -2336,27 +3128,27 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="181"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="180"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="185"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="184"/>
         <source>Input must be strings of 2 hexadecimal digits separated by spaces. Example: &quot;0a 00 b5 ff&quot;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="186"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="185"/>
         <source>Input must be strings of 8 binary digits separated by spaces. Example: &quot;01010010 01000010 01000010&quot;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="187"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="186"/>
         <source>Input must be strings of 3 decimal digits (0-255) separated by spaces. Example: &quot;010 000 191&quot;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="188"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="187"/>
         <source>Input must be strings of 3 octal digits (0-377) separated by spaces.. Example: &quot;070 343 301&quot;</source>
         <translation></translation>
     </message>
@@ -2415,14 +3207,135 @@
 <context>
     <name>OrganizationTabEdit</name>
     <message>
-        <location filename="tabs/organization_tab.cpp" line="73"/>
-        <source>Name</source>
-        <translation></translation>
+        <location filename="tabs/organization_tab.cpp" line="73"/>
+        <source>Name</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="tabs/organization_tab.cpp" line="74"/>
+        <source>Folder</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>PSOAppliedEdit</name>
+    <message>
+        <location filename="attribute_edits/pso_applied_edit.cpp" line="13"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/pso_applied_edit.cpp" line="37"/>
+        <source>Not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/pso_applied_edit.cpp" line="44"/>
+        <source> (directly)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/pso_applied_edit.cpp" line="47"/>
+        <source> (via group membership)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PSOEditWidget</name>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="17"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="38"/>
+        <source>Password Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="61"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="103"/>
+        <source>Minimum password length:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="154"/>
+        <source>Failed log on attempts allowed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="199"/>
+        <source>Minimum password age (days):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="253"/>
+        <source>Account lockout duration (mins):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="304"/>
+        <source>Enable complexity requirements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="317"/>
+        <source>Store passwords using reversible encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="350"/>
+        <source>Precedence:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="410"/>
+        <source>Password history length:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="458"/>
+        <source>Reset account lockout after (mins):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="509"/>
+        <source>Maximum password age (days):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="582"/>
+        <source>Apply to user/grop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="611"/>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="621"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.cpp" line="77"/>
+        <source>Global password settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.cpp" line="78"/>
+        <source>Password settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/organization_tab.cpp" line="74"/>
-        <source>Folder</source>
-        <translation></translation>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.cpp" line="205"/>
+        <source>Add applied users/group</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2467,62 +3380,108 @@
 <context>
     <name>PasswordEdit</name>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="73"/>
+        <location filename="attribute_edits/password_edit.cpp" line="72"/>
         <source>Passwords don&apos;t match!</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="67"/>
-        <location filename="attribute_edits/password_edit.cpp" line="74"/>
-        <location filename="attribute_edits/password_edit.cpp" line="83"/>
+        <location filename="attribute_edits/password_edit.cpp" line="66"/>
+        <location filename="attribute_edits/password_edit.cpp" line="73"/>
+        <location filename="attribute_edits/password_edit.cpp" line="81"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="66"/>
+        <location filename="attribute_edits/password_edit.cpp" line="65"/>
         <source>Password cannot be empty.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="82"/>
+        <location filename="attribute_edits/password_edit.cpp" line="80"/>
         <source>Password contains invalid characters</source>
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>PasswordSettingsImpl</name>
+    <message>
+        <location filename="console_impls/password_settings_impl.cpp" line="47"/>
+        <source>Create password settings object</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PermissionsWidget</name>
+    <message>
+        <location filename="permission_control_widgets/permissions_widget.cpp" line="40"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/permissions_widget.cpp" line="41"/>
+        <source>Allowed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/permissions_widget.cpp" line="42"/>
+        <source>Denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/permissions_widget.cpp" line="265"/>
+        <source>There are no rights for this class of objects</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PolicyImpl</name>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="53"/>
+        <location filename="console_impls/policy_impl.cpp" line="55"/>
         <source>Add link...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="54"/>
+        <location filename="console_impls/policy_impl.cpp" line="56"/>
         <source>Edit...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="101"/>
+        <location filename="console_impls/policy_impl.cpp" line="57"/>
+        <source>Enforced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="60"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="122"/>
         <source>Incorrect permissions detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="102"/>
+        <location filename="console_impls/policy_impl.cpp" line="123"/>
         <source>Permissions for this policy&apos;s GPT don&apos;t match the permissions for it&apos;s GPC object. Would you like to update GPT permissions?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="370"/>
+        <location filename="console_impls/policy_impl.cpp" line="450"/>
         <source>Are you sure you want to unlink this policy from the OU? Note that the actual policy object won&apos;t be deleted.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="438"/>
+        <location filename="console_impls/policy_impl.cpp" line="540"/>
+        <source>Are you sure you want to delete these policies and all their links?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="541"/>
         <source>Are you sure you want to delete this policy and all of it&apos;s links?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="352"/>
+        <location filename="console_impls/policy_impl.cpp" line="432"/>
         <source>Add Link</source>
         <translation></translation>
     </message>
@@ -2530,37 +3489,37 @@
 <context>
     <name>PolicyOUImpl</name>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="54"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="58"/>
         <source>Create OU</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="55"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="59"/>
         <source>Create a GPO and link to this OU</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="56"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="60"/>
         <source>Link existing GPO</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="57"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="61"/>
         <source>Find GPO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="58"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="62"/>
         <source>Block inheritance</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="112"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="114"/>
         <source>All policies</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="247"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="245"/>
         <source>Name</source>
         <translation></translation>
     </message>
@@ -2568,75 +3527,40 @@
 <context>
     <name>PolicyOUResultsWidget</name>
     <message>
-        <location filename="policy_ou_results_widget.cpp" line="71"/>
-        <source>Remove link</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="72"/>
-        <source>Move up</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="73"/>
-        <source>Move down</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="83"/>
-        <source>Order</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="84"/>
-        <source>Name</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="85"/>
-        <source>Enforced</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="86"/>
-        <source>Disabled</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="334"/>
-        <source>Not found</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/policy_ou_results_widget.cpp" line="36"/>
+        <source>Linked policies</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget.cpp" line="370"/>
-        <source>The GPO for this link could not be found. It maybe have been recently created and is being replicated or it could have been deleted.</source>
-        <translation></translation>
+        <location filename="results_widgets/policy_ou_results_widget/policy_ou_results_widget.cpp" line="39"/>
+        <source>Inherited policies</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PolicyResultsWidget</name>
     <message>
-        <location filename="policy_results_widget.cpp" line="74"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="75"/>
         <source>Delete link</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="82"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="83"/>
         <source>Location</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="83"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="84"/>
         <source>Enforced</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="84"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="85"/>
         <source>Disabled</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="85"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="86"/>
         <source>Path</source>
         <translation></translation>
     </message>
@@ -2644,7 +3568,7 @@
 <context>
     <name>PolicyRootImpl</name>
     <message>
-        <location filename="console_impls/policy_root_impl.cpp" line="78"/>
+        <location filename="console_impls/policy_root_impl.cpp" line="80"/>
         <source>Name</source>
         <translation></translation>
     </message>
@@ -2688,89 +3612,95 @@
 <context>
     <name>PropertiesDialog</name>
     <message>
-        <location filename="properties_dialog.ui" line="14"/>
-        <location filename="properties_dialog.cpp" line="137"/>
+        <location filename="properties_widgets/properties_dialog.ui" line="14"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="143"/>
         <source>Properties</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="135"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="141"/>
         <source>%1 Properties</source>
         <oldsource>&quot;%1&quot; Properties</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="169"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="181"/>
         <source>General</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="177"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="189"/>
         <source>Object</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="178"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="190"/>
         <source>Attributes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="196"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="208"/>
         <source>Account</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="189"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="201"/>
         <source>Organization</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="190"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="202"/>
         <source>Telephones</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="201"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="213"/>
         <source>Profile</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="239"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="239"/>
+        <source>Group policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="properties_widgets/properties_dialog.cpp" line="268"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="275"/>
         <source>LAPS</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="246"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="283"/>
         <source>Security</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="207"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="219"/>
         <source>Members</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="212"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="224"/>
         <source>Member of</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="222"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="234"/>
         <source>Managed by</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="228"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="245"/>
         <source>Operating System</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="217"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="229"/>
         <source>Delegation</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="188"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="200"/>
         <source>Address</source>
         <translation></translation>
     </message>
@@ -2778,33 +3708,33 @@
 <context>
     <name>PropertiesMultiDialog</name>
     <message>
-        <location filename="properties_multi_dialog.ui" line="14"/>
+        <location filename="properties_widgets/properties_multi_dialog.ui" line="14"/>
         <source>Properties for Multiple Objects</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="61"/>
-        <location filename="properties_multi_dialog.cpp" line="69"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="61"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="69"/>
         <source>General</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="62"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="62"/>
         <source>Account</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="63"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="63"/>
         <source>Address</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="64"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="64"/>
         <source>Profile</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="65"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="65"/>
         <source>Organization</source>
         <translation></translation>
     </message>
@@ -2812,17 +3742,17 @@
 <context>
     <name>PropertiesWarningDialog</name>
     <message>
-        <location filename="properties_warning_dialog.ui" line="14"/>
+        <location filename="properties_widgets/properties_warning_dialog.ui" line="14"/>
         <source>Warning</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_warning_dialog.cpp" line="35"/>
+        <location filename="properties_widgets/properties_warning_dialog.cpp" line="35"/>
         <source>You&apos;re switching to attributes tab, while another tab has unapplied changes. Choose to apply or discard those changes.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="properties_warning_dialog.cpp" line="36"/>
+        <location filename="properties_widgets/properties_warning_dialog.cpp" line="36"/>
         <source>You&apos;re switching from attributes tab, while it has unapplied changes. Choose to apply or discard those changes.</source>
         <translation></translation>
     </message>
@@ -2830,10 +3760,26 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="utils.cpp" line="111"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="609"/>
+        <location filename="utils.cpp" line="115"/>
         <source>Confirm action</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="622"/>
+        <source>Password settings container is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="973"/>
+        <source>Sites container is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="981"/>
+        <source>Sites</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="attribute_edits/account_option_edit.cpp" line="81"/>
         <source>Can&apos;t set &quot;%1&quot; when &quot;%2&quot; is set.</source>
@@ -2844,47 +3790,134 @@
         <source>Error</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="125"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="270"/>
+        <source>Creation is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="126"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="271"/>
+        <source>ADMC is connected to DC without the PDC-Emulator role - group policy creation is prohibited by the setting. Connect to PDC-Emulator?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="524"/>
+        <source>Deletion is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="525"/>
+        <source>ADMC is connected to DC without the PDC-Emulator role - group policy deletion is prohibited by the setting. Connect to PDC-Emulator?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="793"/>
+        <source>Edition is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="794"/>
+        <source>ADMC is connected to DC without the PDC-Emulator role - group policy editing is prohibited by the setting. Connect to PDC-Emulator?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/policy_impl.cpp" line="846"/>
+        <source>Failed to start GPUI. Check that it&apos;s installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_widget/console_widget.cpp" line="1022"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="fsmo/fsmo_utils.cpp" line="65"/>
+        <source>PDC-Emulator is connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="managers/icon_manager.cpp" line="367"/>
+        <source>Could not open a theme: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="managers/icon_manager.cpp" line="394"/>
+        <source> (System)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="managers/icon_manager.cpp" line="423"/>
+        <source>Theme from settings not found. System theme is set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="utils.cpp" line="474"/>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="utils.cpp" line="475"/>
+        <source>User configuration disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="utils.cpp" line="476"/>
+        <source>Computer configuration disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="utils.cpp" line="477"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="utils.cpp" line="478"/>
+        <source>Undefined GPO status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QueryFolderImpl</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="52"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="54"/>
         <source>Query folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="53"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="55"/>
         <source>Query item</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="55"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="57"/>
         <source>New</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="61"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="63"/>
         <source>Edit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="63"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="65"/>
         <source>&amp;Import query...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="263"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="288"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="265"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="290"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="263"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="265"/>
         <source>Can&apos;t cut and paste query folder into itself.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="288"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="290"/>
         <source>There&apos;s already an item with this name.</source>
         <translation></translation>
     </message>
@@ -2892,30 +3925,54 @@
 <context>
     <name>QueryItemImpl</name>
     <message>
-        <location filename="console_impls/query_item_impl.cpp" line="52"/>
+        <location filename="console_impls/query_item_impl.cpp" line="53"/>
         <source>Edit...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_item_impl.cpp" line="53"/>
+        <location filename="console_impls/query_item_impl.cpp" line="54"/>
         <source>Export query...</source>
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>ReadWritePermissionsWidget</name>
+    <message>
+        <location filename="permission_control_widgets/read_write_permissions_widget.cpp" line="94"/>
+        <source>Write </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/read_write_permissions_widget.cpp" line="94"/>
+        <location filename="permission_control_widgets/read_write_permissions_widget.cpp" line="97"/>
+        <source> property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/read_write_permissions_widget.cpp" line="97"/>
+        <source>Read </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/read_write_permissions_widget.cpp" line="100"/>
+        <source>Undefined</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>RenameGroupDialog</name>
     <message>
-        <location filename="rename_group_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_group_dialog.ui" line="14"/>
         <source>Rename Group</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="rename_group_dialog.ui" line="22"/>
+        <location filename="rename_dialogs/rename_group_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="rename_group_dialog.ui" line="32"/>
+        <location filename="rename_dialogs/rename_group_dialog.ui" line="32"/>
         <source>Group name (pre-Windows 2000):</source>
         <oldsource>Logon name (pre-Windows 2000):</oldsource>
         <translation></translation>
@@ -2924,12 +3981,12 @@
 <context>
     <name>RenameObjectHelper</name>
     <message>
-        <location filename="rename_object_helper.cpp" line="33"/>
+        <location filename="rename_object_helper.cpp" line="34"/>
         <source>Object %1 was renamed.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="rename_object_helper.cpp" line="38"/>
+        <location filename="rename_object_helper.cpp" line="39"/>
         <source>Failed to rename object %1</source>
         <translation></translation>
     </message>
@@ -2937,12 +3994,12 @@
 <context>
     <name>RenameOtherDialog</name>
     <message>
-        <location filename="rename_other_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_other_dialog.ui" line="14"/>
         <source>Rename Object</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="rename_other_dialog.ui" line="22"/>
+        <location filename="rename_dialogs/rename_other_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation></translation>
     </message>
@@ -2950,12 +4007,12 @@
 <context>
     <name>RenamePolicyDialog</name>
     <message>
-        <location filename="rename_policy_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_policy_dialog.ui" line="14"/>
         <source>Rename Policy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="rename_policy_dialog.ui" line="22"/>
+        <location filename="rename_dialogs/rename_policy_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation></translation>
     </message>
@@ -2963,53 +4020,172 @@
 <context>
     <name>RenameUserDialog</name>
     <message>
-        <location filename="rename_user_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="14"/>
         <source>Rename User</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="52"/>
-        <source>Display name:</source>
-        <oldsource>Display name</oldsource>
-        <translation></translation>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="52"/>
+        <source>Display name:</source>
+        <oldsource>Display name</oldsource>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="32"/>
+        <source>First name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="42"/>
+        <source>Last name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="22"/>
+        <source>Full name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="62"/>
+        <source>Logon name:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="79"/>
+        <source>Logon name (pre-Windows 2000):</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ResultsWidgetBase</name>
+    <message>
+        <location filename="results_widgets/results_widget_base.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="results_widgets/results_widget_base.ui" line="40"/>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/results_widget_base.ui" line="50"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/results_widget_base.ui" line="60"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SDDLViewDialog</name>
+    <message>
+        <location filename="permission_control_widgets/sddl_view_dialog.ui" line="14"/>
+        <source>SDDL view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/sddl_view_dialog.ui" line="44"/>
+        <source>Security descriptor (SDDL)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/sddl_view_dialog.ui" line="64"/>
+        <source>Show descriptor for current trustee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/sddl_view_dialog.cpp" line="45"/>
+        <source>Failed to get SDDL formatted security descriptor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/sddl_view_dialog.cpp" line="54"/>
+        <source>: Domain sid parse failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="permission_control_widgets/sddl_view_dialog.cpp" line="83"/>
+        <source>: SDDL encode failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SamNameEdit</name>
+    <message>
+        <location filename="attribute_edits/sam_name_edit.cpp" line="79"/>
+        <source>Input field for Logon name (pre-Windows 2000) contains one or more of the following illegal characters: @ &quot; [ ] : ; | = + * ? &lt; &gt; / \ ,</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/sam_name_edit.cpp" line="80"/>
+        <source>Error</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>ScheduleHoursDialog</name>
+    <message>
+        <location filename="attribute_edits/schedule_hours_dialog.ui" line="14"/>
+        <source>Edit Schedule Hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/schedule_hours_dialog.ui" line="40"/>
+        <source>UTC time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/schedule_hours_dialog.ui" line="47"/>
+        <source>Local time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/schedule_hours_dialog.ui" line="79"/>
+        <source>Logon allowed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/schedule_hours_dialog.ui" line="102"/>
+        <source>Logon denied:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="32"/>
-        <source>First name:</source>
-        <translation></translation>
+        <location filename="attribute_edits/schedule_hours_dialog.cpp" line="42"/>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="42"/>
-        <source>Last name:</source>
-        <translation></translation>
+        <location filename="attribute_edits/schedule_hours_dialog.cpp" line="43"/>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="22"/>
-        <source>Full name:</source>
-        <translation></translation>
+        <location filename="attribute_edits/schedule_hours_dialog.cpp" line="44"/>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="62"/>
-        <source>Logon name:</source>
-        <translation></translation>
+        <location filename="attribute_edits/schedule_hours_dialog.cpp" line="45"/>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="79"/>
-        <source>Logon name (pre-Windows 2000):</source>
-        <translation></translation>
+        <location filename="attribute_edits/schedule_hours_dialog.cpp" line="46"/>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SamNameEdit</name>
     <message>
-        <location filename="attribute_edits/sam_name_edit.cpp" line="79"/>
-        <source>Input field for Logon name (pre-Windows 2000) contains one or more of the following illegal characters: @ &quot; [ ] : ; | = + * ? &lt; &gt; / \ ,</source>
-        <translation></translation>
+        <location filename="attribute_edits/schedule_hours_dialog.cpp" line="47"/>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="attribute_edits/sam_name_edit.cpp" line="80"/>
-        <source>Error</source>
-        <translation></translation>
+        <location filename="attribute_edits/schedule_hours_dialog.cpp" line="48"/>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3038,57 +4214,114 @@
 <context>
     <name>SecurityTab</name>
     <message>
-        <location filename="tabs/security_tab.ui" line="51"/>
+        <location filename="tabs/security_tab.ui" line="20"/>
+        <source>Users and Groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.ui" line="70"/>
         <source>Add...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="58"/>
+        <location filename="tabs/security_tab.ui" line="77"/>
         <source>Add well-known trustee...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="65"/>
+        <location filename="tabs/security_tab.ui" line="84"/>
         <source>Remove</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="74"/>
+        <location filename="tabs/security_tab.ui" line="93"/>
         <source>Permissions</source>
         <translation></translation>
     </message>
-</context>
-<context>
-    <name>SecurityTabEdit</name>
     <message>
-        <location filename="tabs/security_tab.cpp" line="157"/>
-        <source>Name</source>
-        <translation></translation>
+        <location filename="tabs/security_tab.ui" line="105"/>
+        <source>Applied to: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="158"/>
-        <source>Allowed</source>
-        <translation></translation>
+        <location filename="tabs/security_tab.ui" line="131"/>
+        <source>Clear all</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="159"/>
-        <source>Denied</source>
-        <translation></translation>
+        <location filename="tabs/security_tab.ui" line="153"/>
+        <source>Common</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.ui" line="185"/>
+        <source>Extended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.ui" line="207"/>
+        <source>Creation/deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.ui" line="229"/>
+        <source>Read/write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.ui" line="251"/>
+        <source>Task delegation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.ui" line="293"/>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.cpp" line="130"/>
+        <source>Show descriptor in SDDL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.cpp" line="131"/>
+        <source>Rollback to the previous descriptor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.cpp" line="253"/>
+        <source>This object</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.cpp" line="254"/>
+        <source>This object and all child objects</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.cpp" line="255"/>
+        <source>All child objects</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="474"/>
+        <location filename="tabs/security_tab.cpp" line="285"/>
+        <source>Child objects: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/security_tab.cpp" line="418"/>
         <source>Add Trustee</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="586"/>
+        <location filename="tabs/security_tab.cpp" line="530"/>
         <source>Error</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="586"/>
+        <location filename="tabs/security_tab.cpp" line="530"/>
         <source>Failed to add some trustee&apos;s because they are already in the list.</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3116,21 +4349,26 @@
 <context>
     <name>SelectContainerDialog</name>
     <message>
-        <location filename="select_container_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_container_dialog.ui" line="14"/>
         <source>Select Container</source>
         <oldsource>Select a container</oldsource>
         <translation></translation>
     </message>
+    <message>
+        <location filename="select_dialogs/select_container_dialog.cpp" line="232"/>
+        <source>Failed to define suitable containers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectObjectAdvancedDialog</name>
     <message>
-        <location filename="select_object_advanced_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_object_advanced_dialog.ui" line="14"/>
         <source>Select Object</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_advanced_dialog.cpp" line="39"/>
+        <location filename="select_dialogs/select_object_advanced_dialog.cpp" line="39"/>
         <source>&amp;View</source>
         <translation></translation>
     </message>
@@ -3138,85 +4376,85 @@
 <context>
     <name>SelectObjectDialog</name>
     <message>
-        <location filename="select_object_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="14"/>
         <source>Select Object</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="84"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="84"/>
         <source>Add</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="85"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="85"/>
         <source>Name</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="86"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="86"/>
         <source>Type</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="87"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="87"/>
         <source>Folder</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="94"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="94"/>
         <source>Remove</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="101"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="101"/>
         <source>Advanced</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="22"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="22"/>
         <source>Classes:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="32"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="32"/>
         <source>Search in:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="42"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="42"/>
         <source>Name:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="54"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="54"/>
         <source>Selected objects:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="111"/>
-        <location filename="select_object_dialog.cpp" line="118"/>
-        <location filename="select_object_dialog.cpp" line="176"/>
-        <location filename="select_object_dialog.cpp" line="240"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="125"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="132"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="190"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="254"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="118"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="132"/>
         <source>You must select at least one object.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="176"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="190"/>
         <source>Failed to find any matches.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="240"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="254"/>
         <source>Selected object is already in the list.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="111"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="125"/>
         <source>This selection accepts only one object. Remove extra objects to proceed.</source>
         <translation></translation>
     </message>
@@ -3224,12 +4462,12 @@
 <context>
     <name>SelectObjectMatchDialog</name>
     <message>
-        <location filename="select_object_match_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_object_match_dialog.ui" line="14"/>
         <source>Select Match</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="select_object_match_dialog.ui" line="20"/>
+        <location filename="select_dialogs/select_object_match_dialog.ui" line="20"/>
         <source>There are multiple matches. Select one or more to add to the list.</source>
         <translation></translation>
     </message>
@@ -3237,7 +4475,7 @@
 <context>
     <name>SelectPolicyDialog</name>
     <message>
-        <location filename="select_policy_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_policy_dialog.ui" line="14"/>
         <source>Select Policy</source>
         <translation></translation>
     </message>
@@ -3250,6 +4488,122 @@
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>SitesLinkCommonWidget</name>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.ui" line="37"/>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.ui" line="63"/>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.ui" line="134"/>
+        <source>PLACEHOLDER</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.ui" line="100"/>
+        <source>Add &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.ui" line="107"/>
+        <source>&lt;&lt; Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="47"/>
+        <source>Sites not in this site link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="48"/>
+        <source>Sites in this site link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="50"/>
+        <source>Site links not included in this bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="51"/>
+        <source>Site links included in this bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SitesLinkEdit</name>
+    <message>
+        <location filename="attribute_edits/sites_link_edit.cpp" line="124"/>
+        <source>Site link object must link at least two sites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/sites_link_edit.cpp" line="125"/>
+        <source>Link bridge object must link at least two site links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_edits/sites_link_edit.cpp" line="126"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SitesLinkGeneralTab</name>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_general_tab.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_general_tab.ui" line="20"/>
+        <source>PLACEHOLDER</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SitesLinkPartWidget</name>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_part_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_part_widget.ui" line="22"/>
+        <source>Cost:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_part_widget.ui" line="53"/>
+        <source>Replicate every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_part_widget.ui" line="67"/>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_part_widget.ui" line="91"/>
+        <source>Change the schedule ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SitesLinkWidget</name>
+    <message>
+        <location filename="tabs/sites_link_tab/sites_link_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+</context>
 <context>
     <name>StringListEdit</name>
     <message>
@@ -3266,6 +4620,34 @@
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>SubnetEditWidget</name>
+    <message>
+        <location filename="results_widgets/subnet_results_widget/subnet_edit_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="results_widgets/subnet_results_widget/subnet_edit_widget.ui" line="41"/>
+        <source>Sites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/subnet_results_widget/subnet_edit_widget.ui" line="48"/>
+        <source>Prefix:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/subnet_results_widget/subnet_edit_widget.ui" line="58"/>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="results_widgets/subnet_results_widget/subnet_edit_widget.ui" line="65"/>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>TelephonesTab</name>
     <message>
@@ -3308,6 +4690,19 @@
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>TimeSpanAttributeDialog</name>
+    <message>
+        <location filename="attribute_dialogs/time_span_attribute_dialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_dialogs/time_span_attribute_dialog.ui" line="27"/>
+        <source>d:hh:mm:ss or (never) / (none)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>UnlockEdit</name>
     <message>
@@ -3338,7 +4733,7 @@
 <context>
     <name>country_widget</name>
     <message>
-        <location filename="attribute_edits/country_combo.cpp" line="192"/>
+        <location filename="attribute_edits/country_combo.cpp" line="191"/>
         <source>None</source>
         <translation></translation>
     </message>
@@ -3346,7 +4741,7 @@
 <context>
     <name>object_impl</name>
     <message numerus="yes">
-        <location filename="console_impls/object_impl.cpp" line="1705"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="631"/>
         <source>%n object(s)</source>
         <translation>
             <numerusform>%n object</numerusform>
@@ -3357,20 +4752,28 @@
 <context>
     <name>object_impl.cpp</name>
     <message>
-        <location filename="search_thread.cpp" line="108"/>
+        <location filename="search_thread.cpp" line="103"/>
         <source>Failed to connect to server while searching for objects.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="search_thread.cpp" line="110"/>
+        <location filename="search_thread.cpp" line="105"/>
         <source>Could not load all objects. Increase object display limit in Filter Options or reduce number of objects by applying a filter. Filter Options is accessible from main window&apos;s menubar via the &quot;View&quot; menu.</source>
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>password_settings_impl</name>
+    <message>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="617"/>
+        <source>Password settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>policy_root_impl</name>
     <message>
-        <location filename="console_impls/policy_root_impl.cpp" line="88"/>
+        <location filename="console_impls/policy_root_impl.cpp" line="90"/>
         <source>Group Policy Objects</source>
         <translation></translation>
     </message>
@@ -3378,7 +4781,7 @@
 <context>
     <name>query</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="343"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="357"/>
         <source>Saved Queries</source>
         <translation></translation>
     </message>
@@ -3386,30 +4789,36 @@
 <context>
     <name>query.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="545"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="560"/>
         <source>Name may not be empty</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="324"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="546"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="556"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="559"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="325"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="339"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="561"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="571"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="574"/>
         <source>Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="555"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="320"/>
+        <source>Could not open a query file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="console_impls/query_folder_impl.cpp" line="570"/>
         <source>There&apos;s already an item with this name.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="558"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="573"/>
         <source>Names cannot contain &quot;/&quot;.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="323"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="335"/>
         <source>Query file is corrupted.</source>
         <translation></translation>
     </message>
@@ -3417,12 +4826,12 @@
 <context>
     <name>query_folder.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="468"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="483"/>
         <source>Name</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="469"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="484"/>
         <source>Description</source>
         <translation></translation>
     </message>
@@ -3430,7 +4839,7 @@
 <context>
     <name>query_folder_impl.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="574"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="589"/>
         <source>Are you sure you want to delete this item?</source>
         <translation></translation>
     </message>
@@ -3438,18 +4847,18 @@
 <context>
     <name>query_item_impl.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="301"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="304"/>
         <source>Import Query</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="303"/>
-        <location filename="console_impls/query_item_impl.cpp" line="174"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="308"/>
+        <location filename="console_impls/query_item_impl.cpp" line="175"/>
         <source>JSON (*.json)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="console_impls/query_item_impl.cpp" line="172"/>
+        <location filename="console_impls/query_item_impl.cpp" line="173"/>
         <source>Export Query</source>
         <translation></translation>
     </message>
@@ -3457,72 +4866,14 @@
 <context>
     <name>utils.cpp</name>
     <message>
-        <location filename="utils.cpp" line="442"/>
+        <location filename="utils.cpp" line="381"/>
         <source>Input field for Name contains one or more of the following illegal characters: # , + &quot; \ &lt; &gt; ; = (leading space) (trailing space) (leading question mark)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="utils.cpp" line="443"/>
+        <location filename="utils.cpp" line="388"/>
         <source>Error</source>
         <translation></translation>
     </message>
 </context>
-<context>
-    <name>LAPSV2Tab</name>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="22"/>
-        <source>LAPS local admin account password:</source>
-        <translation>LAPS local admin account password:</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="29"/>
-        <source>Current LAPS password expiration:</source>
-        <translation>Current LAPS password expiration:</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="36"/>
-        <source>Local Administrator Password Solution</source>
-        <translation>Local Administrator Password Solution</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="43"/>
-        <source>Set new LAPS password expiration:</source>
-        <translation>Set new LAPS password expiration:</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="87"/>
-        <source>Show password</source>
-        <translation>Show password</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="106"/>
-        <source>Expire now</source>
-        <translation>Expire now</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="126"/>
-        <source>Copy password</source>
-        <translation>Copy password</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.ui" line="133"/>
-        <source>LAPS local admin account name:</source>
-        <translation>LAPS local admin account name:</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.cpp" line="84"/>
-        <source>Failed to decode LAPS data.</source>
-        <translation>Failed to decode LAPS data.</translation>
-    </message>
-    <message>
-        <location filename="tabs/laps_v2_tab.cpp" line="84"/>
-        <source>Verify that you have the necessary permissions to access LAPS attributes!</source>
-        <translation>Verify that you have the necessary permissions to access LAPS attributes!</translation>
-    </message>
-</context>
 </TS>
diff --git a/src/admc/admc_ru.ts b/src/admc/admc_ru.ts
index e654f5b15..a55453a8b 100644
--- a/src/admc/admc_ru.ts
+++ b/src/admc/admc_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -106,47 +106,47 @@
         <translation>Параметры учётной записи:</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="145"/>
+        <location filename="tabs/account_tab.ui" line="161"/>
         <source>Account disabled</source>
         <translation>Учётная запись отключена</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="152"/>
+        <location filename="tabs/account_tab.ui" line="168"/>
         <source>User cannot change password</source>
         <translation>Пользователь не может изменить пароль</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="159"/>
+        <location filename="tabs/account_tab.ui" line="175"/>
         <source>User must change password on next logon</source>
         <translation>Пользователь должен сменить пароль при следующем входе в систему</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="166"/>
+        <location filename="tabs/account_tab.ui" line="182"/>
         <source>Don&apos;t expire password</source>
         <translation>Пароль не истекает</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="173"/>
+        <location filename="tabs/account_tab.ui" line="189"/>
         <source>Store password using reversible encryption</source>
         <translation>Хранить пароль с использованием обратимого шифрования</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="180"/>
+        <location filename="tabs/account_tab.ui" line="196"/>
         <source>Smartcard is required for interactive logon</source>
         <translation>Смарт-карта необходима для интерактивного входа в систему</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="187"/>
+        <location filename="tabs/account_tab.ui" line="203"/>
         <source>Account is sensitive and cannot be delegated</source>
         <translation>Учётная запись является конфиденциальной и не может быть делегирована</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="194"/>
+        <location filename="tabs/account_tab.ui" line="210"/>
         <source>Use Kerberos DES encryption types for this account</source>
         <translation>Использовать Kerberos DES тип шифрования для этой учетной записи</translation>
     </message>
     <message>
-        <location filename="tabs/account_tab.ui" line="201"/>
+        <location filename="tabs/account_tab.ui" line="217"/>
         <source>Don&apos;t require Kerberos pre-authentication</source>
         <translation>Не требовать предварительной аутентификации Kerberos</translation>
     </message>
@@ -225,41 +225,36 @@
 <context>
     <name>AllPoliciesFolderImpl</name>
     <message>
-        <location filename="console_impls/all_policies_folder_impl.cpp" line="42"/>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="45"/>
         <source>Create policy</source>
         <translation>Создать политику</translation>
     </message>
     <message>
-        <location filename="console_impls/all_policies_folder_impl.cpp" line="102"/>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="105"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
-    <message>
-        <location filename="console_impls/all_policies_folder_impl.cpp" line="130"/>
-        <source>PDC-Emulator is connected</source>
-        <translation>Подключено к PDC-Emulator</translation>
-    </message>
 </context>
 <context>
     <name>AttributeDialog</name>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="112"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="137"/>
         <source>View</source>
         <translation>Просмотреть</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="114"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="139"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="123"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="148"/>
         <source>%1 Multi-Valued %2</source>
         <comment>This is a dialog title for attribute editors. Example: &quot;Edit Multi-Valued String&quot;</comment>
         <translation>%1 %2 (Многозначный)</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/attribute_dialog.cpp" line="149"/>
+        <location filename="attribute_dialogs/attribute_dialog.cpp" line="174"/>
         <source>Attribute: %1</source>
         <translation>Атрибут: %1</translation>
     </message>
@@ -295,17 +290,17 @@
 <context>
     <name>AttributesTabEdit</name>
     <message>
-        <location filename="tabs/attributes_tab.cpp" line="62"/>
+        <location filename="tabs/attributes_tab.cpp" line="67"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="tabs/attributes_tab.cpp" line="63"/>
+        <location filename="tabs/attributes_tab.cpp" line="68"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location filename="tabs/attributes_tab.cpp" line="64"/>
+        <location filename="tabs/attributes_tab.cpp" line="69"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
@@ -314,19 +309,6 @@
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
-    <message>
-        <source>Edit</source>
-        <translation type="vanished">Изменить</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="vanished">Просмотреть</translation>
-    </message>
-    <message>
-        <source>%1 Multi-Valued %2</source>
-        <comment>This is a dialog title for attribute editors. Example: &quot;Edit Multi-Valued String&quot;</comment>
-        <translation type="vanished">%1 %2 (Многозначный)</translation>
-    </message>
 </context>
 <context>
     <name>AttributesTabFilterMenu</name>
@@ -392,7 +374,7 @@
         <translation>Журнал изменений</translation>
     </message>
     <message>
-        <location filename="changelog_dialog.cpp" line="39"/>
+        <location filename="changelog_dialog.cpp" line="40"/>
         <source>Failed to open changelog file.</source>
         <translation>Не удалось открыть файл журнала изменений.</translation>
     </message>
@@ -483,19 +465,11 @@
         <source>Restore defaults</source>
         <translation>По умолчанию</translation>
     </message>
-    <message>
-        <source>Host:</source>
-        <translation type="vanished">Хост:</translation>
-    </message>
     <message>
         <location filename="connection_options_dialog.ui" line="134"/>
         <source>No hosts found.</source>
         <translation>Хосты не найдены.</translation>
     </message>
-    <message>
-        <source>Select:</source>
-        <translation type="vanished">Выбрать:</translation>
-    </message>
     <message>
         <location filename="connection_options_dialog.ui" line="97"/>
         <source>Custom:</source>
@@ -506,10 +480,6 @@
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
-    <message>
-        <source>Select or enter a host.</source>
-        <translation type="vanished">Выберите или введите хост.</translation>
-    </message>
     <message>
         <location filename="connection_options_dialog.cpp" line="38"/>
         <source>never</source>
@@ -541,12 +511,12 @@
         <translation>Выберите хост.</translation>
     </message>
     <message>
-        <location filename="connection_options_dialog.cpp" line="191"/>
+        <location filename="connection_options_dialog.cpp" line="192"/>
         <source>You are connected to DC without PDC-Emulator role. Group policy editing is prohibited by the setting.</source>
         <translation>Вы подключены к КД без роли PDC-Emulator - редактирование групповых политик запрещено настройкой.</translation>
     </message>
     <message>
-        <location filename="connection_options_dialog.cpp" line="194"/>
+        <location filename="connection_options_dialog.cpp" line="195"/>
         <source>You are connected to DC without PDC-Emulator role. Group policy editing is available.</source>
         <translation>Вы подключены к КД без роли PDC-Emulator - редактирование групповых политик доступно.</translation>
     </message>
@@ -587,42 +557,42 @@
 <context>
     <name>ConsoleWidget</name>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="137"/>
+        <location filename="console_widget/console_widget.cpp" line="133"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="138"/>
+        <location filename="console_widget/console_widget.cpp" line="134"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="139"/>
+        <location filename="console_widget/console_widget.cpp" line="135"/>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="140"/>
+        <location filename="console_widget/console_widget.cpp" line="136"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="141"/>
+        <location filename="console_widget/console_widget.cpp" line="137"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="142"/>
+        <location filename="console_widget/console_widget.cpp" line="138"/>
         <source>Print</source>
         <translation>Напечатать</translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="143"/>
+        <location filename="console_widget/console_widget.cpp" line="139"/>
         <source>Refresh</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="console_widget/console_widget.cpp" line="144"/>
+        <location filename="console_widget/console_widget.cpp" line="140"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
@@ -630,17 +600,17 @@
 <context>
     <name>CreateComputerDialog</name>
     <message>
-        <location filename="create_computer_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_computer_dialog.ui" line="14"/>
         <source>Create Computer</source>
         <translation>Создать рабочую станцию</translation>
     </message>
     <message>
-        <location filename="create_computer_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_computer_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="create_computer_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_computer_dialog.ui" line="32"/>
         <source>Logon name (pre-Windows 2000):</source>
         <translation>Имя для входа (до Windows 2000):</translation>
     </message>
@@ -648,32 +618,32 @@
 <context>
     <name>CreateContactDialog</name>
     <message>
-        <location filename="create_contact_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="14"/>
         <source>Create Contact</source>
         <translation>Создать контакт</translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="22"/>
         <source>First name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="29"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="29"/>
         <source>Last name:</source>
         <translation>Фамилия:</translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="36"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="36"/>
         <source>Initials:</source>
         <translation>Инициалы:</translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="43"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="43"/>
         <source>Full name:</source>
         <translation>Полное имя:</translation>
     </message>
     <message>
-        <location filename="create_contact_dialog.ui" line="50"/>
+        <location filename="create_dialogs/create_contact_dialog.ui" line="50"/>
         <source>Display name:</source>
         <translation>Отображаемое имя:</translation>
     </message>
@@ -686,28 +656,28 @@
 <context>
     <name>CreateGroupDialog</name>
     <message>
-        <location filename="create_group_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="14"/>
         <source>Create Group</source>
         <translation>Создать группу</translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="32"/>
         <source>Group name (pre-Windows 2000):</source>
         <oldsource>Logon name (pre-Windows 2000):</oldsource>
         <translation>Имя группы (до Windows 2000):</translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="53"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="53"/>
         <source>Group scope:</source>
         <translation>Область группы:</translation>
     </message>
     <message>
-        <location filename="create_group_dialog.ui" line="63"/>
+        <location filename="create_dialogs/create_group_dialog.ui" line="63"/>
         <source>Group type:</source>
         <translation>Тип группы:</translation>
     </message>
@@ -715,17 +685,17 @@
 <context>
     <name>CreateOUDialog</name>
     <message>
-        <location filename="create_ou_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_ou_dialog.ui" line="14"/>
         <source>Create OU</source>
         <translation>Создать подразделение</translation>
     </message>
     <message>
-        <location filename="create_ou_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_ou_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="create_ou_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_ou_dialog.ui" line="32"/>
         <source>Protect against deletion</source>
         <translation>Защитить от удаления</translation>
     </message>
@@ -733,12 +703,12 @@
 <context>
     <name>CreateObjectHelper</name>
     <message>
-        <location filename="create_object_helper.cpp" line="83"/>
+        <location filename="create_object_helper.cpp" line="72"/>
         <source>Failed to create object %1</source>
         <translation>Не удалось создать объект %1</translation>
     </message>
     <message>
-        <location filename="create_object_helper.cpp" line="146"/>
+        <location filename="create_object_helper.cpp" line="149"/>
         <source>Object %1 was created</source>
         <translation>Объект %1 был создан</translation>
     </message>
@@ -774,28 +744,28 @@
 <context>
     <name>CreatePolicyDialog</name>
     <message>
-        <location filename="create_policy_dialog.ui" line="26"/>
+        <location filename="create_dialogs/create_policy_dialog.ui" line="26"/>
         <source>Create Policy</source>
         <oldsource>Create GPO</oldsource>
         <translation>Создать групповую политику</translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.ui" line="34"/>
+        <location filename="create_dialogs/create_policy_dialog.ui" line="34"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.cpp" line="57"/>
+        <location filename="create_dialogs/create_policy_dialog.cpp" line="60"/>
         <source>New Group Policy Object</source>
         <translation>Новый объект групповой политики</translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.cpp" line="101"/>
+        <location filename="create_dialogs/create_policy_dialog.cpp" line="107"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="create_policy_dialog.cpp" line="101"/>
+        <location filename="create_dialogs/create_policy_dialog.cpp" line="107"/>
         <source>Group Policy Object with this name already exists.</source>
         <translation>Объект групповой политики с этим именем уже существует.</translation>
     </message>
@@ -803,28 +773,28 @@
 <context>
     <name>CreateQueryFolderDialog</name>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="14"/>
         <source>Create Query Folder</source>
         <oldsource>Create query folder</oldsource>
         <translation>Создать папку запроса</translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="22"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="36"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="36"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.ui" line="29"/>
+        <location filename="create_dialogs/create_query_folder_dialog.ui" line="29"/>
         <source>New folder</source>
         <translation>Новая папка</translation>
     </message>
     <message>
-        <location filename="create_query_folder_dialog.cpp" line="54"/>
+        <location filename="create_dialogs/create_query_folder_dialog.cpp" line="54"/>
         <source>New Folder</source>
         <translation>Новая папка</translation>
     </message>
@@ -832,7 +802,7 @@
 <context>
     <name>CreateQueryItemDialog</name>
     <message>
-        <location filename="create_query_item_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_query_item_dialog.ui" line="14"/>
         <source>Create Query</source>
         <translation>Создать запрос</translation>
     </message>
@@ -840,17 +810,17 @@
 <context>
     <name>CreateSharedFolderDialog</name>
     <message>
-        <location filename="create_shared_folder_dialog.ui" line="14"/>
+        <location filename="create_dialogs/create_shared_folder_dialog.ui" line="14"/>
         <source>Create Shared Folder</source>
         <translation>Создать общую папку</translation>
     </message>
     <message>
-        <location filename="create_shared_folder_dialog.ui" line="25"/>
+        <location filename="create_dialogs/create_shared_folder_dialog.ui" line="25"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="create_shared_folder_dialog.ui" line="32"/>
+        <location filename="create_dialogs/create_shared_folder_dialog.ui" line="32"/>
         <source>Network path:</source>
         <translation>Сетевой путь:</translation>
     </message>
@@ -921,37 +891,37 @@
         <translation>Создать мост связи сайтов</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="61"/>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="60"/>
         <source>Site link object must link at least two sites</source>
         <translation>Связь сайтов должна связывать минимум два сайта</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="62"/>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="61"/>
         <source>Link bridge object must link at least two site links</source>
         <translation>Мост связей доложен связывать минимум две связи сайтов</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="63"/>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="62"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="94"/>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="93"/>
         <source>Failed to create site link object %1</source>
         <translation>Не удалось создать объект связи сайтов %1</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="95"/>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="94"/>
         <source>Failed to create site link bridge object %1</source>
         <translation>Не удалось создать объект мост связи сайтов %1</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="101"/>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="100"/>
         <source>Site link object %1 has been successfully created.</source>
         <translation>Объект связи сайтов %1 успешно создан.</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="102"/>
+        <location filename="create_dialogs/create_sites_link_dialog.cpp" line="101"/>
         <source>Site link bridge object %1 has been successfully created.</source>
         <translation>Объект мост связей %1 сайтов успешно создан.</translation>
     </message>
@@ -1067,27 +1037,27 @@
         <translation>Параметры учётной записи:</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_user_dialog.ui" line="143"/>
+        <location filename="create_dialogs/create_user_dialog.ui" line="153"/>
         <source>User must change password on next logon</source>
         <translation>Пользователь должен сменить пароль при следующем входе в систему</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_user_dialog.ui" line="153"/>
+        <location filename="create_dialogs/create_user_dialog.ui" line="163"/>
         <source>User cannot change password</source>
         <translation>Пользователь не может изменить пароль</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_user_dialog.ui" line="160"/>
+        <location filename="create_dialogs/create_user_dialog.ui" line="170"/>
         <source>Don&apos;t expire password</source>
         <translation>Пароль не истекает</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_user_dialog.ui" line="167"/>
+        <location filename="create_dialogs/create_user_dialog.ui" line="177"/>
         <source>Account disabled</source>
         <translation>Учётная запись отключена</translation>
     </message>
     <message>
-        <location filename="create_dialogs/create_user_dialog.cpp" line="98"/>
+        <location filename="create_dialogs/create_user_dialog.cpp" line="108"/>
         <source>Create %1</source>
         <translation>Создать объект - %1</translation>
     </message>
@@ -1126,42 +1096,6 @@
 </context>
 <context>
     <name>DelegationPermissionsWidget</name>
-    <message>
-        <source>Common tasks delegation</source>
-        <translation type="vanished">Делегирование обычных задач</translation>
-    </message>
-    <message>
-        <source>Create/delete child objects</source>
-        <translation type="vanished">Создание/удаление дочерних объектов</translation>
-    </message>
-    <message>
-        <source>Read/write properties</source>
-        <translation type="vanished">Чтение/запись свойств</translation>
-    </message>
-    <message>
-        <source>Create </source>
-        <translation type="vanished">Создание </translation>
-    </message>
-    <message>
-        <source> objects</source>
-        <translation type="vanished"> объектов</translation>
-    </message>
-    <message>
-        <source>Delete </source>
-        <translation type="vanished">Удаление </translation>
-    </message>
-    <message>
-        <source>Write </source>
-        <translation type="vanished">Запись </translation>
-    </message>
-    <message>
-        <source> property</source>
-        <translation type="vanished"> свойства</translation>
-    </message>
-    <message>
-        <source>Read </source>
-        <translation type="vanished">Чтение </translation>
-    </message>
     <message>
         <location filename="permission_control_widgets/delegation_permissions_widget.cpp" line="44"/>
         <source>Name</source>
@@ -1189,32 +1123,32 @@
 <context>
     <name>DomainInfoImpl</name>
     <message>
-        <location filename="console_impls/domain_info_impl.cpp" line="46"/>
+        <location filename="console_impls/domain_info_impl.cpp" line="47"/>
         <source>Edit FSMO roles</source>
         <translation>Изменить FSMO роли</translation>
     </message>
     <message>
-        <location filename="console_impls/domain_info_impl.cpp" line="47"/>
+        <location filename="console_impls/domain_info_impl.cpp" line="48"/>
         <source>Open connection options</source>
         <translation>Параметры подключения</translation>
     </message>
     <message>
-        <location filename="console_impls/domain_info_impl.cpp" line="93"/>
+        <location filename="console_impls/domain_info_impl.cpp" line="97"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="console_impls/domain_info_impl.cpp" line="97"/>
+        <location filename="console_impls/domain_info_impl.cpp" line="101"/>
         <source>Host not found</source>
         <translation>Хост не найден</translation>
     </message>
     <message>
-        <location filename="console_impls/domain_info_impl.cpp" line="102"/>
+        <location filename="console_impls/domain_info_impl.cpp" line="106"/>
         <source>Active directory managment center [</source>
         <translation>Центр управления Active Directory [</translation>
     </message>
     <message>
-        <location filename="console_impls/domain_info_impl.cpp" line="125"/>
+        <location filename="console_impls/domain_info_impl.cpp" line="129"/>
         <source>Connected to host </source>
         <translation>Подключено к хосту </translation>
     </message>
@@ -1222,7 +1156,7 @@
 <context>
     <name>DomainInfoResultsWidget</name>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="14"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="14"/>
         <source>Form</source>
         <translation></translation>
     </message>
@@ -1237,54 +1171,42 @@
         <translation>Количество сайтов:</translation>
     </message>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="91"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="183"/>
         <source>Domain controllers count:</source>
         <translation>Количество контроллеров домена:</translation>
     </message>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="134"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="169"/>
         <source>Domain schema version:</source>
         <translation>Версия схемы домена:</translation>
     </message>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="141"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="141"/>
         <source>Domain functionality level:</source>
         <translation>Режим работы домена:</translation>
     </message>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="150"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="190"/>
         <source>Domain controller version:</source>
         <translation>Версия контроллера домена:</translation>
     </message>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="80"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="162"/>
         <source>Forest functionality level:</source>
         <translation>Режим работы леса:</translation>
     </message>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="155"/>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="162"/>
-        <location filename="domain_info_results_widget/domain_info_results_widget.ui" line="169"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="120"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="127"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="134"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="155"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="176"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.ui" line="197"/>
         <source>PLACEHOLDER</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.cpp" line="209"/>
-        <source>Servers</source>
-        <translation>Серверы</translation>
-    </message>
-    <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.cpp" line="224"/>
-        <source>FSMO roles</source>
-        <translation>FSMO роли</translation>
-    </message>
-    <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.cpp" line="239"/>
-        <source>Failed to get objects count</source>
-        <translation>Не удалось получить количество объектов</translation>
-    </message>
-    <message>
-        <location filename="domain_info_results_widget/domain_info_results_widget.cpp" line="251"/>
+        <location filename="results_widgets/domain_info_results_widget/domain_info_results_widget.cpp" line="192"/>
         <source>Undefined</source>
         <translation>Не определено</translation>
     </message>
@@ -1292,18 +1214,18 @@
 <context>
     <name>EditQueryFolderDialog</name>
     <message>
-        <location filename="edit_query_folder_dialog.ui" line="14"/>
+        <location filename="edit_query_widgets/edit_query_folder_dialog.ui" line="14"/>
         <source>Edit Query Folder</source>
         <oldsource>Edit query folder</oldsource>
         <translation>Изменить папку запроса</translation>
     </message>
     <message>
-        <location filename="edit_query_folder_dialog.ui" line="22"/>
+        <location filename="edit_query_widgets/edit_query_folder_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="edit_query_folder_dialog.ui" line="32"/>
+        <location filename="edit_query_widgets/edit_query_folder_dialog.ui" line="32"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
@@ -1311,7 +1233,7 @@
 <context>
     <name>EditQueryItemDialog</name>
     <message>
-        <location filename="edit_query_item_dialog.ui" line="14"/>
+        <location filename="edit_query_widgets/edit_query_item_dialog.ui" line="14"/>
         <source>Edit Query</source>
         <translation>Изменить запрос</translation>
     </message>
@@ -1319,32 +1241,32 @@
 <context>
     <name>EditQueryItemWidget</name>
     <message>
-        <location filename="edit_query_item_widget.ui" line="58"/>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="58"/>
         <source>Recursive search</source>
         <translation>Рекурсивный поиск</translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="28"/>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="28"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="38"/>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="38"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="48"/>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="48"/>
         <source>Search in:</source>
         <translation>Искать в:</translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="67"/>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="67"/>
         <source>Filter:</source>
         <translation>Фильтр:</translation>
     </message>
     <message>
-        <location filename="edit_query_item_widget.ui" line="83"/>
+        <location filename="edit_query_widgets/edit_query_item_widget.ui" line="83"/>
         <source>Edit filter</source>
         <translation>Изменить фильтр</translation>
     </message>
@@ -1381,7 +1303,7 @@
 <context>
     <name>FSMODialog</name>
     <message>
-        <location filename="fsmo_dialog.ui" line="14"/>
+        <location filename="fsmo/fsmo_dialog.ui" line="20"/>
         <source>Operations Masters</source>
         <translation>Мастера Операций</translation>
     </message>
@@ -1401,32 +1323,32 @@
         <translation>DNS домена</translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="54"/>
+        <location filename="fsmo/fsmo_dialog.cpp" line="46"/>
         <source>Forest DNS</source>
         <translation>DNS леса</translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="55"/>
+        <location filename="fsmo/fsmo_dialog.cpp" line="47"/>
         <source>PDC Emulation</source>
         <translation>PDC эмуляция</translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="56"/>
+        <location filename="fsmo/fsmo_dialog.cpp" line="48"/>
         <source>Schema</source>
         <translation>Схема</translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="57"/>
+        <location filename="fsmo/fsmo_dialog.cpp" line="49"/>
         <source>Domain Naming</source>
         <translation>Имена домена</translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="58"/>
+        <location filename="fsmo/fsmo_dialog.cpp" line="50"/>
         <source>Infrastructure</source>
         <translation>Инфраструктура</translation>
     </message>
     <message>
-        <location filename="fsmo_dialog.cpp" line="59"/>
+        <location filename="fsmo/fsmo_dialog.cpp" line="51"/>
         <source>Rid Allocation</source>
         <translation>RID распределение</translation>
     </message>
@@ -1434,27 +1356,27 @@
 <context>
     <name>FSMOTab</name>
     <message>
-        <location filename="fsmo_tab.ui" line="27"/>
+        <location filename="fsmo/fsmo_tab.ui" line="27"/>
         <source>Current master:</source>
         <translation>Текущий мастер:</translation>
     </message>
     <message>
-        <location filename="fsmo_tab.ui" line="41"/>
+        <location filename="fsmo/fsmo_tab.ui" line="41"/>
         <source>Change to:</source>
         <translation>Изменить на:</translation>
     </message>
     <message>
-        <location filename="fsmo_tab.ui" line="70"/>
+        <location filename="fsmo/fsmo_tab.ui" line="70"/>
         <source>Change</source>
         <translation>Изменить</translation>
     </message>
     <message>
-        <location filename="fsmo_tab.cpp" line="80"/>
+        <location filename="fsmo/fsmo_tab.cpp" line="67"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="fsmo_tab.cpp" line="80"/>
+        <location filename="fsmo/fsmo_tab.cpp" line="67"/>
         <source>This machine is already a master for this role. Switch to a different machine in Connection Options to change master.</source>
         <translation>Эта машина уже является мастером этой роли. Переключитесь на другой компьютер в опциях подключения, чтобы изменить мастер.</translation>
     </message>
@@ -1557,17 +1479,17 @@
 <context>
     <name>FindObjectDialog</name>
     <message>
-        <location filename="find_object_dialog.ui" line="14"/>
+        <location filename="find_widgets/find_object_dialog.ui" line="14"/>
         <source>Find Objects</source>
         <translation>Поиск объектов</translation>
     </message>
     <message>
-        <location filename="find_object_dialog.cpp" line="41"/>
+        <location filename="find_widgets/find_object_dialog.cpp" line="41"/>
         <source>&amp;Action</source>
         <translation>&amp;Действие</translation>
     </message>
     <message>
-        <location filename="find_object_dialog.cpp" line="43"/>
+        <location filename="find_widgets/find_object_dialog.cpp" line="43"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
@@ -1575,105 +1497,105 @@
 <context>
     <name>FindPolicyDialog</name>
     <message>
-        <location filename="find_policy_dialog.ui" line="14"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="14"/>
         <source>Dialog</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="41"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="41"/>
         <source>Search item:</source>
         <translation>Элемент поиска:</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="51"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="51"/>
         <source>Condition:</source>
         <translation>Состояние:</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="61"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="61"/>
         <source>Value:</source>
         <translation>Значение:</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="75"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="75"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="97"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="97"/>
         <source>Filters:</source>
         <translation>Фильтры:</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="114"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="114"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="121"/>
-        <location filename="find_policy_dialog.ui" line="164"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="121"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="164"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="150"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="150"/>
         <source>Find</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.ui" line="157"/>
+        <location filename="find_widgets/find_policy_dialog.ui" line="157"/>
         <source>Stop</source>
         <translation>Остановить</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="48"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="48"/>
         <source>&amp;Action</source>
         <translation>&amp;Действие</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="50"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="50"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="63"/>
-        <location filename="find_policy_dialog.cpp" line="192"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="63"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="192"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="64"/>
-        <location filename="find_policy_dialog.cpp" line="193"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="64"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="193"/>
         <source>GUID</source>
         <translation>GUID</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="95"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="95"/>
         <source>&amp;Icons</source>
         <translation>&amp;Значки</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="97"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="97"/>
         <source>&amp;List</source>
         <translation>&amp;Список</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="99"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="99"/>
         <source>&amp;Detail</source>
         <translation>&amp;Подробно</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="101"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="101"/>
         <source>&amp;Customize Columns</source>
         <translation>&amp;Настроить колонки</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="102"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="102"/>
         <source>&amp;Description Bar</source>
         <translation>&amp;Область описания</translation>
     </message>
     <message>
-        <location filename="find_policy_dialog.cpp" line="137"/>
+        <location filename="find_widgets/find_policy_dialog.cpp" line="137"/>
         <source>Find results</source>
         <translation>Результаты поиска</translation>
     </message>
@@ -1694,57 +1616,57 @@
 <context>
     <name>FindWidget</name>
     <message>
-        <location filename="find_widget.ui" line="80"/>
+        <location filename="find_widgets/find_widget.ui" line="80"/>
         <source>Find</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="find_widget.ui" line="96"/>
+        <location filename="find_widgets/find_widget.ui" line="96"/>
         <source>Stop</source>
         <translation>Остановить</translation>
     </message>
     <message>
-        <location filename="find_widget.ui" line="103"/>
+        <location filename="find_widgets/find_widget.ui" line="103"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="find_widget.ui" line="47"/>
+        <location filename="find_widgets/find_widget.ui" line="47"/>
         <source>Search in:</source>
         <translation>Искать в:</translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="42"/>
+        <location filename="find_widgets/find_widget.cpp" line="42"/>
         <source>&amp;Icons</source>
         <oldsource>Icons</oldsource>
         <translation>&amp;Значки</translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="44"/>
+        <location filename="find_widgets/find_widget.cpp" line="44"/>
         <source>&amp;List</source>
         <oldsource>List</oldsource>
         <translation>&amp;Список</translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="46"/>
+        <location filename="find_widgets/find_widget.cpp" line="46"/>
         <source>&amp;Detail</source>
         <oldsource>Detail</oldsource>
         <translation>&amp;Подробно</translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="48"/>
+        <location filename="find_widgets/find_widget.cpp" line="48"/>
         <source>&amp;Customize Columns</source>
         <oldsource>Customize Columns</oldsource>
         <translation>&amp;Настроить колонки</translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="49"/>
+        <location filename="find_widgets/find_widget.cpp" line="49"/>
         <source>&amp;Description Bar</source>
         <oldsource>Description Bar</oldsource>
         <translation>&amp;Область описания</translation>
     </message>
     <message>
-        <location filename="find_widget.cpp" line="84"/>
+        <location filename="find_widgets/find_widget.cpp" line="84"/>
         <source>Find results</source>
         <translation>Результаты поиска</translation>
     </message>
@@ -1752,12 +1674,12 @@
 <context>
     <name>FoundPolicyImpl</name>
     <message>
-        <location filename="console_impls/found_policy_impl.cpp" line="38"/>
+        <location filename="console_impls/found_policy_impl.cpp" line="40"/>
         <source>Add link...</source>
         <translation>Добавить связь...</translation>
     </message>
     <message>
-        <location filename="console_impls/found_policy_impl.cpp" line="39"/>
+        <location filename="console_impls/found_policy_impl.cpp" line="41"/>
         <source>Edit...</source>
         <translation>Изменить...</translation>
     </message>
@@ -1821,23 +1743,23 @@
 <context>
     <name>GeneralComputerTab</name>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="36"/>
+        <location filename="tabs/general_computer_tab.ui" line="48"/>
         <source>Logon name (pre-Windows 2000):</source>
         <translation>Имя для входа (до Windows 2000):</translation>
     </message>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="43"/>
+        <location filename="tabs/general_computer_tab.ui" line="55"/>
         <source>DNS Host Name:</source>
         <translation>Имя узла DNS:</translation>
     </message>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="57"/>
+        <location filename="tabs/general_computer_tab.ui" line="69"/>
         <source>Description:</source>
         <oldsource>Description</oldsource>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="tabs/general_computer_tab.ui" line="67"/>
+        <location filename="tabs/general_computer_tab.ui" line="79"/>
         <source>Location:</source>
         <translation>Местонахождение:</translation>
     </message>
@@ -1845,33 +1767,33 @@
 <context>
     <name>GeneralGroupTab</name>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="36"/>
+        <location filename="tabs/general_group_tab.ui" line="48"/>
         <source>Group name (pre-Windows 2000):</source>
         <oldsource>Logon name (pre-Windows 2000):</oldsource>
         <translation>Имя группы (до Windows 2000):</translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="57"/>
+        <location filename="tabs/general_group_tab.ui" line="69"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="67"/>
+        <location filename="tabs/general_group_tab.ui" line="79"/>
         <source>E-mail:</source>
         <translation>Электронная почта:</translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="77"/>
+        <location filename="tabs/general_group_tab.ui" line="89"/>
         <source>Notes:</source>
         <translation>Примечания:</translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="87"/>
+        <location filename="tabs/general_group_tab.ui" line="99"/>
         <source>Group Scope:</source>
         <translation>Область группы:</translation>
     </message>
     <message>
-        <location filename="tabs/general_group_tab.ui" line="94"/>
+        <location filename="tabs/general_group_tab.ui" line="106"/>
         <source>Group Type:</source>
         <translation>Тип группы:</translation>
     </message>
@@ -1879,32 +1801,32 @@
 <context>
     <name>GeneralOUTab</name>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="36"/>
+        <location filename="tabs/general_ou_tab.ui" line="48"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="46"/>
+        <location filename="tabs/general_ou_tab.ui" line="58"/>
         <source>Street Address:</source>
         <translation>Адрес:</translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="56"/>
+        <location filename="tabs/general_ou_tab.ui" line="68"/>
         <source>City:</source>
         <translation>Город:</translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="66"/>
+        <location filename="tabs/general_ou_tab.ui" line="78"/>
         <source>State/Province:</source>
         <translation>Регион:</translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="76"/>
+        <location filename="tabs/general_ou_tab.ui" line="88"/>
         <source>ZIP/Postal Code:</source>
         <translation>Почтовый индекс:</translation>
     </message>
     <message>
-        <location filename="tabs/general_ou_tab.ui" line="86"/>
+        <location filename="tabs/general_ou_tab.ui" line="98"/>
         <source>Country:</source>
         <translation>Страна:</translation>
     </message>
@@ -1930,7 +1852,7 @@
 <context>
     <name>GeneralOtherTab</name>
     <message>
-        <location filename="tabs/general_other_tab.ui" line="36"/>
+        <location filename="tabs/general_other_tab.ui" line="48"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
@@ -1938,27 +1860,27 @@
 <context>
     <name>GeneralPolicyTab</name>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="36"/>
+        <location filename="tabs/general_policy_tab.ui" line="48"/>
         <source>Created:</source>
         <translation>Создан:</translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="50"/>
+        <location filename="tabs/general_policy_tab.ui" line="62"/>
         <source>Modified:</source>
         <translation>Изменен:</translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="64"/>
+        <location filename="tabs/general_policy_tab.ui" line="76"/>
         <source>User version:</source>
         <translation>Пользовательская версия:</translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="78"/>
+        <location filename="tabs/general_policy_tab.ui" line="90"/>
         <source>Computer version:</source>
         <translation>Машинная версия:</translation>
     </message>
     <message>
-        <location filename="tabs/general_policy_tab.ui" line="92"/>
+        <location filename="tabs/general_policy_tab.ui" line="104"/>
         <source>Unique ID:</source>
         <translation>Уникальный ID:</translation>
     </message>
@@ -1974,12 +1896,12 @@
 <context>
     <name>GeneralSharedFolderTab</name>
     <message>
-        <location filename="tabs/general_shared_folder_tab.ui" line="36"/>
+        <location filename="tabs/general_shared_folder_tab.ui" line="48"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="tabs/general_shared_folder_tab.ui" line="46"/>
+        <location filename="tabs/general_shared_folder_tab.ui" line="58"/>
         <source>Keywords</source>
         <translation>Ключевые слова</translation>
     </message>
@@ -2053,53 +1975,53 @@
 <context>
     <name>GeneralUserTab</name>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="36"/>
+        <location filename="tabs/general_user_tab.ui" line="48"/>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="46"/>
+        <location filename="tabs/general_user_tab.ui" line="58"/>
         <source>First Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="56"/>
+        <location filename="tabs/general_user_tab.ui" line="68"/>
         <source>Last Name:</source>
         <translation>Фамилия:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="66"/>
+        <location filename="tabs/general_user_tab.ui" line="78"/>
         <source>Display Name:</source>
         <translation>Отображаемое имя:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="76"/>
+        <location filename="tabs/general_user_tab.ui" line="88"/>
         <source>Initials:</source>
         <translation>Инициалы:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="86"/>
+        <location filename="tabs/general_user_tab.ui" line="98"/>
         <source>E-mail Address:</source>
         <translation>Электронная почта:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="96"/>
+        <location filename="tabs/general_user_tab.ui" line="108"/>
         <source>Office Location:</source>
         <translation>Расположение офиса:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="106"/>
+        <location filename="tabs/general_user_tab.ui" line="118"/>
         <source>Telephone Number:</source>
         <translation>Номер телефона:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="113"/>
+        <location filename="tabs/general_user_tab.ui" line="125"/>
         <source>Web Page Address:</source>
         <translation>Адрес веб-страницы:</translation>
     </message>
     <message>
-        <location filename="tabs/general_user_tab.ui" line="125"/>
-        <location filename="tabs/general_user_tab.ui" line="139"/>
+        <location filename="tabs/general_user_tab.ui" line="137"/>
+        <location filename="tabs/general_user_tab.ui" line="151"/>
         <source>Other...</source>
         <translation>Другие...</translation>
     </message>
@@ -2117,33 +2039,41 @@
         <translation>Наследуемые политики</translation>
     </message>
     <message>
-        <location filename="tabs/group_policy_tab.ui" line="36"/>
+        <location filename="tabs/group_policy_tab.cpp" line="48"/>
         <source>Block policy inheritance</source>
         <translation>Заблокировать наследование политик</translation>
     </message>
 </context>
+<context>
+    <name>HexNumberAttributeDialog</name>
+    <message>
+        <location filename="attribute_dialogs/hex_number_attribute_dialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="attribute_dialogs/hex_number_attribute_dialog.ui" line="29"/>
+        <source>0x</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>InheritedPoliciesWidget</name>
     <message>
-        <location filename="policy_ou_results_widget/inherited_policies_widget.cpp" line="26"/>
+        <location filename="results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp" line="48"/>
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/inherited_policies_widget.cpp" line="27"/>
+        <location filename="results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp" line="49"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/inherited_policies_widget.cpp" line="28"/>
+        <location filename="results_widgets/policy_ou_results_widget/inherited_policies_widget.cpp" line="50"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
-    <message>
-        <location filename="policy_ou_results_widget/inherited_policies_widget.cpp" line="29"/>
-        <source>Status</source>
-        <translation>Статус</translation>
-    </message>
 </context>
 <context>
     <name>KrbAuthDialog</name>
@@ -2158,22 +2088,22 @@
         <translation>Принципал:</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.ui" line="62"/>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="81"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.ui" line="79"/>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="98"/>
         <source>Show password</source>
         <translation>Показать пароль</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.ui" line="101"/>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="74"/>
         <source>user@REALM</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.ui" line="108"/>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="119"/>
         <source>Ticket available</source>
         <translation>Билет доступен</translation>
     </message>
@@ -2193,7 +2123,7 @@
         <translation>Войти</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.ui" line="165"/>
+        <location filename="auth_dialogs/krb_auth_dialog.ui" line="210"/>
         <source>PLACEHOLDER</source>
         <translation></translation>
     </message>
@@ -2203,27 +2133,27 @@
         <translation>Запомнить учётные данные</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="86"/>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="89"/>
         <source>Enter your Kerberos principal</source>
         <translation>Введите принципал Kerberos</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="71"/>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="94"/>
         <source>Account already in use</source>
         <translation>Аккаунт уже используется</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="76"/>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="99"/>
         <source>Enter the password</source>
         <translation>Введите пароль</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="106"/>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="140"/>
         <source>Authentication failed</source>
         <translation>Аутентификация не удалась</translation>
     </message>
     <message>
-        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="152"/>
+        <location filename="auth_dialogs/krb_auth_dialog.cpp" line="197"/>
         <source>Failed to find system credentials</source>
         <translation>Не удалость найти системные учётные данные</translation>
     </message>
@@ -2307,22 +2237,22 @@
 <context>
     <name>LinkedPoliciesWidget</name>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.ui" line="14"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.ui" line="14"/>
         <source>Form</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="36"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="36"/>
         <source>Remove link</source>
         <translation>Удалить связь</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="37"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="37"/>
         <source>Move up</source>
         <translation>Переместить вверх</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="38"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="38"/>
         <source>Move down</source>
         <translation>Переместить вниз</translation>
     </message>
@@ -2347,37 +2277,37 @@
         <translation>Порядок</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="49"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="55"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="50"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="56"/>
         <source>Enforced</source>
         <translation>Принудительно</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="51"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="57"/>
         <source>Disabled</source>
         <translation>Отключено</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="111"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="126"/>
         <source>Organizational unit </source>
         <translation>Порядки связей подразделения </translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="111"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="126"/>
         <source>&apos;s link orders have been succesfuly changed.</source>
         <translation> были успешно изменены.</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="354"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="393"/>
         <source>Not found</source>
         <translation>Не найдено</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/linked_policies_widget.cpp" line="384"/>
+        <location filename="results_widgets/policy_ou_results_widget/linked_policies_widget.cpp" line="423"/>
         <source>The GPO for this link could not be found. It maybe have been recently created and is being replicated or it could have been deleted.</source>
         <translation>Не удалось найти объект групповой политики для этой связи. Возможно, он был недавно создан и реплицируется или был удалён.</translation>
     </message>
@@ -2422,10 +2352,6 @@
         <source>Edit Logon Computers</source>
         <translation>Компьютеры для входа в систему</translation>
     </message>
-    <message>
-        <source>New value:</source>
-        <translation type="vanished">Новое значение:</translation>
-    </message>
     <message>
         <location filename="attribute_edits/logon_computers_dialog.ui" line="20"/>
         <source>On all computers</source>
@@ -2452,77 +2378,10 @@
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="attribute_edits/logon_computers_dialog.ui" line="62"/>
+        <location filename="attribute_edits/logon_computers_dialog.ui" line="135"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
-    <message>
-        <source>Values:</source>
-        <translation type="vanished">Значения:</translation>
-    </message>
-</context>
-<context>
-    <name>LogonHoursDialog</name>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="14"/>
-        <source>Edit Logon Hours</source>
-        <translation>Изменить время входа</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="79"/>
-        <source>Logon allowed:</source>
-        <translation>Вход разрешен:</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="102"/>
-        <source>Logon denied:</source>
-        <translation>Вход запрещён:</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="42"/>
-        <source>Sunday</source>
-        <translation>Воскресенье</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="43"/>
-        <source>Monday</source>
-        <translation>Понедельник</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="44"/>
-        <source>Tuesday</source>
-        <translation>Вторник</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="45"/>
-        <source>Wednesday</source>
-        <translation>Среда</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="46"/>
-        <source>Thursday</source>
-        <translation>Четверг</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="47"/>
-        <source>Friday</source>
-        <translation>Пятница</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.cpp" line="48"/>
-        <source>Saturday</source>
-        <translation>Суббота</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="47"/>
-        <source>Local time</source>
-        <translation>Местное время</translation>
-    </message>
-    <message>
-        <location filename="attribute_edits/logon_hours_dialog.ui" line="40"/>
-        <source>UTC time</source>
-        <translation>Время UTC</translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -2533,272 +2392,272 @@
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="38"/>
+        <location filename="main_window.ui" line="39"/>
         <source>&amp;Action</source>
         <oldsource>Action</oldsource>
         <translation>&amp;Действие</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="43"/>
+        <location filename="main_window.ui" line="44"/>
         <source>&amp;View</source>
         <oldsource>View</oldsource>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="47"/>
+        <location filename="main_window.ui" line="48"/>
         <source>&amp;Theme</source>
         <oldsource>Theme</oldsource>
         <translation>&amp;Тема</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="59"/>
+        <location filename="main_window.ui" line="66"/>
         <source>&amp;Preferences</source>
         <oldsource>Preferences</oldsource>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="63"/>
+        <location filename="main_window.ui" line="70"/>
         <source>&amp;Language</source>
         <oldsource>Language</oldsource>
         <translation>&amp;Язык</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="76"/>
+        <location filename="main_window.ui" line="86"/>
         <source>&amp;Help</source>
         <oldsource>Help</oldsource>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="95"/>
+        <location filename="main_window.ui" line="105"/>
         <source>Tool Bar</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="116"/>
+        <location filename="main_window.ui" line="132"/>
         <source>Message Log</source>
         <translation>Журнал сообщений</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="129"/>
+        <location filename="main_window.ui" line="145"/>
         <source>&amp;Connection Options</source>
         <oldsource>Connection Options</oldsource>
         <translation>&amp;Параметры подключения</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="134"/>
+        <location filename="main_window.ui" line="150"/>
         <source>&amp;Quit</source>
         <oldsource>Quit</oldsource>
         <translation>&amp;Выйти</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="137"/>
+        <location filename="main_window.ui" line="153"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="146"/>
+        <location filename="main_window.ui" line="162"/>
         <source>&amp;Manual</source>
         <oldsource>Manual</oldsource>
         <translation>&amp;Руководство</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="149"/>
+        <location filename="main_window.ui" line="165"/>
         <source>Manual (Alt + 8)</source>
         <translation>Помощь (Alt + 8)</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="152"/>
+        <location filename="main_window.ui" line="168"/>
         <source>Alt+8</source>
         <translation>Alt+8</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="157"/>
+        <location filename="main_window.ui" line="173"/>
         <source>&amp;Changelog</source>
         <oldsource>Changelog</oldsource>
         <translation>&amp;Журнал изменений</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="162"/>
+        <location filename="main_window.ui" line="178"/>
         <source>&amp;About ADMC</source>
         <oldsource>About ADMC</oldsource>
         <translation>&amp;О приложении ADMC</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="170"/>
+        <location filename="main_window.ui" line="186"/>
         <source>&amp;Icons</source>
         <oldsource>Icons</oldsource>
         <translation>&amp;Значки</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="178"/>
+        <location filename="main_window.ui" line="194"/>
         <source>&amp;List</source>
         <oldsource>List</oldsource>
         <translation>&amp;Список</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="186"/>
+        <location filename="main_window.ui" line="202"/>
         <source>&amp;Detail</source>
         <oldsource>Detail</oldsource>
         <translation>&amp;Подробно</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="210"/>
+        <location filename="main_window.ui" line="226"/>
         <source>&amp;Console Tree</source>
         <oldsource>Console Tree</oldsource>
         <translation>&amp;Дерево консоли</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="218"/>
+        <location filename="main_window.ui" line="234"/>
         <source>Description &amp;Bar</source>
         <oldsource>Description Bar</oldsource>
         <translation>&amp;Область описания</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="223"/>
+        <location filename="main_window.ui" line="239"/>
         <source>C&amp;ustomize Columns...</source>
         <oldsource>Customize Columns...</oldsource>
         <translation>&amp;Настроить колонки...</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="228"/>
+        <location filename="main_window.ui" line="244"/>
         <source>&amp;Filter Objects...</source>
         <oldsource>Filter Objects...</oldsource>
         <translation>&amp;Фильтровать объекты...</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="236"/>
+        <location filename="main_window.ui" line="252"/>
         <source>&amp;Advanced Features</source>
         <oldsource>Advanced Features</oldsource>
         <translation>&amp;Дополнительные возможности</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="244"/>
+        <location filename="main_window.ui" line="260"/>
         <source>&amp;Confirm Actions</source>
         <oldsource>Confirm Actions</oldsource>
         <translation>&amp;Подтверждать действия</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="252"/>
+        <location filename="main_window.ui" line="268"/>
         <source>&amp;Put Last Name Before First Name</source>
         <oldsource>Put Last Name Before First Name</oldsource>
         <translation>&amp;Ставить фамилию перед именем</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="260"/>
+        <location filename="main_window.ui" line="276"/>
         <source>&amp;Log Searches</source>
         <oldsource>Log Searches</oldsource>
         <translation>&amp;Вносить информацию о поиске в журнал сообщений</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="268"/>
+        <location filename="main_window.ui" line="284"/>
         <source>&amp;Timestamps in Message Log</source>
         <oldsource>Timestamps in Message Log</oldsource>
         <translation>&amp;Метки времени в журнале сообщений</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="276"/>
+        <location filename="main_window.ui" line="292"/>
         <source>&amp;Show Non-Container Objects in Console Tree</source>
         <oldsource>Show Non-Container Objects in Console Tree</oldsource>
         <translation>П&amp;оказывать неконтейнерные объекты в дереве консоли</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="300"/>
+        <location filename="main_window.ui" line="316"/>
         <source>Navigate Back (Alt + -)</source>
         <translation>Назад (Alt + -)</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="315"/>
+        <location filename="main_window.ui" line="331"/>
         <source>Navigate Forward (Alt + =)</source>
         <translation>Вперед (Alt + =)</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="330"/>
+        <location filename="main_window.ui" line="346"/>
         <source>Refresh (Alt + 9)</source>
         <translation>Обновить (Alt + 9)</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="333"/>
+        <location filename="main_window.ui" line="349"/>
         <source>Alt+9</source>
         <translation>Alt+9</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="341"/>
+        <location filename="main_window.ui" line="357"/>
         <source>Show Login</source>
         <translation>Показывать логин</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="346"/>
+        <location filename="main_window.ui" line="362"/>
         <source>&amp;Operations Masters</source>
         <oldsource>Operations Masters</oldsource>
         <translation>&amp;Мастера Операций</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="355"/>
+        <location filename="main_window.ui" line="371"/>
         <source>Create user</source>
         <translation>Создать пользователя</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="358"/>
+        <location filename="main_window.ui" line="374"/>
         <source>Create user (Alt + 7)</source>
         <translation>Создать пользователя (Alt + 7)</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="361"/>
+        <location filename="main_window.ui" line="377"/>
         <source>Alt+7</source>
         <translation>Alt+7</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="370"/>
+        <location filename="main_window.ui" line="386"/>
         <source>Create group</source>
         <translation>Создать группу</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="373"/>
+        <location filename="main_window.ui" line="389"/>
         <source>Create group (Alt  + 6)</source>
         <translation>Создать группу (Alt + 6)</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="376"/>
+        <location filename="main_window.ui" line="392"/>
         <source>Alt+6</source>
         <translation>Alt+6</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="385"/>
+        <location filename="main_window.ui" line="401"/>
         <source>Create organization unit</source>
         <translation>Создать подразделение</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="388"/>
+        <location filename="main_window.ui" line="404"/>
         <source>Create organization unit (Alt + 5)</source>
         <translation>Создать подразделение (Alt + 5)</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="391"/>
+        <location filename="main_window.ui" line="407"/>
         <source>Alt+5</source>
         <translation>Alt+5</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="406"/>
+        <location filename="main_window.ui" line="415"/>
         <source>Load optional attribute values</source>
         <translation>Загружать значения необязательных атрибутов</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="415"/>
+        <location filename="main_window.ui" line="423"/>
         <source>Show middle name when creating</source>
         <translation>Показывать отчество при создании</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="424"/>
+        <location filename="main_window.ui" line="431"/>
         <source>Change user</source>
         <translation>Сменить пользователя</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="436"/>
+        <location filename="main_window.ui" line="442"/>
         <source>Use system credentials on start</source>
         <translation>Системные учётные данные при старте</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="446"/>
+        <location filename="main_window.ui" line="447"/>
         <source>Logout</source>
         <translation>Выход из аккаунта</translation>
     </message>
@@ -2813,62 +2672,63 @@
         <translation>Наверх</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="288"/>
+        <location filename="main_window.ui" line="304"/>
         <source>Alt+0</source>
         <translation>Alt+0</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="297"/>
+        <location filename="main_window.ui" line="313"/>
         <source>Navigate Back</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="303"/>
+        <location filename="main_window.ui" line="319"/>
         <source>Alt+-</source>
         <translation>Alt+-</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="312"/>
+        <location filename="main_window.ui" line="328"/>
         <source>Navigate Forward</source>
         <translation>Вперед</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="318"/>
+        <location filename="main_window.ui" line="334"/>
         <source>Alt+=</source>
         <translation>Alt+=</translation>
     </message>
     <message>
-        <location filename="main_window.ui" line="327"/>
+        <location filename="main_window.ui" line="343"/>
         <source>Refresh</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="227"/>
+        <location filename="main_window.cpp" line="250"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="227"/>
+        <location filename="main_window.cpp" line="250"/>
         <source>Restart the app to switch to the selected language.</source>
         <translation>Для переключения на выбранный язык необходимо перезапустить приложение.</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="329"/>
+        <location filename="main_window.cpp" line="533"/>
         <source>You are connected to DC without PDC-Emulator role</source>
         <translation>Вы подключены к КД без роли PDC-Emulator</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="528"/>
+        <location filename="main_window.cpp" line="576"/>
         <source>Logged in successfully</source>
         <translation>Вход выполнен</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="553"/>
+        <location filename="main_window.cpp" line="88"/>
+        <location filename="main_window.cpp" line="595"/>
         <source>Authentication required</source>
         <translation>Требуется аутентификация</translation>
     </message>
     <message>
-        <location filename="main_window.cpp" line="132"/>
+        <location filename="main_window.cpp" line="140"/>
         <source>Connected to host </source>
         <translation>Подключено к хосту </translation>
     </message>
@@ -2882,22 +2742,22 @@
         <translation>Ошибка соединения</translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="34"/>
+        <location filename="main_window_connection_error.ui" line="33"/>
         <source>Failed to connect to domain.</source>
         <translation>Не удалось подключиться к домену.</translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="69"/>
+        <location filename="main_window_connection_error.ui" line="68"/>
         <source>Retry</source>
         <translation>Подключиться</translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="76"/>
+        <location filename="main_window_connection_error.ui" line="75"/>
         <source>Connection Options</source>
         <translation>Параметры подключения</translation>
     </message>
     <message>
-        <location filename="main_window_connection_error.ui" line="83"/>
+        <location filename="main_window_connection_error.ui" line="82"/>
         <source>Quit</source>
         <translation>Выйти</translation>
     </message>
@@ -3011,32 +2871,32 @@
         <translation>Папка</translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="292"/>
+        <location filename="tabs/membership_tab.cpp" line="299"/>
         <source>Add Member</source>
         <translation>Добавить участника</translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="293"/>
+        <location filename="tabs/membership_tab.cpp" line="300"/>
         <source>Add to Group</source>
         <translation>Добавить в группу</translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="335"/>
+        <location filename="tabs/membership_tab.cpp" line="342"/>
         <source>Can&apos;t remove because this group is a primary group to selected user.</source>
         <translation>Не удалось удалить группу, так как она является основной для выбранного пользователя.</translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="336"/>
+        <location filename="tabs/membership_tab.cpp" line="343"/>
         <source>Can&apos;t remove because selected group is a primary group to this user.</source>
         <translation>Не удалось удалить выбранную группу, так как она является основной для этого пользователя.</translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="341"/>
+        <location filename="tabs/membership_tab.cpp" line="348"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="tabs/membership_tab.cpp" line="412"/>
+        <location filename="tabs/membership_tab.cpp" line="419"/>
         <source>Primary group: </source>
         <translation>Основная группа: </translation>
     </message>
@@ -3062,155 +2922,150 @@
 <context>
     <name>ObjectImpl</name>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="93"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="960"/>
         <source>User</source>
         <oldsource>&amp;User</oldsource>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="94"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="961"/>
         <source>Computer</source>
         <oldsource>&amp;Computer</oldsource>
         <translation>Компьютер</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="95"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="962"/>
         <source>OU</source>
         <oldsource>&amp;OU</oldsource>
         <translation>Подразделение</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="96"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="963"/>
         <source>Group</source>
         <translation>Группа</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="97"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="964"/>
         <source>Shared Folder</source>
         <translation>Общая папка</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="98"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="965"/>
         <source>inetOrgPerson</source>
         <translation>inetOrgPerson</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="99"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="966"/>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="100"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="967"/>
         <source>Find...</source>
         <translation>Найти...</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="101"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="968"/>
         <source>Move...</source>
         <translation>Переместить...</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="102"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="969"/>
         <source>Add to group...</source>
         <translation>Добавить в группу...</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="103"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="970"/>
         <source>Enable</source>
         <translation>Включить</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="104"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="971"/>
         <source>Disable</source>
         <translation>Отключить</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="105"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="972"/>
         <source>Reset password</source>
         <translation>Сбросить пароль</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="106"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="973"/>
         <source>Reset account</source>
         <translation>Сбросить учётную запись</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="107"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="974"/>
         <source>Edit UPN suffixes</source>
         <translation>Изменить суффиксы UPN</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="124"/>
-        <source>Create password setting object</source>
-        <translation>Создать объект парольных настроек</translation>
-    </message>
-    <message>
-        <location filename="console_impls/object_impl/object_impl.cpp" line="1001"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="990"/>
         <source>Create subnet</source>
         <translation>Создать подсеть</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl/object_impl.cpp" line="1002"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="991"/>
         <source>Create site</source>
         <translation>Создать сайт</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl/object_impl.cpp" line="1003"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="992"/>
         <source>Create site link</source>
         <translation>Создать связь сайтов</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl/object_impl.cpp" line="1004"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="993"/>
         <source>Create site link bridge</source>
         <translation>Создать мост связей сайтов</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl/object_impl.cpp" line="986"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="976"/>
         <source>New</source>
         <translation>Создать</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="301"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="204"/>
         <source> [Filtering enabled]</source>
         <translation> [Фильтр включён]</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="668"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="587"/>
         <source>Are you sure you want to delete this object?</source>
         <translation>Удалить этот объект?</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="740"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="590"/>
         <source>Are you sure you want to delete these objects?</source>
         <translation>Удалить эти объекты?</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="1885"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="601"/>
         <source> It contains other objects.</source>
         <translation> Он содержит другие объекты.</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="1888"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="604"/>
         <source> Containers to be deleted contain other objects.</source>
         <translation> Удаляемые контейнеры содержат другие объекты.</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="947"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="662"/>
         <source>Add to Group</source>
         <translation>Добавить в группу</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="947"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="730"/>
         <source>Edit UPN Suffixes</source>
         <translation>Изменить суффиксы UPN</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="967"/>
+        <location filename="console_impls/object_impl/object_impl.cpp" line="750"/>
         <source>Are you sure you want to reset this account?</source>
         <translation>Вы точно хотите сбросить эту учетную запись?</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="1262"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="171"/>
         <source>Query may be out of date</source>
         <translation>Запрос может быть устаревшим</translation>
     </message>
@@ -3253,11 +3108,6 @@
         <source>Protect against deletion:</source>
         <translation>Защитить от удаления:</translation>
     </message>
-    <message>
-        <location filename="tabs/object_tab.ui" line="116"/>
-        <source>Block inheritance:</source>
-        <translation>Блокировать наследование:</translation>
-    </message>
 </context>
 <context>
     <name>OctetAttributeDialog</name>
@@ -3282,27 +3132,27 @@
         <translation>Восьмеричный</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="181"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="180"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="185"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="184"/>
         <source>Input must be strings of 2 hexadecimal digits separated by spaces. Example: &quot;0a 00 b5 ff&quot;</source>
         <translation>Ввод должен состоять из строки, содержащей две шестнадцатеричные цифры, разделённые пробелами. Пример: &quot;0a 00 b5 ff&quot;</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="186"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="185"/>
         <source>Input must be strings of 8 binary digits separated by spaces. Example: &quot;01010010 01000010 01000010&quot;</source>
         <translation>Ввод должен состоять из строки, содержащей восемь двоичных цифр, разделённых пробелами. Пример: &quot;01010010 01000010 01000010&quot;</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="187"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="186"/>
         <source>Input must be strings of 3 decimal digits (0-255) separated by spaces. Example: &quot;010 000 191&quot;</source>
         <translation>Ввод должен состоять из строки, содержащей три десятичные цифры (0–255), разделённые пробелами. Пример: &quot;010 000 191&quot;</translation>
     </message>
     <message>
-        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="188"/>
+        <location filename="attribute_dialogs/octet_attribute_dialog.cpp" line="187"/>
         <source>Input must be strings of 3 octal digits (0-377) separated by spaces.. Example: &quot;070 343 301&quot;</source>
         <translation>Ввод должен состоять из строки, содержащей три восьмеричные цифры (0–377), разделённые пробелами. Пример: &quot;070 343 301&quot;</translation>
     </message>
@@ -3402,12 +3252,12 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="23"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="253"/>
         <source>Account lockout duration (mins):</source>
         <translation>Длительность блокировки учетной записи (минуты):</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="30"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="61"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -3422,92 +3272,74 @@
         <translation>Минимальная длина пароля:</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="47"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="304"/>
         <source>Enable complexity requirements</source>
         <translation>Включить требования сложности</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="60"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="317"/>
         <source>Store passwords using reversible encryption</source>
         <translation>Хранить пароли, используя обратимое шифрование</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="83"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="350"/>
         <source>Precedence:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="103"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="582"/>
         <source>Apply to user/grop</source>
         <translation>Применить к пользователю/группе</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="132"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="611"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="142"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="621"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="177"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="199"/>
         <source>Minimum password age (days):</source>
         <translation>Минимальный срок действия пароля (дни):</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="194"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="458"/>
         <source>Reset account lockout after (mins):</source>
         <translation>Время до сброса блокировки (минуты):</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="227"/>
-        <source>PSO precedence should be greater than 0</source>
-        <translation>Приоритет должен быть больше 0</translation>
-    </message>
-    <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="259"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="509"/>
         <source>Maximum password age (days):</source>
         <translation>Максимальный срок действия пароля (дни):</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="286"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="410"/>
         <source>Password history length:</source>
         <translation>Длина истории паролей:</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="293"/>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.ui" line="154"/>
         <source>Failed log on attempts allowed:</source>
         <translation>Разрешено неудачных попыток входа:</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_edit_widget.cpp" line="207"/>
-        <source>Add applied users/group</source>
-        <translation>Добавить применяемых пользователей/группы</translation>
-    </message>
-</context>
-<context>
-    <name>PSOResultsWidget</name>
-    <message>
-        <location filename="results_widgets/pso_results_widget/pso_results_widget.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.cpp" line="77"/>
+        <source>Global password settings</source>
+        <translation>Глобальные параметры паролей</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_results_widget.ui" line="28"/>
-        <source>Edit...</source>
-        <translation>Изменить...</translation>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.cpp" line="78"/>
+        <source>Password settings</source>
+        <translation>Парольная политика</translation>
     </message>
     <message>
-        <location filename="results_widgets/pso_results_widget/pso_results_widget.ui" line="38"/>
-        <source>Cancel</source>
-        <translation>Отменить</translation>
-    </message>
-    <message>
-        <location filename="results_widgets/pso_results_widget/pso_results_widget.ui" line="48"/>
-        <source>Apply</source>
-        <translation>Применить</translation>
+        <location filename="results_widgets/pso_results_widget/pso_edit_widget.cpp" line="205"/>
+        <source>Add applied users/group</source>
+        <translation>Добавить применяемых пользователей/группы</translation>
     </message>
 </context>
 <context>
@@ -3552,28 +3384,36 @@
 <context>
     <name>PasswordEdit</name>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="73"/>
+        <location filename="attribute_edits/password_edit.cpp" line="72"/>
         <source>Passwords don&apos;t match!</source>
         <translation>Пароли не совпадают!</translation>
     </message>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="67"/>
-        <location filename="attribute_edits/password_edit.cpp" line="74"/>
-        <location filename="attribute_edits/password_edit.cpp" line="83"/>
+        <location filename="attribute_edits/password_edit.cpp" line="66"/>
+        <location filename="attribute_edits/password_edit.cpp" line="73"/>
+        <location filename="attribute_edits/password_edit.cpp" line="81"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="66"/>
+        <location filename="attribute_edits/password_edit.cpp" line="65"/>
         <source>Password cannot be empty.</source>
         <translation>Пароль не может быть пустым.</translation>
     </message>
     <message>
-        <location filename="attribute_edits/password_edit.cpp" line="82"/>
+        <location filename="attribute_edits/password_edit.cpp" line="80"/>
         <source>Password contains invalid characters</source>
         <translation>Пароль содержит недопустимые символы</translation>
     </message>
 </context>
+<context>
+    <name>PasswordSettingsImpl</name>
+    <message>
+        <location filename="console_impls/password_settings_impl.cpp" line="47"/>
+        <source>Create password settings object</source>
+        <translation>Создать парольную политику (PSO)</translation>
+    </message>
+</context>
 <context>
     <name>PermissionsWidget</name>
     <message>
@@ -3592,7 +3432,7 @@
         <translation>Запрещено</translation>
     </message>
     <message>
-        <location filename="permission_control_widgets/permissions_widget.cpp" line="245"/>
+        <location filename="permission_control_widgets/permissions_widget.cpp" line="265"/>
         <source>There are no rights for this class of objects</source>
         <translation>Нет прав для данного класса объектов</translation>
     </message>
@@ -3600,37 +3440,37 @@
 <context>
     <name>PolicyImpl</name>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="53"/>
+        <location filename="console_impls/policy_impl.cpp" line="55"/>
         <source>Add link...</source>
         <translation>Добавить связь...</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="54"/>
+        <location filename="console_impls/policy_impl.cpp" line="56"/>
         <source>Edit...</source>
         <translation>Изменить...</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="55"/>
+        <location filename="console_impls/policy_impl.cpp" line="57"/>
         <source>Enforced</source>
         <translation>Принудительно</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="58"/>
+        <location filename="console_impls/policy_impl.cpp" line="60"/>
         <source>Disabled</source>
         <translation>Отключено</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="118"/>
+        <location filename="console_impls/policy_impl.cpp" line="122"/>
         <source>Incorrect permissions detected</source>
         <translation>Обнаружены неверные разрешения</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="102"/>
+        <location filename="console_impls/policy_impl.cpp" line="123"/>
         <source>Permissions for this policy&apos;s GPT don&apos;t match the permissions for it&apos;s GPC object. Would you like to update GPT permissions?</source>
         <translation>Разрешения шаблона групповой политики у данной политики не совпадают с разрешениями её объекта контейнера групповой политики. Обновить разрешения шаблона групповой политики?</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="370"/>
+        <location filename="console_impls/policy_impl.cpp" line="450"/>
         <source>Are you sure you want to unlink this policy from the OU? Note that the actual policy object won&apos;t be deleted.</source>
         <translation>Удалить связь между политикой и подразделением? Обратите внимание, что сама политика не будет удалена.</translation>
     </message>
@@ -3645,32 +3485,7 @@
         <translation>Удалить эту политику и все её связи?</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="519"/>
-        <source>Failed to delete group policy</source>
-        <translation>Не удалось удалить групповую политику</translation>
-    </message>
-    <message>
-        <location filename="console_impls/policy_impl.cpp" line="522"/>
-        <source>: this is a critical policy</source>
-        <translation>: данная политика является критической</translation>
-    </message>
-    <message>
-        <location filename="console_impls/policy_impl.cpp" line="526"/>
-        <source>Failed to delete the following group policies: 
-</source>
-        <translation>Не удалось удалить следующие групповые политики: </translation>
-    </message>
-    <message>
-        <location filename="console_impls/policy_impl.cpp" line="532"/>
-        <source> (critical policy)</source>
-        <translation> (критическая политика)</translation>
-    </message>
-    <message>
-        <source>Failed to delete some group policies</source>
-        <translation type="vanished">Не удалось удалить некоторые групповые политики</translation>
-    </message>
-    <message>
-        <location filename="console_impls/policy_impl.cpp" line="352"/>
+        <location filename="console_impls/policy_impl.cpp" line="432"/>
         <source>Add Link</source>
         <translation>Добавление связи</translation>
     </message>
@@ -3678,100 +3493,50 @@
 <context>
     <name>PolicyOUImpl</name>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="54"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="58"/>
         <source>Create OU</source>
         <translation>Создать подразделение</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="55"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="59"/>
         <source>Create a GPO and link to this OU</source>
         <translation>Создать политику и связать с этим подразделением</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="56"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="60"/>
         <source>Link existing GPO</source>
         <translation>Связать существующую политику</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="57"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="61"/>
         <source>Find GPO</source>
         <translation>Найти объект групповой политики</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="58"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="62"/>
         <source>Block inheritance</source>
         <translation>Блокировать наследование</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="112"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="114"/>
         <source>All policies</source>
         <translation>Все политики</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="247"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="245"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
-    <message>
-        <location filename="console_impls/policy_ou_impl.cpp" line="276"/>
-        <source>PDC-Emulator is connected</source>
-        <translation>Подключено к PDC-Emulator</translation>
-    </message>
 </context>
 <context>
     <name>PolicyOUResultsWidget</name>
     <message>
-        <location filename="policy_ou_results_widget.cpp" line="71"/>
-        <source>Remove link</source>
-        <translation>Удалить связь</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="72"/>
-        <source>Move up</source>
-        <translation>Переместить вверх</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="73"/>
-        <source>Move down</source>
-        <translation>Переместить вниз</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="83"/>
-        <source>Order</source>
-        <translation>Порядок</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="84"/>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="85"/>
-        <source>Enforced</source>
-        <translation>Принудительно</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="86"/>
-        <source>Disabled</source>
-        <translation>Отключено</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="334"/>
-        <source>Not found</source>
-        <translation>Не найдено</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget.cpp" line="370"/>
-        <source>The GPO for this link could not be found. It maybe have been recently created and is being replicated or it could have been deleted.</source>
-        <translation>Не удалось найти объект групповой политики для этой связи. Возможно, он был недавно создан и реплицируется или был удалён.</translation>
-    </message>
-    <message>
-        <location filename="policy_ou_results_widget/policy_ou_results_widget.ui" line="36"/>
+        <location filename="results_widgets/policy_ou_results_widget/policy_ou_results_widget.cpp" line="36"/>
         <source>Linked policies</source>
         <translation>Привязанные политики</translation>
     </message>
     <message>
-        <location filename="policy_ou_results_widget/policy_ou_results_widget.ui" line="58"/>
+        <location filename="results_widgets/policy_ou_results_widget/policy_ou_results_widget.cpp" line="39"/>
         <source>Inherited policies</source>
         <oldsource>Inherited</oldsource>
         <translation>Наследуемые политики</translation>
@@ -3780,43 +3545,35 @@
 <context>
     <name>PolicyResultsWidget</name>
     <message>
-        <location filename="policy_results_widget.cpp" line="74"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="75"/>
         <source>Delete link</source>
         <translation>Удалить связь</translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="82"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="83"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="83"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="84"/>
         <source>Enforced</source>
         <translation>Принудительно</translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="84"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="85"/>
         <source>Disabled</source>
         <translation>Отключено</translation>
     </message>
     <message>
-        <location filename="policy_results_widget.cpp" line="85"/>
+        <location filename="results_widgets/policy_results_widget.cpp" line="86"/>
         <source>Path</source>
         <translation>Путь</translation>
     </message>
-    <message>
-        <source>Incorrect permissions detected</source>
-        <translation type="vanished">Обнаружены неверные разрешения</translation>
-    </message>
-    <message>
-        <source>Permissions for this policy&apos;s GPT don&apos;t match the permissions for it&apos;s GPC object. Would you like to update GPT permissions?</source>
-        <translation type="vanished">Разрешения шаблона групповой политики у данной политики не совпадают с разрешениями её объекта контейнера групповой политики. Обновить разрешения шаблона групповой политики?</translation>
-    </message>
 </context>
 <context>
     <name>PolicyRootImpl</name>
     <message>
-        <location filename="console_impls/policy_root_impl.cpp" line="78"/>
+        <location filename="console_impls/policy_root_impl.cpp" line="80"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
@@ -3860,94 +3617,95 @@
 <context>
     <name>PropertiesDialog</name>
     <message>
-        <location filename="properties_dialog.ui" line="14"/>
-        <location filename="properties_dialog.cpp" line="137"/>
+        <location filename="properties_widgets/properties_dialog.ui" line="14"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="143"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="135"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="141"/>
         <source>%1 Properties</source>
         <oldsource>&quot;%1&quot; Properties</oldsource>
         <translation>%1 — свойства</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="169"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="181"/>
         <source>General</source>
         <translation>Общее</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="177"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="189"/>
         <source>Object</source>
         <translation>Объект</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="178"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="190"/>
         <source>Attributes</source>
         <translation>Атрибуты</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="196"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="208"/>
         <source>Account</source>
         <translation>Учётная запись</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="189"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="201"/>
         <source>Organization</source>
         <translation>Организация</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="190"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="202"/>
         <source>Telephones</source>
         <translation>Телефоны</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="201"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="213"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="228"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="239"/>
         <source>Group policy</source>
         <translation>Групповая политика</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="245"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="268"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="275"/>
         <source>LAPS</source>
         <translation>LAPS</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="246"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="283"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="207"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="219"/>
         <source>Members</source>
         <translation>Участники</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="212"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="224"/>
         <source>Member of</source>
         <translation>Группы</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="222"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="234"/>
         <source>Managed by</source>
         <translation>Руководство</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="228"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="245"/>
         <source>Operating System</source>
         <translation>Операционная система</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="217"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="229"/>
         <source>Delegation</source>
         <translation>Делегирование</translation>
     </message>
     <message>
-        <location filename="properties_dialog.cpp" line="188"/>
+        <location filename="properties_widgets/properties_dialog.cpp" line="200"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
@@ -3955,33 +3713,33 @@
 <context>
     <name>PropertiesMultiDialog</name>
     <message>
-        <location filename="properties_multi_dialog.ui" line="14"/>
+        <location filename="properties_widgets/properties_multi_dialog.ui" line="14"/>
         <source>Properties for Multiple Objects</source>
         <translation>Свойства для нескольких объектов</translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="61"/>
-        <location filename="properties_multi_dialog.cpp" line="69"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="61"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="69"/>
         <source>General</source>
         <translation>Общее</translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="62"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="62"/>
         <source>Account</source>
         <translation>Учётная запись</translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="63"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="63"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="64"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="64"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="properties_multi_dialog.cpp" line="65"/>
+        <location filename="properties_widgets/properties_multi_dialog.cpp" line="65"/>
         <source>Organization</source>
         <translation>Организация</translation>
     </message>
@@ -3989,17 +3747,17 @@
 <context>
     <name>PropertiesWarningDialog</name>
     <message>
-        <location filename="properties_warning_dialog.ui" line="14"/>
+        <location filename="properties_widgets/properties_warning_dialog.ui" line="14"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="properties_warning_dialog.cpp" line="35"/>
+        <location filename="properties_widgets/properties_warning_dialog.cpp" line="35"/>
         <source>You&apos;re switching to attributes tab, while another tab has unapplied changes. Choose to apply or discard those changes.</source>
         <translation>При переключении на вкладку атрибутов на предыдущей вкладке не были применены изменения. Выберите, применить или отменить эти изменения.</translation>
     </message>
     <message>
-        <location filename="properties_warning_dialog.cpp" line="36"/>
+        <location filename="properties_widgets/properties_warning_dialog.cpp" line="36"/>
         <source>You&apos;re switching from attributes tab, while it has unapplied changes. Choose to apply or discard those changes.</source>
         <translation>На вкладке атрибутов не были применены изменения. Выберите, применить или отменить эти изменения.</translation>
     </message>
@@ -4007,47 +3765,48 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="utils.cpp" line="111"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="609"/>
+        <location filename="utils.cpp" line="115"/>
         <source>Confirm action</source>
         <translation>Подтверждение действия</translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl.cpp" line="1967"/>
-        <source>Failed to find password settings container</source>
-        <translation>Не удалось найти контейнер парольных настроек</translation>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="622"/>
+        <source>Password settings container is not available</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl/console_object_operations.cpp" line="609"/>
-        <source>Fine-grained password policies</source>
-        <translation>Детализированные политики паролей</translation>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="973"/>
+        <source>Sites container is not available</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="console_impls/object_impl/console_object_operations.cpp" line="963"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="981"/>
         <source>Sites</source>
         <translation>Сайты</translation>
     </message>
     <message>
-        <location filename="utils.cpp" line="470"/>
+        <location filename="utils.cpp" line="474"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
     <message>
-        <location filename="utils.cpp" line="521"/>
+        <location filename="utils.cpp" line="475"/>
         <source>User configuration disabled</source>
         <translation>Параметры конфигурации пользователя отключены</translation>
     </message>
     <message>
-        <location filename="utils.cpp" line="522"/>
+        <location filename="utils.cpp" line="476"/>
         <source>Computer configuration disabled</source>
         <translation>Параметры конфигурации компьютера отключены</translation>
     </message>
     <message>
-        <location filename="utils.cpp" line="523"/>
+        <location filename="utils.cpp" line="477"/>
         <source>Disabled</source>
         <translation>Отключено</translation>
     </message>
     <message>
-        <location filename="utils.cpp" line="524"/>
+        <location filename="utils.cpp" line="478"/>
         <source>Undefined GPO status</source>
         <translation>Статус не определён</translation>
     </message>
@@ -4062,65 +3821,64 @@
         <translation>Ошибка</translation>
     </message>
     <message>
+        <location filename="console_impls/policy_impl.cpp" line="846"/>
         <source>Failed to start GPUI. Check that it&apos;s installed.</source>
         <translation>Не удалось запустить GPUI. Проверьте установлен ли он.</translation>
     </message>
     <message>
-        <location filename="console_impls/all_policies_folder_impl.cpp" line="124"/>
-        <location filename="console_impls/policy_ou_impl.cpp" line="268"/>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="125"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="270"/>
         <source>Creation is not available</source>
         <translation>Создание не доступно</translation>
     </message>
     <message>
-        <location filename="console_impls/all_policies_folder_impl.cpp" line="125"/>
-        <location filename="console_impls/policy_ou_impl.cpp" line="269"/>
+        <location filename="console_impls/all_policies_folder_impl.cpp" line="126"/>
+        <location filename="console_impls/policy_ou_impl.cpp" line="271"/>
         <source>ADMC is connected to DC without the PDC-Emulator role - group policy creation is prohibited by the setting. Connect to PDC-Emulator?</source>
         <translation>ADMC подключен к КД без роли PDC-Emulator - создание групповых политик запрещено настройкой. Подключиться к PDC-контроллеру?</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="323"/>
+        <location filename="console_impls/policy_impl.cpp" line="793"/>
         <source>Edition is not available</source>
         <translation>Редактирование не доступно</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="324"/>
+        <location filename="console_impls/policy_impl.cpp" line="794"/>
         <source>ADMC is connected to DC without the PDC-Emulator role - group policy editing is prohibited by the setting. Connect to PDC-Emulator?</source>
         <translation>ADMC подключен к КД без роли PDC-Emulator - редактирование групповых политик запрещено настройкой. Подключиться к PDC-контроллеру?</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="329"/>
+        <location filename="fsmo/fsmo_utils.cpp" line="65"/>
         <source>PDC-Emulator is connected</source>
         <translation>Подключено к PDC-Emulator</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="542"/>
+        <location filename="console_impls/policy_impl.cpp" line="524"/>
         <source>Deletion is not available</source>
         <translation>Удаление не доступно</translation>
     </message>
     <message>
-        <location filename="console_impls/policy_impl.cpp" line="543"/>
+        <location filename="console_impls/policy_impl.cpp" line="525"/>
         <source>ADMC is connected to DC without the PDC-Emulator role - group policy deletion is prohibited by the setting. Connect to PDC-Emulator?</source>
         <translation>ADMC подключен к КД без роли PDC-Emulator - удаление групповых политик запрещено настройкой. Подключиться к PDC-контроллеру?</translation>
     </message>
     <message>
-        <source>Theme from settings not found. Fallback theme is set.</source>
-        <translation type="vanished">Тема, указанная в настройках, не найдена. Установлена тема по умолчанию.</translation>
-    </message>
-    <message>
-        <location filename="icon_manager/icon_manager.cpp" line="86"/>
+        <location filename="managers/icon_manager.cpp" line="423"/>
         <source>Theme from settings not found. System theme is set.</source>
         <translation>Тема, указанная в настройках, не найдена. Установлена системная тема.</translation>
     </message>
     <message>
-        <location filename="icon_manager/icon_manager.cpp" line="310"/>
+        <location filename="managers/icon_manager.cpp" line="394"/>
         <source> (System)</source>
         <translation> (Системная)</translation>
     </message>
     <message>
+        <location filename="console_widget/console_widget.cpp" line="1022"/>
         <source>Loading...</source>
         <translation>Загрузка...</translation>
     </message>
     <message>
+        <location filename="managers/icon_manager.cpp" line="367"/>
         <source>Could not open a theme: </source>
         <translation>Невозможно загрузить тему: </translation>
     </message>
@@ -4128,43 +3886,43 @@
 <context>
     <name>QueryFolderImpl</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="52"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="54"/>
         <source>Query folder</source>
         <translation>Папка запросов</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="53"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="55"/>
         <source>Query item</source>
         <translation>Элемент запроса</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="55"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="57"/>
         <source>New</source>
         <translation>Создать</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="61"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="63"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="63"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="65"/>
         <source>&amp;Import query...</source>
         <translation>&amp;Импортировать запрос...</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="263"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="288"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="265"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="290"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="263"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="265"/>
         <source>Can&apos;t cut and paste query folder into itself.</source>
         <translation>Невозможно вырезать и вставить папку запросов в саму себя.</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="288"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="290"/>
         <source>There&apos;s already an item with this name.</source>
         <translation>Элемент с этим именем уже существует.</translation>
     </message>
@@ -4172,12 +3930,12 @@
 <context>
     <name>QueryItemImpl</name>
     <message>
-        <location filename="console_impls/query_item_impl.cpp" line="52"/>
+        <location filename="console_impls/query_item_impl.cpp" line="53"/>
         <source>Edit...</source>
         <translation>Изменить...</translation>
     </message>
     <message>
-        <location filename="console_impls/query_item_impl.cpp" line="53"/>
+        <location filename="console_impls/query_item_impl.cpp" line="54"/>
         <source>Export query...</source>
         <translation>Экспортировать запрос...</translation>
     </message>
@@ -4209,17 +3967,17 @@
 <context>
     <name>RenameGroupDialog</name>
     <message>
-        <location filename="rename_group_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_group_dialog.ui" line="14"/>
         <source>Rename Group</source>
         <translation>Переименовать группу</translation>
     </message>
     <message>
-        <location filename="rename_group_dialog.ui" line="22"/>
+        <location filename="rename_dialogs/rename_group_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="rename_group_dialog.ui" line="32"/>
+        <location filename="rename_dialogs/rename_group_dialog.ui" line="32"/>
         <source>Group name (pre-Windows 2000):</source>
         <oldsource>Logon name (pre-Windows 2000):</oldsource>
         <translation>Имя группы (до Windows 2000):</translation>
@@ -4228,12 +3986,12 @@
 <context>
     <name>RenameObjectHelper</name>
     <message>
-        <location filename="rename_object_helper.cpp" line="33"/>
+        <location filename="rename_object_helper.cpp" line="34"/>
         <source>Object %1 was renamed.</source>
         <translation>Объект %1 был переименован.</translation>
     </message>
     <message>
-        <location filename="rename_object_helper.cpp" line="38"/>
+        <location filename="rename_object_helper.cpp" line="39"/>
         <source>Failed to rename object %1</source>
         <translation>Не удалось переименовать объект %1</translation>
     </message>
@@ -4241,12 +3999,12 @@
 <context>
     <name>RenameOtherDialog</name>
     <message>
-        <location filename="rename_other_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_other_dialog.ui" line="14"/>
         <source>Rename Object</source>
         <translation>Переименовать объект</translation>
     </message>
     <message>
-        <location filename="rename_other_dialog.ui" line="22"/>
+        <location filename="rename_dialogs/rename_other_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -4254,12 +4012,12 @@
 <context>
     <name>RenamePolicyDialog</name>
     <message>
-        <location filename="rename_policy_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_policy_dialog.ui" line="14"/>
         <source>Rename Policy</source>
         <translation>Переименовать политику</translation>
     </message>
     <message>
-        <location filename="rename_policy_dialog.ui" line="22"/>
+        <location filename="rename_dialogs/rename_policy_dialog.ui" line="22"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -4267,38 +4025,38 @@
 <context>
     <name>RenameUserDialog</name>
     <message>
-        <location filename="rename_user_dialog.ui" line="14"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="14"/>
         <source>Rename User</source>
         <translation>Переименовать пользователя</translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="52"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="52"/>
         <source>Display name:</source>
         <oldsource>Display name</oldsource>
         <translation>Отображаемое имя:</translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="32"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="32"/>
         <source>First name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="42"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="42"/>
         <source>Last name:</source>
         <translation>Фамилия:</translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="22"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="22"/>
         <source>Full name:</source>
         <translation>Полное имя:</translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="62"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="62"/>
         <source>Logon name:</source>
         <translation>Имя для входа:</translation>
     </message>
     <message>
-        <location filename="rename_user_dialog.ui" line="79"/>
+        <location filename="rename_dialogs/rename_user_dialog.ui" line="79"/>
         <source>Logon name (pre-Windows 2000):</source>
         <translation>Имя для входа (до Windows 2000):</translation>
     </message>
@@ -4466,22 +4224,22 @@
         <translation>Пользователи и группы</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="58"/>
+        <location filename="tabs/security_tab.ui" line="70"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="58"/>
+        <location filename="tabs/security_tab.ui" line="77"/>
         <source>Add well-known trustee...</source>
         <translation>Добавить известное доверенное лицо...</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="65"/>
+        <location filename="tabs/security_tab.ui" line="84"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="74"/>
+        <location filename="tabs/security_tab.ui" line="93"/>
         <source>Permissions</source>
         <translation>Разрешения</translation>
     </message>
@@ -4501,22 +4259,22 @@
         <translation>Обычные</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="133"/>
+        <location filename="tabs/security_tab.ui" line="185"/>
         <source>Extended</source>
         <translation>Расширенные</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="197"/>
+        <location filename="tabs/security_tab.ui" line="207"/>
         <source>Creation/deletion</source>
         <translation>Создание/удаление</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="219"/>
+        <location filename="tabs/security_tab.ui" line="229"/>
         <source>Read/write</source>
         <translation>Чтение/запись</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.ui" line="241"/>
+        <location filename="tabs/security_tab.ui" line="251"/>
         <source>Task delegation</source>
         <translation>Делегирование задач</translation>
     </message>
@@ -4525,10 +4283,6 @@
         <source>More...</source>
         <translation>Дополнительно...</translation>
     </message>
-    <message>
-        <source>Delegation</source>
-        <translation type="vanished">Делегирование</translation>
-    </message>
     <message>
         <location filename="tabs/security_tab.cpp" line="130"/>
         <source>Show descriptor in SDDL</source>
@@ -4545,65 +4299,32 @@
         <translation>Этот объект</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="213"/>
+        <location filename="tabs/security_tab.cpp" line="254"/>
         <source>This object and all child objects</source>
         <translation>Этот объект и все дочерние объекты</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="214"/>
+        <location filename="tabs/security_tab.cpp" line="255"/>
         <source>All child objects</source>
         <translation>Все дочерние объекты</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="244"/>
+        <location filename="tabs/security_tab.cpp" line="285"/>
         <source>Child objects: </source>
         <translation>Дочерние объекты: </translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="302"/>
-        <source>Add Trustee</source>
-        <translation>Добавить доверенное лицо</translation>
-    </message>
-    <message>
-        <location filename="tabs/security_tab.cpp" line="335"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="tabs/security_tab.cpp" line="335"/>
-        <source>Failed to add some trustee&apos;s because they are already in the list.</source>
-        <translation>Не удалось добавить некоторых доверенных лиц, так как они уже имеются в списке.</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityTabEdit</name>
-    <message>
-        <location filename="tabs/security_tab.cpp" line="157"/>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <location filename="tabs/security_tab.cpp" line="158"/>
-        <source>Allowed</source>
-        <translation>Разрешено</translation>
-    </message>
-    <message>
-        <location filename="tabs/security_tab.cpp" line="159"/>
-        <source>Denied</source>
-        <translation>Запрещено</translation>
-    </message>
-    <message>
-        <location filename="tabs/security_tab.cpp" line="474"/>
+        <location filename="tabs/security_tab.cpp" line="418"/>
         <source>Add Trustee</source>
         <translation>Добавить доверенное лицо</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="586"/>
+        <location filename="tabs/security_tab.cpp" line="530"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="tabs/security_tab.cpp" line="586"/>
+        <location filename="tabs/security_tab.cpp" line="530"/>
         <source>Failed to add some trustee&apos;s because they are already in the list.</source>
         <translation>Не удалось добавить некоторых доверенных лиц, так как они уже имеются в списке.</translation>
     </message>
@@ -4633,7 +4354,7 @@
 <context>
     <name>SelectContainerDialog</name>
     <message>
-        <location filename="select_container_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_container_dialog.ui" line="14"/>
         <source>Select Container</source>
         <oldsource>Select a container</oldsource>
         <translation>Выбор контейнера</translation>
@@ -4647,12 +4368,12 @@
 <context>
     <name>SelectObjectAdvancedDialog</name>
     <message>
-        <location filename="select_object_advanced_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_object_advanced_dialog.ui" line="14"/>
         <source>Select Object</source>
         <translation>Выбор объекта</translation>
     </message>
     <message>
-        <location filename="select_object_advanced_dialog.cpp" line="39"/>
+        <location filename="select_dialogs/select_object_advanced_dialog.cpp" line="39"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
@@ -4660,85 +4381,85 @@
 <context>
     <name>SelectObjectDialog</name>
     <message>
-        <location filename="select_object_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="14"/>
         <source>Select Object</source>
         <translation>Выбор объекта</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="84"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="84"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="85"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="85"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="86"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="86"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="87"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="87"/>
         <source>Folder</source>
         <translation>Папка</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="94"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="94"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="101"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="101"/>
         <source>Advanced</source>
         <translation>Продвинутый</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="22"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="22"/>
         <source>Classes:</source>
         <translation>Классы:</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="32"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="32"/>
         <source>Search in:</source>
         <translation>Искать в:</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="42"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="42"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.ui" line="54"/>
+        <location filename="select_dialogs/select_object_dialog.ui" line="54"/>
         <source>Selected objects:</source>
         <translation>Выбранные объекты:</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="111"/>
-        <location filename="select_object_dialog.cpp" line="118"/>
-        <location filename="select_object_dialog.cpp" line="176"/>
-        <location filename="select_object_dialog.cpp" line="240"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="125"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="132"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="190"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="254"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="118"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="132"/>
         <source>You must select at least one object.</source>
         <translation>Требуется выбрать хотя бы один объект.</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="176"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="190"/>
         <source>Failed to find any matches.</source>
         <translation>Совпадений не найдено.</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="240"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="254"/>
         <source>Selected object is already in the list.</source>
         <translation>Выбранный объект уже имеется в списке.</translation>
     </message>
     <message>
-        <location filename="select_object_dialog.cpp" line="111"/>
+        <location filename="select_dialogs/select_object_dialog.cpp" line="125"/>
         <source>This selection accepts only one object. Remove extra objects to proceed.</source>
         <translation>Здесь можно выбрать только один объект. Для продолжения уберите лишние объекты.</translation>
     </message>
@@ -4746,12 +4467,12 @@
 <context>
     <name>SelectObjectMatchDialog</name>
     <message>
-        <location filename="select_object_match_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_object_match_dialog.ui" line="14"/>
         <source>Select Match</source>
         <translation>Выбор совпадения</translation>
     </message>
     <message>
-        <location filename="select_object_match_dialog.ui" line="20"/>
+        <location filename="select_dialogs/select_object_match_dialog.ui" line="20"/>
         <source>There are multiple matches. Select one or more to add to the list.</source>
         <translation>Было найдено несколько совпадений. Выберите одно или несколько совпадений для добавления в список.</translation>
     </message>
@@ -4759,7 +4480,7 @@
 <context>
     <name>SelectPolicyDialog</name>
     <message>
-        <location filename="select_policy_dialog.ui" line="14"/>
+        <location filename="select_dialogs/select_policy_dialog.ui" line="14"/>
         <source>Select Policy</source>
         <translation>Выбрать политику</translation>
     </message>
@@ -4801,22 +4522,22 @@
         <translation>&lt;&lt; Убрать</translation>
     </message>
     <message>
-        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="39"/>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="47"/>
         <source>Sites not in this site link</source>
         <translation>Сайты не в этой связи</translation>
     </message>
     <message>
-        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="40"/>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="48"/>
         <source>Sites in this site link</source>
         <translation>Сайты в этой связи</translation>
     </message>
     <message>
-        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="42"/>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="50"/>
         <source>Site links not included in this bridge</source>
         <translation>Связи сайтов не в этом мосте</translation>
     </message>
     <message>
-        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="43"/>
+        <location filename="tabs/sites_link_tab/sites_link_common_widget.cpp" line="51"/>
         <source>Site links included in this bridge</source>
         <translation>Связи сайтов в этом мосте</translation>
     </message>
@@ -4824,17 +4545,17 @@
 <context>
     <name>SitesLinkEdit</name>
     <message>
-        <location filename="attribute_edits/sites_link_edit.cpp" line="121"/>
+        <location filename="attribute_edits/sites_link_edit.cpp" line="124"/>
         <source>Site link object must link at least two sites</source>
         <translation>Связь должна связывать минимум два сайта</translation>
     </message>
     <message>
-        <location filename="attribute_edits/sites_link_edit.cpp" line="122"/>
+        <location filename="attribute_edits/sites_link_edit.cpp" line="125"/>
         <source>Link bridge object must link at least two site links</source>
         <translation>Мост должен связывать минимум две связи сайтов</translation>
     </message>
     <message>
-        <location filename="attribute_edits/sites_link_edit.cpp" line="123"/>
+        <location filename="attribute_edits/sites_link_edit.cpp" line="126"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -5017,7 +4738,7 @@
 <context>
     <name>country_widget</name>
     <message>
-        <location filename="attribute_edits/country_combo.cpp" line="192"/>
+        <location filename="attribute_edits/country_combo.cpp" line="191"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
@@ -5025,7 +4746,7 @@
 <context>
     <name>object_impl</name>
     <message numerus="yes">
-        <location filename="console_impls/object_impl.cpp" line="1705"/>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="631"/>
         <source>%n object(s)</source>
         <translation>
             <numerusform>%n объект</numerusform>
@@ -5037,20 +4758,28 @@
 <context>
     <name>object_impl.cpp</name>
     <message>
-        <location filename="search_thread.cpp" line="108"/>
+        <location filename="search_thread.cpp" line="103"/>
         <source>Failed to connect to server while searching for objects.</source>
         <translation>Не удалось подключиться к серверу во время поиска объектов.</translation>
     </message>
     <message>
-        <location filename="search_thread.cpp" line="110"/>
+        <location filename="search_thread.cpp" line="105"/>
         <source>Could not load all objects. Increase object display limit in Filter Options or reduce number of objects by applying a filter. Filter Options is accessible from main window&apos;s menubar via the &quot;View&quot; menu.</source>
         <translation>Не удалось загрузить все объекты. Увеличьте лимит отображения объектов в опциях или уменьшите количество объектов, применив фильтр. Параметры фильтра доступны в меню «Вид».</translation>
     </message>
 </context>
+<context>
+    <name>password_settings_impl</name>
+    <message>
+        <location filename="console_impls/object_impl/console_object_operations.cpp" line="617"/>
+        <source>Password settings</source>
+        <translation>Параметры паролей</translation>
+    </message>
+</context>
 <context>
     <name>policy_root_impl</name>
     <message>
-        <location filename="console_impls/policy_root_impl.cpp" line="88"/>
+        <location filename="console_impls/policy_root_impl.cpp" line="90"/>
         <source>Group Policy Objects</source>
         <translation>Объекты групповой политики</translation>
     </message>
@@ -5058,7 +4787,7 @@
 <context>
     <name>query</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="343"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="357"/>
         <source>Saved Queries</source>
         <translation>Сохранённые запросы</translation>
     </message>
@@ -5066,35 +4795,36 @@
 <context>
     <name>query.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="545"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="560"/>
         <source>Name may not be empty</source>
         <translation>Имя не может быть пустым</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="324"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="546"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="556"/>
-        <location filename="console_impls/query_folder_impl.cpp" line="559"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="325"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="339"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="561"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="571"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="574"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="555"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="570"/>
         <source>There&apos;s already an item with this name.</source>
         <translation>Элемент с этим именем уже существует.</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="558"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="573"/>
         <source>Names cannot contain &quot;/&quot;.</source>
         <translation>Имена не могут содержать «/».</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="323"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="335"/>
         <source>Query file is corrupted.</source>
         <translation>Файл запроса повреждён.</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="319"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="320"/>
         <source>Could not open a query file.</source>
         <translation>Невозможно открыть файл запроса.</translation>
     </message>
@@ -5102,12 +4832,12 @@
 <context>
     <name>query_folder.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="468"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="483"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="469"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="484"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
@@ -5115,7 +4845,7 @@
 <context>
     <name>query_folder_impl.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="574"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="589"/>
         <source>Are you sure you want to delete this item?</source>
         <translation>Удалить этот элемент?</translation>
     </message>
@@ -5123,18 +4853,18 @@
 <context>
     <name>query_item_impl.cpp</name>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="301"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="304"/>
         <source>Import Query</source>
         <translation>Импортировать запрос</translation>
     </message>
     <message>
-        <location filename="console_impls/query_folder_impl.cpp" line="303"/>
-        <location filename="console_impls/query_item_impl.cpp" line="174"/>
+        <location filename="console_impls/query_folder_impl.cpp" line="308"/>
+        <location filename="console_impls/query_item_impl.cpp" line="175"/>
         <source>JSON (*.json)</source>
         <translation>JSON (*.json)</translation>
     </message>
     <message>
-        <location filename="console_impls/query_item_impl.cpp" line="172"/>
+        <location filename="console_impls/query_item_impl.cpp" line="173"/>
         <source>Export Query</source>
         <translation>Экспортировать запрос</translation>
     </message>
@@ -5142,12 +4872,12 @@
 <context>
     <name>utils.cpp</name>
     <message>
-        <location filename="utils.cpp" line="442"/>
+        <location filename="utils.cpp" line="381"/>
         <source>Input field for Name contains one or more of the following illegal characters: # , + &quot; \ &lt; &gt; ; = (leading space) (trailing space) (leading question mark)</source>
         <translation>Поле ввода &quot;Имя&quot; содержит один или несколько из следующих недопустимых символов: # , + &quot; \ &lt; &gt; ; = (пробел в начале) (пробел в конце) (? в начале)</translation>
     </message>
     <message>
-        <location filename="utils.cpp" line="443"/>
+        <location filename="utils.cpp" line="388"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>