diff --git a/screenshot/screenshot.png b/screenshot/screenshot.png index 3fa8cdd..8eea794 100644 Binary files a/screenshot/screenshot.png and b/screenshot/screenshot.png differ diff --git a/source/ubl-settings-quotas.cc b/source/ubl-settings-quotas.cc index 008909f..28bf58e 100755 --- a/source/ubl-settings-quotas.cc +++ b/source/ubl-settings-quotas.cc @@ -59,7 +59,6 @@ void MainWindow::settings() { this->view_add_columns(*usersQuotasTree); this->view_add_columns(*groupsQuotasTree); this->event(); - } else { boxFuncs->set_sensitive(false); @@ -131,6 +130,32 @@ void MainWindow::lacalization() { filtersHardFilesFilterCheckbox->set_label(gettext("Hard limit (files)")); filtersHardFilesDelayFilterCheckbox->set_label(gettext("Hard limit (files) delay")); filtersHardFilesActivationFilterCheckbox->set_label(gettext("Hard limit (file) activation time")); + quotegroupDeviceLabel->set_text(gettext("Device:")); + quotegroupDiskQuotasLabel->set_text(gettext("Disk quotas for this device:")); + quotegroupGroupQuotasLabel->set_text(gettext("Group quotas for this device:")); + quotegroupSizeFrameLabel->set_text(gettext("Size")); + quotegroupFilesFrameLabel->set_text(gettext("Files")); + quotegroupSizeCurrentlyLabel->set_text(gettext("Currently using:")); + quotegroupSizeSoftLimitLabel->set_text(gettext("Soft limit")); + quoteSizeHardLimitLabel->set_text(gettext("Hard limit")); + quoteFilesHardLimitLabel->set_text(gettext("Hard limit")); + quotegroupFilesSoftLimitLabel->set_text(gettext("Soft limit")); + quotegroupFilesCurrentlyLabel->set_text(gettext("Currently using:")); + quoteuserDiskQuotasLabel->set_text(gettext("Disk quotas for this device:")); + quoteuserDeviceLabel->set_text(gettext("Device:")); + quoteuserGroupQuotasLabel->set_text(gettext("User quotas for this device: ")); + quoteuserSizeFrameLabel->set_text(gettext("Size")); + quoteuserSizeCurrentlyLabel->set_text(gettext("Currently using:")); + quoteuserSizeSoftLimitLabel->set_text(gettext("Soft limit")); + quoteuserSizeHardLimitLabel1->set_text(gettext("Hard limit")); + quoteuserFileSystemLabel->set_text(gettext("File system:")); + quoteuserFilesFrameLabel->set_text(gettext("Files")); + quoteuserFilesCurrentlyLabel->set_text(gettext("Currently using: ")); + quoteuserFilesSoftLimitLabel->set_text(gettext("Soft limit")); + quoteFilesHardLimitLabel1->set_text(gettext("Hard limit")); + quoteuserFilesHarLimitLabel->set_text(gettext("files")); + quoteuserFilesSoftLimitlabel->set_text(gettext("files")); + quotegroupFileSystemLabel->set_text(gettext("File system:")); } void MainWindow::add_CSS() { @@ -140,7 +165,7 @@ void MainWindow::add_CSS() { Glib::RefPtr screen = Gdk::Screen::get_default();//get default screen styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application HeadBackgroundImage->set(path_img_head_background); - //Glib::RefPtr headerTopic_css = headerTopic->get_style_context(); + Glib::RefPtr headLabel_css = headLabel->get_style_context(); Glib::RefPtr boxButton_css = boxButton->get_style_context(); Glib::RefPtr boxSave_css = boxSave->get_style_context(); Glib::RefPtr headerBar_css = headerBar->get_style_context(); @@ -149,7 +174,7 @@ void MainWindow::add_CSS() { boxSave_css->add_class("bkim_no_plug"); } - //headerTopic_css->add_class("textHead"); + headLabel_css->add_class("textHead"); } @@ -235,6 +260,36 @@ void MainWindow::get_builder() { builder->get_widget("GroupsTabLabel", GroupsTabLabel); builder->get_widget("groupsQuotasTree", groupsQuotasTree); builder->get_widget("usersQuotasTree", usersQuotasTree); + builder->get_widget("quotegroupDeviceLabel", quotegroupDeviceLabel); + builder->get_widget("quotegroupFileSystemLabel", quotegroupFileSystemLabel); + builder->get_widget("quotegroupDiskQuotasLabel", quotegroupDiskQuotasLabel); + builder->get_widget("quotegroupGroupQuotasLabel", quotegroupGroupQuotasLabel); + builder->get_widget("quotegroupSizeFrameLabel", quotegroupSizeFrameLabel); + builder->get_widget("quotegroupFilesFrameLabel", quotegroupFilesFrameLabel); + builder->get_widget("quotegroupSizeCurrentlyLabel", quotegroupSizeCurrentlyLabel); + builder->get_widget("quotegroupFilesCurrentlyLabel", quotegroupFilesCurrentlyLabel); + builder->get_widget("quotegroupSizeSoftLimitLabel", quotegroupSizeSoftLimitLabel); + builder->get_widget("quoteSizeHardLimitLabel", quoteSizeHardLimitLabel); + builder->get_widget("quotegroupFilesSoftLimitLabel", quotegroupFilesSoftLimitLabel); + builder->get_widget("quoteFilesHardLimitLabel", quoteFilesHardLimitLabel); + builder->get_widget("quotegroupFilesHarLimitLabel", quotegroupFilesHarLimitLabel); + builder->get_widget("quoteuserDeviceLabel", quoteuserDeviceLabel); + builder->get_widget("quoteuserFileSystemLabel", quoteuserFileSystemLabel); + builder->get_widget("quoteuserDiskQuotasLabel", quoteuserDiskQuotasLabel); + builder->get_widget("quoteuserGroupQuotasLabel", quoteuserGroupQuotasLabel); + builder->get_widget("quoteuserSizeFrameLabel", quoteuserSizeFrameLabel); + builder->get_widget("quoteuserSizeCurrentlyLabel", quoteuserSizeCurrentlyLabel); + builder->get_widget("quoteuserSizeSoftLimitLabel", quoteuserSizeSoftLimitLabel); + builder->get_widget("quoteuserSizeHardLimitLabel1", quoteuserSizeHardLimitLabel1); + builder->get_widget("quoteuserFilesFrameLabel", quoteuserFilesFrameLabel); + builder->get_widget("quoteuserFilesCurrentlyLabel", quoteuserFilesCurrentlyLabel); + builder->get_widget("quoteuserFilesSoftLimitLabel", quoteuserFilesSoftLimitLabel); + builder->get_widget("quoteFilesHardLimitLabel1", quoteFilesHardLimitLabel1); + builder->get_widget("quoteuserFilesHarLimitLabel", quoteuserFilesHarLimitLabel); + builder->get_widget("quoteuserFilesSoftLimitlabel", quoteuserFilesSoftLimitlabel); + builder->get_widget("QuotasEditWindow", QuotasEditWindow); + builder->get_widget("QuotasUserEditWindow", QuotasUserEditWindow); + } void MainWindow::event() { @@ -254,6 +309,8 @@ void MainWindow::groupsFilters_show() { } void MainWindow::view_add_columns(Gtk::TreeView &treeView) { + // TODO: + // Не готово treeView.append_column(gettext("Name"), m_columns.name); treeView.append_column_editable(gettext("Quotas"), m_columns.quotas); treeView.append_column(gettext("Size"), m_columns.size); @@ -275,35 +332,6 @@ void MainWindow::info_status_app(string stule) { boxInfo->add_class(stule); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SettingsPlug::SettingsPlug(::Window p_socketID, Glib::RefPtr builder) :Gtk::Plug{p_socketID} { MainWindow* wnd = nullptr; diff --git a/source/ubl-settings-quotas.h b/source/ubl-settings-quotas.h index 34a9cca..bdafc06 100644 --- a/source/ubl-settings-quotas.h +++ b/source/ubl-settings-quotas.h @@ -132,7 +132,36 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::CheckButton *filtersHardFilesDelayFilterCheckbox; Gtk::CheckButton *filtersHardFilesActivationFilterCheckbox; Gtk::TreeView *groupsQuotasTree; - Gtk::TreeView *usersQuotasTree; + Gtk::TreeView *usersQuotasTree; + Gtk::Label *quotegroupDeviceLabel; + Gtk::Label *quotegroupFileSystemLabel; + Gtk::Label *quotegroupDiskQuotasLabel; + Gtk::Label *quotegroupGroupQuotasLabel; + Gtk::Label *quotegroupSizeFrameLabel; + Gtk::Label *quotegroupSizeCurrentlyLabel; + Gtk::Label *quoteSizeHardLimitLabel; + Gtk::Label *quotegroupFilesFrameLabel; + Gtk::Label *quotegroupFilesCurrentlyLabel; + Gtk::Label *quotegroupFilesSoftLimitLabel; + Gtk::Label *quoteFilesHardLimitLabel; + Gtk::Label *quotegroupFilesHarLimitLabel; + Gtk::Label *quoteuserDeviceLabel; + Gtk::Label *quoteuserDiskQuotasLabel; + Gtk::Label *quoteuserFileSystemLabel; + Gtk::Label *quoteuserGroupQuotasLabel; + Gtk::Label *quoteuserSizeFrameLabel; + Gtk::Label *quoteuserSizeCurrentlyLabel; + Gtk::Label *quoteuserSizeSoftLimitLabel; + Gtk::Label *quoteuserSizeHardLimitLabel1; + Gtk::Label *quoteuserFilesCurrentlyLabel; + Gtk::Label *quoteuserFilesSoftLimitLabel; + Gtk::Label *quoteFilesHardLimitLabel1; + Gtk::Label *quoteuserFilesHarLimitLabel; + Gtk::Label *quoteuserFilesFrameLabel; + Gtk::Label *quotegroupSizeSoftLimitLabel; + Gtk::Label *quoteuserFilesSoftLimitlabel; + Gtk::Window *QuotasUserEditWindow; + Gtk::Window *QuotasEditWindow; public: MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); MainWindow(Glib::RefPtr const& builder); diff --git a/ubl-settings-quotas.glade b/ubl-settings-quotas.glade index 850ab4e..7e731f6 100644 --- a/ubl-settings-quotas.glade +++ b/ubl-settings-quotas.glade @@ -269,266 +269,6 @@ - - False - start - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - vertical - - - Name - True - True - False - start - 6 - True - - - False - True - 0 - - - - - Quotas - True - True - False - start - True - - - False - True - 1 - - - - - Size - True - True - False - start - True - - - False - True - 2 - - - - - Soft limit (size) - True - True - False - start - True - - - False - True - 3 - - - - - Hard limit (size) - True - True - False - start - True - - - False - True - 4 - - - - - Hard limit (size) delay - True - True - False - start - True - - - False - True - 5 - - - - - Hard limit (size) activation time - True - True - False - start - True - - - False - True - 6 - - - - - Files - True - True - False - start - True - - - False - True - 7 - - - - - Soft limit (files) - True - True - False - start - True - - - False - True - 8 - - - - - Hard limit (files) - True - True - False - start - True - - - False - True - 9 - - - - - Hard limit (files) delay - True - True - False - start - True - - - False - True - 10 - - - - - Hard limit (file) activation time - True - True - False - start - True - - - False - True - 11 - - - - - True - False - end - 5 - 5 - True - - - gtk-cancel - True - True - True - center - True - - - False - True - 0 - - - - - gtk-save - True - True - True - center - True - - - False - True - 1 - - - - - False - True - 12 - - - - - - - True - False - UBConfig - Quotas - - - True - False - 32 - com.ublinux.ubl-settings-quotas - 5 - - - - - @@ -2443,7 +2183,7 @@ True False - Device: + Device: False @@ -2468,7 +2208,7 @@ True False start - File system: + File system: 0 @@ -2501,7 +2241,7 @@ True False - Group quotas for this device: + Group quotas for this device: 0 @@ -2741,7 +2481,7 @@ True False - Currently using: + Currently using: False @@ -2916,10 +2656,11 @@ True - Cancel + gtk-cancel True True True + True False @@ -2929,10 +2670,11 @@ - Save + gtk-save True True True + True False @@ -3007,7 +2749,7 @@ True False - Device: + Device: False @@ -3032,7 +2774,7 @@ True False start - File system: + File system: 0 @@ -3114,7 +2856,7 @@ True False - Currently using: + Currently using: False @@ -3480,12 +3222,13 @@ True - Cancel + gtk-cancel True True True 5 5 + True False @@ -3495,12 +3238,13 @@ - Save + gtk-save True True True 5 5 + True False diff --git a/ubl-settings-quotas.pot b/ubl-settings-quotas.pot index 1e0c779..56c39b0 100644 --- a/ubl-settings-quotas.pot +++ b/ubl-settings-quotas.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-04 16:45+0600\n" +"POT-Creation-Date: 2023-04-04 17:17+0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,18 +26,32 @@ msgstr "" msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" +#: source/ubl-settings-quotas.cc:139 source/ubl-settings-quotas.cc:144 +#: source/ubl-settings-quotas.cc:149 +msgid "Currently using:" +msgstr "" + +#: source/ubl-settings-quotas.cc:154 +msgid "Currently using: " +msgstr "" + #: source/ubl-settings-quotas.cc:80 source/ubl-settings-quotas.cc:77 #: source/ubl-settings-quotas.cc:76 msgid "Date and Time" msgstr "" #: source/ubl-settings-quotas.cc:87 source/ubl-settings-quotas.cc:119 -#: source/ubl-settings-quotas.cc:120 source/ubl-settings-quotas.cc:84 +#: source/ubl-settings-quotas.cc:120 source/ubl-settings-quotas.cc:134 +#: source/ubl-settings-quotas.cc:146 source/ubl-settings-quotas.cc:84 #: source/ubl-settings-quotas.cc:116 source/ubl-settings-quotas.cc:117 #: source/ubl-settings-quotas.cc:83 msgid "Device:" msgstr "" +#: source/ubl-settings-quotas.cc:135 source/ubl-settings-quotas.cc:145 +msgid "Disk quotas for this device:" +msgstr "" + #: source/ubl-settings-quotas.cc:90 source/ubl-settings-quotas.cc:91 #: source/ubl-settings-quotas.cc:87 source/ubl-settings-quotas.cc:88 #: source/ubl-settings-quotas.cc:86 @@ -57,14 +71,15 @@ msgid "Excess size delay period" msgstr "" #: source/ubl-settings-quotas.cc:88 source/ubl-settings-quotas.cc:113 -#: source/ubl-settings-quotas.cc:114 source/ubl-settings-quotas.cc:85 -#: source/ubl-settings-quotas.cc:110 source/ubl-settings-quotas.cc:111 -#: source/ubl-settings-quotas.cc:84 +#: source/ubl-settings-quotas.cc:114 source/ubl-settings-quotas.cc:152 +#: source/ubl-settings-quotas.cc:85 source/ubl-settings-quotas.cc:110 +#: source/ubl-settings-quotas.cc:111 source/ubl-settings-quotas.cc:84 msgid "File system:" msgstr "" -#: source/ubl-settings-quotas.cc:129 source/ubl-settings-quotas.cc:264 -#: source/ubl-settings-quotas.cc:126 +#: source/ubl-settings-quotas.cc:129 source/ubl-settings-quotas.cc:138 +#: source/ubl-settings-quotas.cc:153 source/ubl-settings-quotas.cc:317 +#: source/ubl-settings-quotas.cc:264 source/ubl-settings-quotas.cc:126 msgid "Files" msgstr "" @@ -78,44 +93,53 @@ msgstr "" msgid "General settings" msgstr "" +#: source/ubl-settings-quotas.cc:136 +msgid "Group quotas for this device:" +msgstr "" + #: source/ubl-settings-quotas.cc:85 source/ubl-settings-quotas.cc:82 #: source/ubl-settings-quotas.cc:81 msgid "Groups" msgstr "" -#: source/ubl-settings-quotas.cc:263 +#: source/ubl-settings-quotas.cc:141 source/ubl-settings-quotas.cc:142 +#: source/ubl-settings-quotas.cc:151 source/ubl-settings-quotas.cc:156 +msgid "Hard limit" +msgstr "" + +#: source/ubl-settings-quotas.cc:316 source/ubl-settings-quotas.cc:263 msgid "" "Hard limit\n" "(Size) activation\n" "time" msgstr "" -#: source/ubl-settings-quotas.cc:266 +#: source/ubl-settings-quotas.cc:319 source/ubl-settings-quotas.cc:266 msgid "" "Hard limit\n" "(files)" msgstr "" -#: source/ubl-settings-quotas.cc:268 +#: source/ubl-settings-quotas.cc:321 source/ubl-settings-quotas.cc:268 msgid "" "Hard limit\n" "(files) activation\n" "time" msgstr "" -#: source/ubl-settings-quotas.cc:267 +#: source/ubl-settings-quotas.cc:320 source/ubl-settings-quotas.cc:267 msgid "" "Hard limit\n" "(files) delay" msgstr "" -#: source/ubl-settings-quotas.cc:261 +#: source/ubl-settings-quotas.cc:314 source/ubl-settings-quotas.cc:261 msgid "" "Hard limit\n" "(size)" msgstr "" -#: source/ubl-settings-quotas.cc:262 +#: source/ubl-settings-quotas.cc:315 source/ubl-settings-quotas.cc:262 msgid "" "Hard limit\n" "(size) delay" @@ -150,7 +174,8 @@ msgstr "" msgid "Load" msgstr "" -#: source/ubl-settings-quotas.cc:122 source/ubl-settings-quotas.cc:119 +#: source/ubl-settings-quotas.cc:122 source/ubl-settings-quotas.cc:310 +#: source/ubl-settings-quotas.cc:119 msgid "Name" msgstr "" @@ -159,8 +184,8 @@ msgstr "" msgid "Project Home Page" msgstr "" -#: source/ubl-settings-quotas.cc:123 source/ubl-settings-quotas.cc:258 -#: source/ubl-settings-quotas.cc:120 +#: source/ubl-settings-quotas.cc:123 source/ubl-settings-quotas.cc:311 +#: source/ubl-settings-quotas.cc:258 source/ubl-settings-quotas.cc:120 msgid "Quotas" msgstr "" @@ -169,18 +194,24 @@ msgstr "" msgid "Save" msgstr "" -#: source/ubl-settings-quotas.cc:124 source/ubl-settings-quotas.cc:259 -#: source/ubl-settings-quotas.cc:121 +#: source/ubl-settings-quotas.cc:124 source/ubl-settings-quotas.cc:137 +#: source/ubl-settings-quotas.cc:148 source/ubl-settings-quotas.cc:312 +#: source/ubl-settings-quotas.cc:259 source/ubl-settings-quotas.cc:121 msgid "Size" msgstr "" -#: source/ubl-settings-quotas.cc:265 +#: source/ubl-settings-quotas.cc:140 source/ubl-settings-quotas.cc:143 +#: source/ubl-settings-quotas.cc:150 source/ubl-settings-quotas.cc:155 +msgid "Soft limit" +msgstr "" + +#: source/ubl-settings-quotas.cc:318 source/ubl-settings-quotas.cc:265 msgid "" "Soft limit\n" "(files)" msgstr "" -#: source/ubl-settings-quotas.cc:260 +#: source/ubl-settings-quotas.cc:313 source/ubl-settings-quotas.cc:260 msgid "" "Soft limit\n" "(size)" @@ -199,6 +230,10 @@ msgstr "" msgid "The program must be run as root" msgstr "" +#: source/ubl-settings-quotas.cc:147 +msgid "User quotas for this device: " +msgstr "" + #: source/ubl-settings-quotas.cc:86 source/ubl-settings-quotas.cc:83 #: source/ubl-settings-quotas.cc:82 msgid "Users" @@ -211,6 +246,10 @@ msgstr "" msgid "days" msgstr "" +#: source/ubl-settings-quotas.cc:157 source/ubl-settings-quotas.cc:158 +msgid "files" +msgstr "" + #: source/ubl-settings-quotas.cc:105 source/ubl-settings-quotas.cc:106 #: source/ubl-settings-quotas.cc:107 source/ubl-settings-quotas.cc:108 #: source/ubl-settings-quotas.cc:102 source/ubl-settings-quotas.cc:103 @@ -244,8 +283,8 @@ msgstr "" msgid "quotas for users" msgstr "" -#: source/ubl-settings-quotas.cc:318 source/ubl-settings-quotas.cc:267 -#: source/ubl-settings-quotas.cc:213 +#: source/ubl-settings-quotas.cc:371 source/ubl-settings-quotas.cc:318 +#: source/ubl-settings-quotas.cc:267 source/ubl-settings-quotas.cc:213 msgid "ubl-settings-quotas version: " msgstr "" @@ -255,3 +294,11 @@ msgstr "" #: source/ubl-settings-quotas.cc:96 source/ubl-settings-quotas.cc:93 msgid "weeks" msgstr "" + +msgid "" +"GTK settings quotas. for UBLinux\n\n" +"Usage: ubl-settings-quotas [OPTIONS...]\n" +"Options:\n" +" -h, --help Show this help\n" +" -V, --version Show package version\n" +msgstr "" \ No newline at end of file diff --git a/ubl-settings-quotas_ru.po b/ubl-settings-quotas_ru.po index a2449e8..05795b7 100644 --- a/ubl-settings-quotas_ru.po +++ b/ubl-settings-quotas_ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ublexec 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-04 16:45+0600\n" +"POT-Creation-Date: 2023-04-04 17:17+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -26,18 +26,32 @@ msgstr "Настройка параметров дисковых квот для msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" +#: source/ubl-settings-quotas.cc:139 source/ubl-settings-quotas.cc:144 +#: source/ubl-settings-quotas.cc:149 +msgid "Currently using:" +msgstr "В настоящее время используется:" + +#: source/ubl-settings-quotas.cc:154 +msgid "Currently using: " +msgstr "В настоящее время используется: " + #: source/ubl-settings-quotas.cc:80 source/ubl-settings-quotas.cc:77 #: source/ubl-settings-quotas.cc:76 msgid "Date and Time" msgstr "Дата и время" #: source/ubl-settings-quotas.cc:87 source/ubl-settings-quotas.cc:119 -#: source/ubl-settings-quotas.cc:120 source/ubl-settings-quotas.cc:84 +#: source/ubl-settings-quotas.cc:120 source/ubl-settings-quotas.cc:134 +#: source/ubl-settings-quotas.cc:146 source/ubl-settings-quotas.cc:84 #: source/ubl-settings-quotas.cc:116 source/ubl-settings-quotas.cc:117 #: source/ubl-settings-quotas.cc:83 msgid "Device:" msgstr "Устройство:" +#: source/ubl-settings-quotas.cc:135 source/ubl-settings-quotas.cc:145 +msgid "Disk quotas for this device:" +msgstr "Дисковые квоты для этого устройства:" + #: source/ubl-settings-quotas.cc:90 source/ubl-settings-quotas.cc:91 #: source/ubl-settings-quotas.cc:87 source/ubl-settings-quotas.cc:88 #: source/ubl-settings-quotas.cc:86 @@ -57,14 +71,15 @@ msgid "Excess size delay period" msgstr "Период задержки превышения размера" #: source/ubl-settings-quotas.cc:88 source/ubl-settings-quotas.cc:113 -#: source/ubl-settings-quotas.cc:114 source/ubl-settings-quotas.cc:85 -#: source/ubl-settings-quotas.cc:110 source/ubl-settings-quotas.cc:111 -#: source/ubl-settings-quotas.cc:84 +#: source/ubl-settings-quotas.cc:114 source/ubl-settings-quotas.cc:152 +#: source/ubl-settings-quotas.cc:85 source/ubl-settings-quotas.cc:110 +#: source/ubl-settings-quotas.cc:111 source/ubl-settings-quotas.cc:84 msgid "File system:" msgstr "Файловая система:" -#: source/ubl-settings-quotas.cc:129 source/ubl-settings-quotas.cc:264 -#: source/ubl-settings-quotas.cc:126 +#: source/ubl-settings-quotas.cc:129 source/ubl-settings-quotas.cc:138 +#: source/ubl-settings-quotas.cc:153 source/ubl-settings-quotas.cc:317 +#: source/ubl-settings-quotas.cc:264 source/ubl-settings-quotas.cc:126 msgid "Files" msgstr "Файлы" @@ -78,54 +93,76 @@ msgstr "Фильтры" msgid "General settings" msgstr "Общие настройки" +#: source/ubl-settings-quotas.cc:136 +msgid "Group quotas for this device:" +msgstr "Групповые квоты для этого устройства:" + #: source/ubl-settings-quotas.cc:85 source/ubl-settings-quotas.cc:82 #: source/ubl-settings-quotas.cc:81 msgid "Groups" msgstr "Группы" -#: source/ubl-settings-quotas.cc:263 +#: source/ubl-settings-quotas.cc:141 source/ubl-settings-quotas.cc:142 +#: source/ubl-settings-quotas.cc:151 source/ubl-settings-quotas.cc:156 +#, fuzzy +msgid "Hard limit" +msgstr "Жесткий предел" + +#: source/ubl-settings-quotas.cc:316 source/ubl-settings-quotas.cc:263 #, fuzzy msgid "" "Hard limit\n" "(Size) activation\n" "time" -msgstr "Жесткий предел\n(размер)" +msgstr "" +"Жесткий предел\n" +"(размер)" -#: source/ubl-settings-quotas.cc:266 +#: source/ubl-settings-quotas.cc:319 source/ubl-settings-quotas.cc:266 #, fuzzy msgid "" "Hard limit\n" "(files)" -msgstr "Жесткий лимит\n(файлы)" +msgstr "" +"Жесткий лимит\n" +"(файлы)" -#: source/ubl-settings-quotas.cc:268 +#: source/ubl-settings-quotas.cc:321 source/ubl-settings-quotas.cc:268 #, fuzzy msgid "" "Hard limit\n" "(files) activation\n" "time" -msgstr "Время активации\nжесткого лимита (файла)" +msgstr "" +"Время активации\n" +"жесткого лимита (файла)" -#: source/ubl-settings-quotas.cc:267 +#: source/ubl-settings-quotas.cc:320 source/ubl-settings-quotas.cc:267 #, fuzzy msgid "" "Hard limit\n" "(files) delay" -msgstr "Жесткий лимит\n(файлы)" +msgstr "" +"Жесткий лимит\n" +"(файлы)" -#: source/ubl-settings-quotas.cc:261 +#: source/ubl-settings-quotas.cc:314 source/ubl-settings-quotas.cc:261 #, fuzzy msgid "" "Hard limit\n" "(size)" -msgstr "Жесткий предел\n(размер) задержки" +msgstr "" +"Жесткий предел\n" +"(размер) задержки" -#: source/ubl-settings-quotas.cc:262 +#: source/ubl-settings-quotas.cc:315 source/ubl-settings-quotas.cc:262 #, fuzzy msgid "" "Hard limit\n" "(size) delay" -msgstr "Жесткий предел\n(размер) задержки" +msgstr "" +"Жесткий предел\n" +"(размер) задержки" #: source/ubl-settings-quotas.cc:133 source/ubl-settings-quotas.cc:130 msgid "Hard limit (file) activation time" @@ -156,7 +193,8 @@ msgstr "Жесткий предел (размер) задержки" msgid "Load" msgstr "Загрузить" -#: source/ubl-settings-quotas.cc:122 source/ubl-settings-quotas.cc:119 +#: source/ubl-settings-quotas.cc:122 source/ubl-settings-quotas.cc:310 +#: source/ubl-settings-quotas.cc:119 msgid "Name" msgstr "Имя" @@ -165,8 +203,8 @@ msgstr "Имя" msgid "Project Home Page" msgstr "Главная страница проекта" -#: source/ubl-settings-quotas.cc:123 source/ubl-settings-quotas.cc:258 -#: source/ubl-settings-quotas.cc:120 +#: source/ubl-settings-quotas.cc:123 source/ubl-settings-quotas.cc:311 +#: source/ubl-settings-quotas.cc:258 source/ubl-settings-quotas.cc:120 msgid "Quotas" msgstr "Квоты" @@ -175,38 +213,59 @@ msgstr "Квоты" msgid "Save" msgstr "Сохранить" -#: source/ubl-settings-quotas.cc:124 source/ubl-settings-quotas.cc:259 -#: source/ubl-settings-quotas.cc:121 +#: source/ubl-settings-quotas.cc:124 source/ubl-settings-quotas.cc:137 +#: source/ubl-settings-quotas.cc:148 source/ubl-settings-quotas.cc:312 +#: source/ubl-settings-quotas.cc:259 source/ubl-settings-quotas.cc:121 msgid "Size" -msgstr "Размер" +msgstr "Объём" -#: source/ubl-settings-quotas.cc:265 +#: source/ubl-settings-quotas.cc:140 source/ubl-settings-quotas.cc:143 +#: source/ubl-settings-quotas.cc:150 source/ubl-settings-quotas.cc:155 +#, fuzzy +msgid "Soft limit" +msgstr "" +"Мягкий предел\n" +"(размер)" + +#: source/ubl-settings-quotas.cc:318 source/ubl-settings-quotas.cc:265 #, fuzzy msgid "" "Soft limit\n" "(files)" -msgstr "Мягкий лимит\n(файлы)" +msgstr "" +"Мягкий лимит\n" +"(файлы)" -#: source/ubl-settings-quotas.cc:260 +#: source/ubl-settings-quotas.cc:313 source/ubl-settings-quotas.cc:260 #, fuzzy msgid "" "Soft limit\n" "(size)" -msgstr "Мягкий предел\n(размер)" +msgstr "" +"Мягкий предел\n" +"(размер)" #: source/ubl-settings-quotas.cc:130 source/ubl-settings-quotas.cc:127 msgid "Soft limit (files)" -msgstr "Мягкий лимит\n(файлы)" +msgstr "" +"Мягкий лимит\n" +"(файлы)" #: source/ubl-settings-quotas.cc:125 source/ubl-settings-quotas.cc:122 msgid "Soft limit (size)" -msgstr "Мягкий предел\n(размер)" +msgstr "" +"Мягкий предел\n" +"(размер)" #: source/ubl-settings-quotas.cc:70 source/ubl-settings-quotas.cc:67 #: source/ubl-settings-quotas.cc:66 msgid "The program must be run as root" msgstr "Программа должна быть запущена от имени root" +#: source/ubl-settings-quotas.cc:147 +msgid "User quotas for this device: " +msgstr "Квоты пользователей для этого устройства: " + #: source/ubl-settings-quotas.cc:86 source/ubl-settings-quotas.cc:83 #: source/ubl-settings-quotas.cc:82 msgid "Users" @@ -219,6 +278,11 @@ msgstr "Пользователи" msgid "days" msgstr "дни" +#: source/ubl-settings-quotas.cc:157 source/ubl-settings-quotas.cc:158 +#, fuzzy +msgid "files" +msgstr "Файлы" + #: source/ubl-settings-quotas.cc:105 source/ubl-settings-quotas.cc:106 #: source/ubl-settings-quotas.cc:107 source/ubl-settings-quotas.cc:108 #: source/ubl-settings-quotas.cc:102 source/ubl-settings-quotas.cc:103 @@ -240,7 +304,7 @@ msgstr "минуты" #: source/ubl-settings-quotas.cc:257 msgid "name" -msgstr "" +msgstr "имя" #: source/ubl-settings-quotas.cc:89 source/ubl-settings-quotas.cc:86 #: source/ubl-settings-quotas.cc:85 @@ -252,10 +316,10 @@ msgstr "квоты для групп" msgid "quotas for users" msgstr "квоты для пользователей" -#: source/ubl-settings-quotas.cc:318 source/ubl-settings-quotas.cc:267 -#: source/ubl-settings-quotas.cc:213 +#: source/ubl-settings-quotas.cc:371 source/ubl-settings-quotas.cc:318 +#: source/ubl-settings-quotas.cc:267 source/ubl-settings-quotas.cc:213 msgid "ubl-settings-quotas version: " -msgstr "ubl-settings-quotas версия:" +msgstr "ubl-settings-quotas версия: " #: source/ubl-settings-quotas.cc:97 source/ubl-settings-quotas.cc:98 #: source/ubl-settings-quotas.cc:99 source/ubl-settings-quotas.cc:100 @@ -287,3 +351,17 @@ msgstr "недели" #~ msgid "Load from local configuration" #~ msgstr "Загрузить локальную конфигурацию" + +msgid "" +"GTK settings quotas. for UBLinux\n\n" +"Usage: ubl-settings-quotas [OPTIONS...]\n" +"Options:\n" +" -h, --help Show this help\n" +" -V, --version Show package version\n" +msgstr "" +"GTK-утилита настройки квот для UBLinux\n" +"\n" +"Использование: ubl-settings-quotas [Параметры приложения...]\n" +"Параметры приложения:\n" +" -h, --help\t Показать параметры справки\n" +" -V, --version\t Показать версию пакета\n" \ No newline at end of file