diff --git a/source/ubl-settings-diskquota.cc b/source/ubl-settings-diskquota.cc index 68e3d4a..35c46b2 100755 --- a/source/ubl-settings-diskquota.cc +++ b/source/ubl-settings-diskquota.cc @@ -150,12 +150,14 @@ void MainWindow::init_tree_view_general() { GeneralQuotasTree->append_column(str_device_project, m_columnsGeneral.device); GeneralQuotasTree->append_column(str_user, m_columnsGeneral.user); GeneralQuotasTree->append_column(str_group, m_columnsGeneral.group); + GeneralQuotasTree->append_column(str_projects, m_columnsGeneral.projects); GeneralQuotasTree->append_column(str_tw_soft_limit, m_columnsGeneral.soft_limit_size); GeneralQuotasTree->append_column(str_tw_severe_limitation, m_columnsGeneral.hard_limit_size); - GeneralQuotasTree->append_column(str_tw_deferring_size, m_columnsGeneral.hard_limit_size_delay); GeneralQuotasTree->append_column(str_tw_soft_limit_files, m_columnsGeneral.soft_limit_files); GeneralQuotasTree->append_column(str_tw_severe_limitation_files, m_columnsGeneral.hard_limit_files); - GeneralQuotasTree->append_column(str_tw_severe_limitation_files, m_columnsGeneral.hard_limit_delay); + GeneralQuotasTree->append_column(str_tw_deferring_size, m_columnsGeneral.deferring_size); + GeneralQuotasTree->append_column(str_tw_deferring_files, m_columnsGeneral.deferring_files); + } void MainWindow::lacalization() { time_t now = time(0); diff --git a/source/ubl-settings-diskquota.h b/source/ubl-settings-diskquota.h index e6550f8..283a25b 100644 --- a/source/ubl-settings-diskquota.h +++ b/source/ubl-settings-diskquota.h @@ -105,22 +105,22 @@ #define str_user_quotas_device _("User quotas for this device: ") #define str_soft_limit_size _("Soft limit (size)") +#define str_tw_soft_limit _("Soft limit\n(size)") #define str_hard_limit_size _("Hard limit (size)") #define str_deferring_hard_limit_size _("Deferring a hard limit (size)") #define str_hard_activation_size _("Hard limit activation time (size)") -#define str_soft_restriction_files _("Soft Restriction (files)") -#define str_severe_limitation_files _("Severe limitation (files)") -#define str_deferring_limit_files _("Deferring a hard limit (files)") #define str_hard_limit_time _("Hard limit (file) activation time") #define str_group_quotas_device _("Group quotas for this device:") #define str_general_settings _("General settings") -#define str_tw_soft_limit _("Soft limit\n(size)") #define str_tw_severe_limitation _("Severe\nlimitation\n(size)") -#define str_tw_deferring_size _("Deferring\na hard\nlimit\n(size)") +#define str_tw_deferring_size _("Deferring\n(size)") +#define str_tw_deferring_files _("Deferring\n(files)") #define str_tw_soft_limit_files _("Soft limit\n(files)") #define str_tw_severe_limitation_files _("Severe\nlimitation\n(files)") -#define str_tw_deferring_limit_files _("Deferring\na hard\nlimit\n(files)") +#define str_soft_restriction_files _("Soft Restriction (files)") +#define str_severe_limitation_files _("Severe limitation (files)") +#define str_deferring_limit_files _("Deferring a hard limit (files)") #define info_box_ok_css "boxInfoMessOK" #define info_box_error_css "boxInfoMessError" #define icon_checked "com.ublinux.ubl-settings-diskquota.checked" @@ -155,7 +155,7 @@ class MainWindow : public Gtk::ApplicationWindow { ModelColumns() {add(name), add(quotas); add(size), add(soft_limit_size), add(hard_limit_size); add(hard_limit_size_delay), add(files); add(soft_limit_files), - add(hard_limit_files), add(hard_limit_delay); } + add(hard_limit_delay), add(hard_limit_files); } Gtk::TreeModelColumn name; Gtk::TreeModelColumn quotas; Gtk::TreeModelColumn size; @@ -164,26 +164,27 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::TreeModelColumn hard_limit_size_delay; Gtk::TreeModelColumn files; Gtk::TreeModelColumn soft_limit_files; - Gtk::TreeModelColumn hard_limit_files; Gtk::TreeModelColumn hard_limit_delay; + Gtk::TreeModelColumn hard_limit_files; }; class ModelColumnsGeneral : public Gtk::TreeModel::ColumnRecord { public: ModelColumnsGeneral() {add(status), add(type_quotas); add(device), - add(user), add(group); add(soft_limit_size), - add(hard_limit_size); add(hard_limit_size_delay); - add(soft_limit_files), add(hard_limit_files), add(hard_limit_delay); } + add(user), add(group), add(projects); add(soft_limit_size), + add(hard_limit_size); add(soft_limit_files), add(hard_limit_files), add(deferring_size), + add(deferring_files); } Gtk::TreeModelColumn status; Gtk::TreeModelColumn type_quotas; Gtk::TreeModelColumn device; Gtk::TreeModelColumn user; Gtk::TreeModelColumn group; + Gtk::TreeModelColumn projects; Gtk::TreeModelColumn soft_limit_size; Gtk::TreeModelColumn hard_limit_size; - Gtk::TreeModelColumn hard_limit_size_delay; Gtk::TreeModelColumn soft_limit_files; Gtk::TreeModelColumn hard_limit_files; - Gtk::TreeModelColumn hard_limit_delay; + Gtk::TreeModelColumn deferring_size; + Gtk::TreeModelColumn deferring_files; }; ModelColumns m_columns; ModelColumnsGeneral m_columnsGeneral; diff --git a/ubl-settings-diskquota_ru.po b/ubl-settings-diskquota_ru.po index bc44df0..8b9b0ac 100644 --- a/ubl-settings-diskquota_ru.po +++ b/ubl-settings-diskquota_ru.po @@ -91,6 +91,20 @@ msgstr "" "ограничения\n" "(файлы)" +msgid "" +"Deferring\n" +"(files)" +msgstr "" +"Отсрочка\n" +"(файлы)" + +msgid "" +"Deferring\n" +"(size)" +msgstr "" +"Отсрочка\n" +"(объём)" + #: source/ubl-settings-quotas.cc:239 source/ubl-settings-quotas.cc:374 msgid "" "Deferring\n" @@ -417,7 +431,7 @@ msgstr "Жесткий лимит (файлы)" #: source/ubl-settings-quotas.cc:108 source/ubl-settings-quotas.cc:129 #: source/ubl-settings-quotas.cc:126 source/ubl-settings-quotas.cc:123 msgid "Hard limit (size)" -msgstr "Жесткий ограничение (объём)" +msgstr "Жесткий лимит (объём)" #: source/ubl-settings-quotas.cc:120 source/ubl-settings-quotas.cc:110 #: source/ubl-settings-quotas.cc:131 source/ubl-settings-quotas.cc:128 @@ -550,7 +564,7 @@ msgid "" "(files)" msgstr "" "Жесткое\n" -"ограничение\n" +"лимит\n" "(файлы)" #: source/ubl-settings-quotas.cc:238 source/ubl-settings-quotas.cc:373 @@ -560,12 +574,12 @@ msgid "" "(size)" msgstr "" "Жесткое\n" -"ограничение\n" +"лимит\n" "(объём)" #: source/ubl-settings-quotas.cc:193 msgid "Severe limitation (files)" -msgstr "Жесткое ограничение (файлы)" +msgstr "Жесткое лимит (файлы)" #: source/ubl-settings-quotas.cc:186 source/ubl-settings-quotas.cc:199 #: source/ubl-settings-quotas.cc:210 source/ubl-settings-quotas.cc:236 @@ -588,12 +602,12 @@ msgid "" "(files)" msgstr "" "Мягкое\n" -"ограничение\n" +"лимит\n" "(файлы)" #: source/ubl-settings-quotas.cc:192 msgid "Soft Restriction (files)" -msgstr "Мягкое ограничение (файлы)" +msgstr "Мягкое лимит (файлы)" #: source/ubl-settings-quotas.cc:202 source/ubl-settings-quotas.cc:205 #: source/ubl-settings-quotas.cc:212 source/ubl-settings-quotas.cc:217 @@ -607,7 +621,7 @@ msgstr "Мягкое ограничение (файлы)" #, fuzzy msgid "Soft limit" msgstr "" -"Мягкий ограничение\n" +"Мягкий лимит\n" "(объём)" #: source/ubl-settings-quotas.cc:322 source/ubl-settings-quotas.cc:326 @@ -618,8 +632,8 @@ msgid "" "(files)" msgstr "" "Мягкий\n" -"ограничение\n" -"(объём)" +"лимит\n" +"(файлы)" #: source/ubl-settings-quotas.cc:237 source/ubl-settings-quotas.cc:372 #: source/ubl-settings-quotas.cc:317 source/ubl-settings-quotas.cc:321 @@ -629,22 +643,29 @@ msgid "" "Soft limit\n" "(size)" msgstr "" -"Мягкий ограничение\n" +"Мягкий лимит\n" "(объём)" +msgid "" +"Soft limit\n" +"(file)" +msgstr "" +"Мягкий лимит\n" +"(файлы)" + #: source/ubl-settings-quotas.cc:122 source/ubl-settings-quotas.cc:112 #: source/ubl-settings-quotas.cc:133 source/ubl-settings-quotas.cc:130 #: source/ubl-settings-quotas.cc:127 msgid "Soft limit (files)" msgstr "" -"Мягкий ограничение\n" +"Мягкий лимит\n" "(файлы)" #: source/ubl-settings-quotas.cc:187 source/ubl-settings-quotas.cc:117 #: source/ubl-settings-quotas.cc:107 source/ubl-settings-quotas.cc:128 #: source/ubl-settings-quotas.cc:125 source/ubl-settings-quotas.cc:122 msgid "Soft limit (size)" -msgstr "Мягкий ограничение (объём)" +msgstr "Мягкий лимит (объём)" #: source/ubl-settings-quotas.cc:620 source/ubl-settings-quotas.cc:533 #: source/ubl-settings-quotas.cc:467 @@ -786,7 +807,7 @@ msgid "ubl-settings-quotas" msgstr "Квоты" #~ msgid "Severe limitation (size)" -#~ msgstr "Жесткое ограничение (объём)" +#~ msgstr "Жесткое лимит (объём)" #, fuzzy #~ msgid "Hard limit activation time (files)"