Merge pull request 'master' (#84) from YanTheKaller/libublsettingsui-gtk3:master into master

Reviewed-on: #84

libublsettingsui-gtk3.pot

@@ -107,6 +107,26 @@ msgstr ""
 msgid "Save to global configuration"
 msgstr ""
 
+#: source/ubl-strings.h:11
+msgid "Set ini file for configuration mode"
+msgstr ""
+
+#: source/ubl-strings.h:11
+msgid "The socket identifier of the application to open through the socket"
+msgstr ""
+
+#: source/ubl-strings.h:11
+msgid "Load button socket id for ubl-settings-manager"
+msgstr ""
+
+#: source/ubl-strings.h:11
+msgid "Save button socket id for ubl-settings-manager"
+msgstr ""
+
+#: source/ubl-strings.h:11
+msgid "Enable debug mode"
+msgstr ""
+
 #: source/libublsettingsui-gtk3.h:620
 msgid "Save configuration"
 msgstr ""

libublsettingsui-gtk3_ru.po

@@ -65,6 +65,26 @@ msgstr "Заблокировать сохранение глобальной к
 msgid "Lock global configration loading"
 msgstr "Заблокировать загрузку глобальную конфигурацию"
 
+#: source/ubl-strings.h:11
+msgid "Set ini file for configuration mode"
+msgstr "Установить путь до файла конфигурации"
+
+#: source/ubl-strings.h:11
+msgid "The socket identifier of the application to open through the socket"
+msgstr "Идентификатор сокета приложения для открытия через сокет"
+
+#: source/ubl-strings.h:11
+msgid "Load button socket id for ubl-settings-manager"
+msgstr "Идентификатор сокета кнопки загрузки для ubl-settings-manager"
+
+#: source/ubl-strings.h:11
+msgid "Save button socket id for ubl-settings-manager"
+msgstr "Идентификатор сокета кнопки сохранения для ubl-settings-manager"
+
+#: source/ubl-strings.h:11
+msgid "Enable debug mode"
+msgstr "Включить режим отладки"
+
 #: source/libublsettingsui-gtk3.h:600
 msgid "Reset application settings"
 msgstr "Сбросить настройки программы"

source/libublsettingsui-gtk3.c

@@ -432,7 +432,7 @@ int yon_ubl_setup_arguments(int argc, char *argv[],config_str *unfound_arguments
             {"socket-trd-id", 1,0, 't'},
             {"clear-config", 0,0, 'c'}, 
             {"debug", 0,0, 'd'},
-            {"file", 1, 0, 'f'},
+            {"config", 1, 0, 'f'},
             { NULL, 0, NULL, 0 } 
         };
         config_str unregistered_arguments=NULL;

source/libublsettingsui-gtk3.h

@@ -601,14 +601,19 @@ yon_window *yon_window_new();
     #define HELP_LABEL(rest) yon_char_unite(template_app_information.app_tech_name,yon_char_get_localised_from_lib(" version:")," ", !yon_char_is_empty(template_app_information.app_version)?template_app_information.app_version:"","\n",\
     template_app_information.app_title,"\n",yon_char_get_localised_from_lib("Usage:"), " ",template_app_information.app_tech_name," ",yon_char_get_localised_from_lib("[OPTIONS]"),"\n",\
     yon_char_get_localised_from_lib("Options:"),"\n",\
-    "   --help, -h              ",yon_char_get_localised_from_lib("Show this help"),"\n",\
-    "   --version, -V           ",yon_char_get_localised_from_lib("Show package version"),"\n",\
-    "   --lock-help             ",yon_char_get_localised_from_lib("Lock this help menu"),"\n",\
-    "   --lock-save             ",yon_char_get_localised_from_lib("Lock configuration saving"),"\n",\
-    "   --lock-save-local       ",yon_char_get_localised_from_lib("Lock local configration saving"),"\n",\
-    "   --lock-save-global      ",yon_char_get_localised_from_lib("Lock global configration saving"),"\n",\
-    "   --lock-load-global      ",yon_char_get_localised_from_lib("Lock global configration loading"),"\n",\
-    "   --clear-config, -c      ",yon_char_get_localised_from_lib("Reset application settings"),"\n",\
+    "   --help, -h                  ",yon_char_get_localised_from_lib("Show this help"),"\n",\
+    "   --version, -V               ",yon_char_get_localised_from_lib("Show package version"),"\n",\
+    "   --lock-help                 ",yon_char_get_localised_from_lib("Lock this help menu"),"\n",\
+    "   --lock-save                 ",yon_char_get_localised_from_lib("Lock configuration saving"),"\n",\
+    "   --lock-save-local           ",yon_char_get_localised_from_lib("Lock local configration saving"),"\n",\
+    "   --lock-save-global          ",yon_char_get_localised_from_lib("Lock global configration saving"),"\n",\
+    "   --lock-load-global          ",yon_char_get_localised_from_lib("Lock global configration loading"),"\n",\
+    "   --clear-config, -c          ",yon_char_get_localised_from_lib("Reset application settings"),"\n",\
+    "   --config <PATH>, -f <PATH>  ",yon_char_get_localised_from_lib("Set ini file for configuration mode"),"\n",\
+    "   --socket-id                 ",yon_char_get_localised_from_lib("Application socket id for ubl-settings-manager"),"\n",\
+    "   --socket-ext-id             ",yon_char_get_localised_from_lib("Load button socket id for ubl-settings-manager"),"\n",\
+    "   --socket-trd-id             ",yon_char_get_localised_from_lib("Save button socket id for ubl-settings-manager"),"\n",\
+    "   --debug                     ",yon_char_get_localised_from_lib("Enable debug mode"),"\n",\
     !yon_char_is_empty(rest)?rest:NULL,NULL)
 
     #define template_ui_LocalePath "/usr/share/locale"