NTPSERVERS paramater saving changed

source/ubl-settings-datetime.c

@@ -47,7 +47,9 @@ void yon_save_parameters(GtkWidget *self, main_window *widgets){
                 break;
             case 3:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"ntp-ru");
                 break;
-            case 5:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"stop");
+            case 5:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"disable");
+                break;
+            case 6:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"stop");
                 break;
             case 4:
                 char *value = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NTPEntry));
@@ -222,8 +224,10 @@ void yon_interface_update(main_window *widgets){
             gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),2);
         } else if (!strcmp(ntp,"ntp-ru")){
             gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),3);
-        } else if (!strcmp(ntp,"stop")||!strcmp(ntp,"no")||!strcmp(ntp,"disable")){
+        } else if (!strcmp(ntp,"no")||!strcmp(ntp,"disable")){
             gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),5);
+        } else if (!strcmp(ntp,"stop")){
+            gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),6);
         } else {
             gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),4);
             gtk_widget_set_sensitive(widgets->NTPEntry,1);
@@ -561,9 +565,10 @@ void yon_main_window_complete(main_window **window){
                 } else if (!strcmp(parsed[0],"ntp-ru")){
                     ntp_default = NTp_RU_LABEL;
 
-                } else if (!strcmp(parsed[0],"disable")||!strcmp(parsed[0],"stop")){
+                } else if (!strcmp(parsed[0],"disable")){
                     ntp_default = STOPPED_LABEL;
-
+                } else if(!strcmp(parsed[0],"stop")) {
+                    ntp_default = DISABLED_LABEL;
                 } else {
                     ntp_default = yon_char_new(parsed[0]);
                 }

source/ubl-strings.h

@@ -15,7 +15,8 @@
 #define SYNC_HARDWARE_LABEL _("Synchronize hardware time:")
 #define SYNC_NTP_LABEL _("Synchronize via NTP")
 #define DEFAULT_LABEL _("Default")
-#define STOPPED_LABEL _("Stopped")
+#define STOPPED_LABEL _("Do not configure")
+#define DISABLED_LABEL _("Stop")
 #define DHCP_LABEL "DHCP"
 #define UTC_LABEL "UTC"
 #define NTP_LABEL _("NTP-servers")

ubl-settings-datetime.glade

@@ -276,7 +276,8 @@ format</property>
                               <item translatable="yes">NTP-servers</item>
                               <item translatable="yes">NTP-servers (RU)</item>
                               <item translatable="yes">Manual</item>
-                              <item translatable="yes">Stopped</item>
+                              <item translatable="yes">Do not configure</item>
+                              <item translatable="yes">Disable</item>
                             </items>
                           </object>
                           <packing>

ubl-settings-datetime.pot

@@ -29,6 +29,14 @@ msgstr ""
 msgid "Syncronisation error"
 msgstr ""
 
+#: source/ubl-strings.h:5
+msgid "Do not configure"
+msgstr ""
+
+#: source/ubl-strings.h:5
+msgid "Stop"
+msgstr ""
+
 #: source/ubl-strings.h:6
 msgid "Important field is empty"
 msgstr ""

ubl-settings-datetime_ru.po

@@ -22,13 +22,22 @@ msgid "Date and time"
 msgstr "Дата и Время"
 
 #: source/ubl-strings.h:3
-msgid "Date and time configuration"
+#, fuzzy
+msgid "Datetime configuration"
 msgstr "Настройка даты и времени системы"
 
 #: source/ubl-strings.h:5
 msgid "Syncronisation error"
 msgstr "Ошибка синхронизации аппаратных часов"
 
+#: source/ubl-strings.h:5
+msgid "Do not configure"
+msgstr "Настройка даты и времени системы"
+
+#: source/ubl-strings.h:5
+msgid "Stop"
+msgstr "Остановлен"
+
 #: source/ubl-strings.h:6
 msgid "Important field is empty"
 msgstr "Пустое важное поле"
@@ -38,8 +47,12 @@ msgid "Date format:"
 msgstr "Формат даты:"
 
 #: source/ubl-strings.h:6
-msgid "Date\nformat"
+msgid ""
-msgstr "Дата\nформат"
+"Date\n"
+"format"
+msgstr ""
+"Дата\n"
+"формат"
 
 #: source/ubl-strings.h:29
 msgid "YYYY"
@@ -53,19 +66,19 @@ msgstr "ММ"
 msgid "DD"
 msgstr "ДД"
 
-#: source/ubl-strings.h:32
+#: source/ubl-strings.h:31
 msgid "DD.MM.YYYY"
 msgstr "ДД.ММ.ГГГГ"
 
-#: source/ubl-strings.h:33
+#: source/ubl-strings.h:31
 msgid "DD-MM-YYYY"
 msgstr "ДД-ММ-ГГГГ"
 
-#: source/ubl-strings.h:34
+#: source/ubl-strings.h:31
 msgid "DD/MM/YYYY"
 msgstr "ДД/ММ/ГГГГ"
 
-#: source/ubl-strings.h:35
+#: source/ubl-strings.h:31
 msgid "MM-DD-YYYY"
 msgstr "ММ-ДД-ГГГГ"
 
@@ -97,10 +110,6 @@ msgstr "Синхронизировать"
 msgid "Synchronize hardware time"
 msgstr "Синхронизировать аппаратное время"
 
-#: source/ubl-strings.h:13
-msgid "Synchronize hardware time:"
-msgstr "Синхронизировать аппаратное время:"
-
 #: source/ubl-strings.h:14
 msgid "Synchronize via NTP"
 msgstr "Синхронизировать через NTP"
@@ -1720,3 +1729,6 @@ msgstr "Зулу"
 
 msgid "Zurich"
 msgstr "Цюрих"
+
+msgid "Synchronize hardware time:"
+msgstr "Синхронизировать аппаратное время:"