diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index 4698fc8..3648b31 100644 --- a/source/ubl-settings-datetime.c +++ b/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)); @@ -81,22 +83,39 @@ void yon_save_parameters(GtkWidget *self, main_window *widgets){ } -void on_config_save(GtkWidget *){ +int check_input(main_window *widgets){ + int ntp_active = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->DHCPCombo)); + if (ntp_active == 4){ + const char *ntp = gtk_entry_get_text(GTK_ENTRY(widgets->NTPEntry)); + if (yon_char_is_empty(ntp)){ + yon_ubl_status_box_render(EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_highlight_incorrect(widgets->NTPEntry); + return 0; + } + } + return 1; +} + +void on_config_save(GtkWidget *,main_window *widgets){ + if (!check_input(widgets)) return; main_config.save_config=2; yon_save_proceed(NULL,YON_CONFIG_BOTH,config_get_global_command,NULL); } -void on_config_save_global(GtkWidget *){ +void on_config_save_global(GtkWidget *,main_window *widgets){ + if (!check_input(widgets)) return; main_config.save_config=0; yon_save_proceed(NULL,YON_CONFIG_GLOBAL,config_get_global_command,NULL); } -void on_config_save_local(GtkWidget *){ +void on_config_save_local(GtkWidget *,main_window *widgets){ + if (!check_input(widgets)) return; main_config.save_config=1; yon_save_proceed(NULL,YON_CONFIG_LOCAL,config_get_local_command,NULL); } -void on_config_save_custom(GtkWidget *){ +void on_config_save_custom(GtkWidget *,main_window *widgets){ + if (!check_input(widgets)) return; main_config.save_config=3; yon_save_proceed(NULL,YON_CONFIG_CUSTOM,config_get_global_command,NULL); } @@ -222,8 +241,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); @@ -409,17 +430,44 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){ switch(mode){ case 0: if (main_config.ntp_default){ - gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),main_config.ntp_default); + gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),main_config.ntp_default); + } + break; + case 2:{ + int size; + config_str parsed = yon_config_load(get_ntp_default_command,&size); + if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){ + free(yon_char_divide_search(parsed[0],"=",-1)); + yon_char_remove_last_symbol(parsed[0],'\n'); + yon_char_remove_brackets(parsed[0]); + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),parsed[0]); + yon_char_parsed_free(parsed,size); + gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); + } + } + break; + case 3:{ + int size; + config_str parsed = yon_config_load(get_ntp_ru_command,&size); + if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){ + free(yon_char_divide_search(parsed[0],"=",-1)); + yon_char_remove_last_symbol(parsed[0],'\n'); + yon_char_remove_brackets(parsed[0]); + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),parsed[0]); + yon_char_parsed_free(parsed,size); + gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); + } } break; case 1: - case 2: - case 3: case 5: + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); break; case 4: gtk_widget_set_sensitive(widgets->NTPEntry,1); + gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),""); break; } @@ -544,37 +592,34 @@ void yon_main_window_complete(main_window **window){ g_signal_connect(G_OBJECT(widgets->ZoneCombo),"changed",G_CALLBACK(yon_save_parameters),widgets); } // Initial data loading - char *ntp_default = NULL; - char *time_sync_default = NULL; + char *ntp_default = NULL; + char *time_sync_default = NULL; { { - int size; - config_str parsed = yon_config_load(NTPSERVERS_parameter_command,&size); - if (size&&!yon_char_is_empty(parsed[0])){ - yon_char_remove_last_symbol(parsed[0],'\n'); - free(yon_char_divide_search(parsed[0],"=",-1)); - if (!strcmp(parsed[0],"dhcp")){ + + if (!yon_char_is_empty(main_config.ntp_default)){ + if (!strcmp(main_config.ntp_default,"dhcp")){ ntp_default = DHCP_LABEL; - } else if (!strcmp(parsed[0],"default")){ + } else if (!strcmp(main_config.ntp_default,"default")){ ntp_default = NTP_LABEL; - } else if (!strcmp(parsed[0],"ntp-ru")){ + } else if (!strcmp(main_config.ntp_default,"ntp-ru")){ ntp_default = NTp_RU_LABEL; - } else if (!strcmp(parsed[0],"disable")||!strcmp(parsed[0],"stop")){ + } else if (!strcmp(main_config.ntp_default,"disable")){ ntp_default = STOPPED_LABEL; - + } else if(!strcmp(main_config.ntp_default,"stop")) { + ntp_default = DISABLED_LABEL; } else { - ntp_default = yon_char_new(parsed[0]); + ntp_default = yon_char_new(main_config.ntp_default); } - yon_char_parsed_free(parsed,size); } } { int size; config_str parsed = yon_config_load(HWCLOCK_SYNC_parameter_command,&size); + if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){ yon_char_remove_last_symbol(parsed[0],'\n'); - if (size&&!yon_char_is_empty(parsed[0])){ free(yon_char_divide_search(parsed[0],"=",-1)); if (!strcmp(parsed[0],"utc")){ time_sync_default = UTC_LABEL; @@ -605,8 +650,6 @@ void yon_main_window_complete(main_window **window){ if (size) yon_char_parsed_free(parsed,size); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0); } - - gtk_window_resize(GTK_WINDOW(widgets->Window),100,150); while(gtk_events_pending()) gtk_main_iteration(); diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 75ce3e2..527c5c9 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -37,6 +37,9 @@ #define config_get_global_only_parameters "" #define config_get_local_only_parameters "" +#define get_ntp_default_command "ubconfig --default get [network] NTPSERVERS_DEFAULT" +#define get_ntp_ru_command "ubconfig --default get [network] NTPSERVERS_RU" + #define NTPSERVERS_parameter "NTPSERVERS" #define NTPSERVERS_parameter_command "ubconfig --source global get network NTPSERVERS" #define NTPSERVERS_parameter_raw_command "ubconfig --source global --raw get network NTPSERVERS" @@ -121,13 +124,15 @@ void on_ntp_sync(GtkWidget *, main_window *widgets); void yon_save_parameters(GtkWidget *self,main_window *widgets); -void on_config_save(GtkWidget *); +int check_input(main_window *widgets); + +void on_config_save(GtkWidget *,main_window *widgets); -void on_config_save_global(GtkWidget *); +void on_config_save_global(GtkWidget *,main_window *widgets); -void on_config_save_local(GtkWidget *); +void on_config_save_local(GtkWidget *,main_window *widgets); -void on_config_save_custom(GtkWidget *); +void on_config_save_custom(GtkWidget *,main_window *widgets); void on_config_load_global(); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index cd7b42f..82439d4 100644 --- a/source/ubl-strings.h +++ b/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") diff --git a/ubl-settings-datetime.css b/ubl-settings-datetime.css index f60dc43..c148da2 100644 --- a/ubl-settings-datetime.css +++ b/ubl-settings-datetime.css @@ -5,6 +5,18 @@ .boxInfoMessOK{ background-color: #f3f0ac; } +.errorBox { + border-width: 2px; + border-color: #ea9999; + border-style:solid; +} + +.chosenOutline{ + transition: 0ms; + border-width: 1px; + border-color: #f3f0ac; + border-style:solid; +} .textHead{ text-shadow: 2px 2px @theme_bg_color; color: @theme_text_color; diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 3e6b1c4..949b7d7 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -273,10 +273,11 @@ format 0 DHCP - NTP-servers - NTP-servers (RU) + NTP (ntp.org) + NTP (vniiftri.ru) Manual - Stopped + Do not configure + Stop diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 1c15437..b52f340 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -22,7 +22,7 @@ msgid "Date and time" msgstr "" #: source/ubl-strings.h:3 -msgid "Datetime configuration" +msgid "Date and time configuration" msgstr "" #: source/ubl-strings.h:5 @@ -33,1685 +33,122 @@ msgstr "" msgid "Important field is empty" msgstr "" -#: source/ubl-strings.h:6 -msgid "Date format:" -msgstr "" - -#: source/ubl-strings.h:6 -msgid "Date\nformat" -msgstr "" - -#: source/ubl-strings.h:29 -msgid "YYYY" -msgstr "" - -#: source/ubl-strings.h:30 -msgid "MM" -msgstr "" - -#: source/ubl-strings.h:31 -msgid "DD" -msgstr "" - -#: source/ubl-strings.h:31 -msgid "DD.MM.YYYY" -msgstr "" - -#: source/ubl-strings.h:31 -msgid "DD-MM-YYYY" -msgstr "" - -#: source/ubl-strings.h:31 -msgid "DD/MM/YYYY" -msgstr "" - -#: source/ubl-strings.h:31 -msgid "MM-DD-YYYY" -msgstr "" - -#: source/ubl-strings.h:7 +#: source/ubl-strings.h:8 msgid "Accept" msgstr "" -#: source/ubl-strings.h:8 +#: source/ubl-strings.h:9 msgid "Cancel" msgstr "" -#: source/ubl-strings.h:9 +#: source/ubl-strings.h:10 msgid "Current date and time" msgstr "" -#: source/ubl-strings.h:10 +#: source/ubl-strings.h:11 msgid "Time:" msgstr "" -#: source/ubl-strings.h:11 +#: source/ubl-strings.h:12 msgid "Date:" msgstr "" -#: source/ubl-strings.h:12 +#: source/ubl-strings.h:13 msgid "Synchronize" msgstr "" -#: source/ubl-strings.h:13 +#: source/ubl-strings.h:14 msgid "Synchronize hardware time" msgstr "" -#: source/ubl-strings.h:14 +#: source/ubl-strings.h:15 +msgid "Synchronize hardware time:" +msgstr "" + +#: source/ubl-strings.h:16 msgid "Synchronize via NTP" msgstr "" -#: source/ubl-strings.h:15 +#: source/ubl-strings.h:17 msgid "Default" msgstr "" -#: source/ubl-strings.h:16 -msgid "Stopped" +#: source/ubl-strings.h:18 +msgid "Do not configure" msgstr "" -#: source/ubl-strings.h:17 -msgid "Manual" +#: source/ubl-strings.h:19 +msgid "Stop" msgstr "" -#: source/ubl-strings.h:17 +#: source/ubl-strings.h:22 msgid "NTP-servers" msgstr "" -#: source/ubl-strings.h:17 +#: source/ubl-strings.h:23 msgid "NTP-servers (RU)" msgstr "" -#: source/ubl-strings.h:18 +#: source/ubl-strings.h:24 +msgid "Manual" +msgstr "" + +#: source/ubl-strings.h:25 msgid "" "Enter the name of the ntp server or its ip address. When entering multiple " "addresses, separate them with spaces." msgstr "" -#: source/ubl-strings.h:19 +#: source/ubl-strings.h:26 msgid "Time Zone" msgstr "" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:27 msgid "Region:" msgstr "" -#: source/ubl-strings.h:21 +#: source/ubl-strings.h:28 msgid "Zone:" msgstr "" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:29 msgid "Local time" msgstr "" - -msgid "Abidjan" -msgstr "" - -msgid "Accra" -msgstr "" - -msgid "Acre" -msgstr "" - -msgid "Adak" -msgstr "" - -msgid "Addis_Ababa" -msgstr "" - -msgid "Adelaide" -msgstr "" - -msgid "Aden" -msgstr "" - -msgid "Africa" -msgstr "" - -msgid "Alaska" -msgstr "" - -msgid "Aleutian" -msgstr "" - -msgid "Algiers" -msgstr "" - -msgid "Almaty" -msgstr "" - -msgid "America" -msgstr "" - -msgid "Amman" -msgstr "" - -msgid "Amsterdam" -msgstr "" - -msgid "Anadyr" -msgstr "" - -msgid "Anchorage" -msgstr "" - -msgid "Andorra" -msgstr "" - -msgid "Anguilla" -msgstr "" - -msgid "Antananarivo" -msgstr "" - -msgid "Antarctica" -msgstr "" - -msgid "Antigua" -msgstr "" - -msgid "Apia" -msgstr "" - -msgid "Aqtau" -msgstr "" - -msgid "Aqtobe" -msgstr "" - -msgid "Araguaina" -msgstr "" - -msgid "Arctic" -msgstr "" - -msgid "Arizona" -msgstr "" - -msgid "Aruba" -msgstr "" - -msgid "Ashgabat" -msgstr "" - -msgid "Ashkhabad" -msgstr "" - -msgid "Asia" -msgstr "" - -msgid "Asmara" -msgstr "" - -msgid "Asmera" -msgstr "" - -msgid "Astrakhan" -msgstr "" - -msgid "Asuncion" -msgstr "" - -msgid "Athens" -msgstr "" - -msgid "Atikokan" -msgstr "" - -msgid "Atka" -msgstr "" - -msgid "Atlantic" -msgstr "" - -msgid "Atyrau" -msgstr "" - -msgid "Auckland" -msgstr "" - -msgid "Australia" -msgstr "" - -msgid "Azores" -msgstr "" - -msgid "Baghdad" -msgstr "" - -msgid "Bahia" -msgstr "" - -msgid "Bahia_Banderas" -msgstr "" - -msgid "Bahrain" -msgstr "" - -msgid "BajaNorte" -msgstr "" - -msgid "BajaSur" -msgstr "" - -msgid "Baku" -msgstr "" - -msgid "Bamako" -msgstr "" - -msgid "Bangkok" -msgstr "" - -msgid "Bangui" -msgstr "" - -msgid "Banjul" -msgstr "" - -msgid "Barbados" -msgstr "" - -msgid "Barnaul" -msgstr "" - -msgid "Beirut" -msgstr "" - -msgid "Belem" -msgstr "" - -msgid "Belfast" -msgstr "" - -msgid "Belgrade" -msgstr "" - -msgid "Belize" -msgstr "" - -msgid "Berlin" -msgstr "" - -msgid "Bermuda" -msgstr "" - -msgid "Beulah" -msgstr "" - -msgid "Bishkek" -msgstr "" - -msgid "Bissau" -msgstr "" - -msgid "Blanc-Sablon" -msgstr "" - -msgid "Blantyre" -msgstr "" - -msgid "Boa_Vista" -msgstr "" - -msgid "Bogota" -msgstr "" - -msgid "Boise" -msgstr "" - -msgid "Bougainville" -msgstr "" - -msgid "Bratislava" -msgstr "" - -msgid "Brazil" -msgstr "" - -msgid "Brazzaville" -msgstr "" - -msgid "Brisbane" -msgstr "" - -msgid "Broken_Hill" -msgstr "" - -msgid "Brunei" -msgstr "" - -msgid "Brussels" -msgstr "" - -msgid "Bucharest" -msgstr "" - -msgid "Budapest" -msgstr "" - -msgid "Buenos_Aires" -msgstr "" - -msgid "Bujumbura" -msgstr "" - -msgid "Busingen" -msgstr "" - -msgid "Cairo" -msgstr "" - -msgid "Calcutta" -msgstr "" - -msgid "Cambridge_Bay" -msgstr "" - -msgid "Campo_Grande" +#: source/ubl-strings.h:31 +msgid "Date format:" msgstr "" -msgid "Canada" +#: source/ubl-strings.h:32 +msgid "" +"Date\n" +"format" msgstr "" -msgid "Canary" +#: source/ubl-strings.h:34 +msgid "YYYY" msgstr "" -msgid "Canberra" +#: source/ubl-strings.h:35 +msgid "MM" msgstr "" -msgid "Cancun" +#: source/ubl-strings.h:36 +msgid "DD" msgstr "" -msgid "Cape_Vepde" +#: source/ubl-strings.h:37 +msgid "DD.MM.YYYY" msgstr "" -msgid "Cape_Verde" +#: source/ubl-strings.h:38 +msgid "DD-MM-YYYY" msgstr "" -msgid "Caracas" +#: source/ubl-strings.h:39 +msgid "DD/MM/YYYY" msgstr "" -msgid "Casablanca" +#: source/ubl-strings.h:40 +msgid "MM-DD-YYYY" msgstr "" - -msgid "Casey" -msgstr "" - -msgid "Catamarca" -msgstr "" - -msgid "Cayenne" -msgstr "" - -msgid "Cayman" -msgstr "" - -msgid "Center" -msgstr "" - -msgid "Central" -msgstr "" - -msgid "Ceuta" -msgstr "" - -msgid "Chagos" -msgstr "" - -msgid "Chatham" -msgstr "" - -msgid "Chicago" -msgstr "" - -msgid "Chihuahua" -msgstr "" - -msgid "Chile" -msgstr "" - -msgid "Chisinau" -msgstr "" - -msgid "Chita" -msgstr "" - -msgid "Choibalsan" -msgstr "" - -msgid "Chongqing" -msgstr "" - -msgid "Christmas" -msgstr "" - -msgid "Chungking" -msgstr "" - -msgid "Chuuk" -msgstr "" - -msgid "Ciudad_Juarez" -msgstr "" - -msgid "Clock" -msgstr "" - -msgid "Close" -msgstr "" - -msgid "Cocos" -msgstr "" - -msgid "Colombo" -msgstr "" - -msgid "ComodRivadavia" -msgstr "" - -msgid "Comoro" -msgstr "" - -msgid "Conakry" -msgstr "" - -msgid "Continental" -msgstr "" - -msgid "Copenhagen" -msgstr "" - -msgid "Coral_Harbour" -msgstr "" - -msgid "Cordoba" -msgstr "" - -msgid "Costa_Rica" -msgstr "" - -msgid "Creston" -msgstr "" - -msgid "Cuiaba" -msgstr "" - -msgid "Curacao" -msgstr "" - -msgid "Dacca" -msgstr "" - -msgid "Dakar" -msgstr "" - -msgid "Damascus" -msgstr "" - -msgid "Danmarkshavn" -msgstr "" - -msgid "Dar_es_Salaam" -msgstr "" - -msgid "Darwin" -msgstr "" - -msgid "Davis" -msgstr "" - -msgid "Dawson" -msgstr "" - -msgid "Dawson_Creek" -msgstr "" - -msgid "DeNoronha" -msgstr "" - -msgid "Denver" -msgstr "" - -msgid "Detroit" -msgstr "" - -msgid "Dhaka" -msgstr "" - -msgid "Dili" -msgstr "" - -msgid "Djibouti" -msgstr "" - -msgid "Dominica" -msgstr "" - -msgid "Douala" -msgstr "" - -msgid "Dubai" -msgstr "" - -msgid "Dublin" -msgstr "" - -msgid "DumontDUrville" -msgstr "" - -msgid "Dushanbe" -msgstr "" - -msgid "ERROR" -msgstr "" - -msgid "East" -msgstr "" - -msgid "East-Indiana" -msgstr "" - -msgid "Easter" -msgstr "" - -msgid "EasterIsland" -msgstr "" - -msgid "Easterlsland" -msgstr "" - -msgid "Eastern" -msgstr "" - -msgid "Edmonton" -msgstr "" - -msgid "Efate" -msgstr "" - -msgid "Eirunepe" -msgstr "" - -msgid "El_Aaiun" -msgstr "" - -msgid "El_Salvador" -msgstr "" - -msgid "Enderbury" -msgstr "" - -msgid "Ensenada" -msgstr "" - -msgid "Eucla" -msgstr "" - -msgid "Europe" -msgstr "" - -msgid "Faeroe" -msgstr "" - -msgid "Fakaofo" -msgstr "" - -msgid "Famagusta" -msgstr "" - -msgid "Faroe" -msgstr "" - -msgid "Fiji" -msgstr "" - -msgid "Fort_Nelson" -msgstr "" - -msgid "Fort_Wayne" -msgstr "" - -msgid "Fortaleza" -msgstr "" - -msgid "Freetown" -msgstr "" - -msgid "Funafuti" -msgstr "" - -msgid "Gaborone" -msgstr "" - -msgid "Galapagos" -msgstr "" - -msgid "Gambier" -msgstr "" - -msgid "Gaza" -msgstr "" - -msgid "General" -msgstr "" - -msgid "Gibraltar" -msgstr "" - -msgid "Glace_Bay" -msgstr "" - -msgid "Godthab" -msgstr "" - -msgid "Goose_Bay" -msgstr "" - -msgid "Grand_Turk" -msgstr "" - -msgid "Greenwich" -msgstr "" - -msgid "Grenada" -msgstr "" - -msgid "Guadalcanal" -msgstr "" - -msgid "Guadeloupe" -msgstr "" - -msgid "Guam" -msgstr "" - -msgid "Guatemala" -msgstr "" - -msgid "Guayaquil" -msgstr "" - -msgid "Guernsey" -msgstr "" - -msgid "Guyana" -msgstr "" - -msgid "Halifax" -msgstr "" - -msgid "Harare" -msgstr "" - -msgid "Harbin" -msgstr "" - -msgid "Havana" -msgstr "" - -msgid "Hawaii" -msgstr "" - -msgid "Hebron" -msgstr "" - -msgid "Helsinki" -msgstr "" - -msgid "Hermosillo" -msgstr "" - -msgid "Ho_Chi_Minh" -msgstr "" - -msgid "Hobart" -msgstr "" - -msgid "Hong_Kong" -msgstr "" - -msgid "Honolulu" -msgstr "" - -msgid "Hovd" -msgstr "" - -msgid "Indian" -msgstr "" - -msgid "Indiana" -msgstr "" - -msgid "Indiana-Starke" -msgstr "" - -msgid "Indianapolis" -msgstr "" - -msgid "Inuvik" -msgstr "" - -msgid "Iqaluit" -msgstr "" - -msgid "Irkutsk" -msgstr "" - -msgid "Isle_of_Man" -msgstr "" - -msgid "Istanbul" -msgstr "" - -msgid "Jakarta" -msgstr "" - -msgid "Jamaica" -msgstr "" - -msgid "Jan_Mayen" -msgstr "" - -msgid "Jayapura" -msgstr "" - -msgid "Jersey" -msgstr "" - -msgid "Jerusalem" -msgstr "" - -msgid "Johannesburg" -msgstr "" - -msgid "Johnston" -msgstr "" - -msgid "Juba" -msgstr "" - -msgid "Jujuy" -msgstr "" - -msgid "Juneau" -msgstr "" - -msgid "Kabul" -msgstr "" - -msgid "Kaliningrad" -msgstr "" - -msgid "Kamchatka" -msgstr "" - -msgid "Kampala" -msgstr "" - -msgid "Kanton" -msgstr "" - -msgid "Karachi" -msgstr "" - -msgid "Kashgar" -msgstr "" - -msgid "Kathmandu" -msgstr "" - -msgid "Katmandu" -msgstr "" - -msgid "Kerguelen" -msgstr "" - -msgid "Khandyga" -msgstr "" - -msgid "Khartoum" -msgstr "" - -msgid "Kiev" -msgstr "" - -msgid "Kigali" -msgstr "" - -msgid "Kinshasa" -msgstr "" - -msgid "Kiritimati" -msgstr "" - -msgid "Kirov" -msgstr "" - -msgid "Knox" -msgstr "" - -msgid "Knox_IN" -msgstr "" - -msgid "Kolkata" -msgstr "" - -msgid "Kralendijk" -msgstr "" - -msgid "Krasnoyarsk" -msgstr "" - -msgid "Kuala_Lumpur" -msgstr "" - -msgid "Kuching" -msgstr "" - -msgid "Kuwait" -msgstr "" - -msgid "Kwajalein" -msgstr "" - -msgid "Kyiv" -msgstr "" - -msgid "LHI" -msgstr "" - -msgid "La_Paz" -msgstr "" - -msgid "La_Rioja" -msgstr "" - -msgid "Lagos" -msgstr "" - -msgid "Libreville" -msgstr "" - -msgid "Lima" -msgstr "" - -msgid "Lindeman" -msgstr "" - -msgid "Lisbon" -msgstr "" - -msgid "Ljubljana" -msgstr "" - -msgid "Lome" -msgstr "" - -msgid "London" -msgstr "" - -msgid "Longyearbyen" -msgstr "" - -msgid "Lord_Howe" -msgstr "" - -msgid "Los_Angeles" -msgstr "" - -msgid "Louisville" -msgstr "" - -msgid "Lower_Princes" -msgstr "" - -msgid "Luanda" -msgstr "" - -msgid "Lubumbashi" -msgstr "" - -msgid "Lusaka" -msgstr "" - -msgid "Luxembourg" -msgstr "" - -msgid "Macao" -msgstr "" - -msgid "Macau" -msgstr "" - -msgid "Maceio" -msgstr "" - -msgid "Macquarie" -msgstr "" - -msgid "Madeira" -msgstr "" - -msgid "Madrid" -msgstr "" - -msgid "Magadan" -msgstr "" - -msgid "Mahe" -msgstr "" - -msgid "Majuro" -msgstr "" - -msgid "Makassar" -msgstr "" - -msgid "Malabo" -msgstr "" - -msgid "Maldives" -msgstr "" - -msgid "Malta" -msgstr "" - -msgid "Managua" -msgstr "" - -msgid "Manaus" -msgstr "" - -msgid "Manila" -msgstr "" - -msgid "Maputo" -msgstr "" - -msgid "Marengo" -msgstr "" - -msgid "Mariehamn" -msgstr "" - -msgid "Marigot" -msgstr "" - -msgid "Marquesas" -msgstr "" - -msgid "Martinique" -msgstr "" - -msgid "Maseru" -msgstr "" - -msgid "Matamoros" -msgstr "" - -msgid "Mauritius" -msgstr "" - -msgid "Mawson" -msgstr "" - -msgid "Mayotte" -msgstr "" - -msgid "Mazatlan" -msgstr "" - -msgid "Mbabane" -msgstr "" - -msgid "McMurdo" -msgstr "" - -msgid "Melbourne" -msgstr "" - -msgid "Mendoza" -msgstr "" - -msgid "Menominee" -msgstr "" - -msgid "Merida" -msgstr "" - -msgid "Metlakatla" -msgstr "" - -msgid "Mexico" -msgstr "" - -msgid "Mexico_City" -msgstr "" - -msgid "Michigan" -msgstr "" - -msgid "Midway" -msgstr "" - -msgid "Minsk" -msgstr "" - -msgid "Minutes" -msgstr "" - -msgid "Miquelon" -msgstr "" - -msgid "Mogadishu" -msgstr "" - -msgid "Monaco" -msgstr "" - -msgid "Moncton" -msgstr "" - -msgid "Monrovia" -msgstr "" - -msgid "Monterrey" -msgstr "" - -msgid "Montevideo" -msgstr "" - -msgid "Monticello" -msgstr "" - -msgid "Montreal" -msgstr "" - -msgid "Montserrat" -msgstr "" - -msgid "Moscow" -msgstr "" - -msgid "Mountain" -msgstr "" - -msgid "Muscat" -msgstr "" - -msgid "NSW" -msgstr "" - -msgid "Nairobi" -msgstr "" - -msgid "Nassau" -msgstr "" - -msgid "Nauru" -msgstr "" - -msgid "Ndjamena" -msgstr "" - -msgid "New_Salem" -msgstr "" - -msgid "New_York" -msgstr "" - -msgid "Newfoundland" -msgstr "" - -msgid "Niamey" -msgstr "" - -msgid "Nicosia" -msgstr "" - -msgid "Nipigon" -msgstr "" - -msgid "Niue" -msgstr "" - -msgid "Nome" -msgstr "" - -msgid "Norfolk" -msgstr "" - -msgid "Noronha" -msgstr "" - -msgid "North" -msgstr "" - -msgid "North_Dokota" -msgstr "" - -msgid "Nouakchott" -msgstr "" - -msgid "Noumea" -msgstr "" - -msgid "Novokuznetsk" -msgstr "" - -msgid "Novosibirsk" -msgstr "" - -msgid "Nuuk" -msgstr "" - -msgid "OK" -msgstr "" - -msgid "Ojinaga" -msgstr "" - -msgid "Omsk" -msgstr "" - -msgid "Oral" -msgstr "" - -msgid "Oslo" -msgstr "" - -msgid "Ouagadougou" -msgstr "" - -msgid "Pacific" -msgstr "" - -msgid "Pago_Pago" -msgstr "" - -msgid "Palau" -msgstr "" - -msgid "Palmer" -msgstr "" - -msgid "Panama" -msgstr "" - -msgid "Pangnirtung" -msgstr "" - -msgid "Paramaribo" -msgstr "" - -msgid "Paris" -msgstr "" - -msgid "Perth" -msgstr "" - -msgid "Petersburg" -msgstr "" - -msgid "Phnom_Penh" -msgstr "" - -msgid "Phoenix" -msgstr "" - -msgid "Pitcairn" -msgstr "" - -msgid "Podgorica" -msgstr "" - -msgid "Pohnpei" -msgstr "" - -msgid "Ponape" -msgstr "" - -msgid "Pontianak" -msgstr "" - -msgid "Port-au-Prince" -msgstr "" - -msgid "Port_Moresby" -msgstr "" - -msgid "Port_of_Spain" -msgstr "" - -msgid "Porto-Novo" -msgstr "" - -msgid "Porto_Acre" -msgstr "" - -msgid "Porto_Velho" -msgstr "" - -msgid "Prague" -msgstr "" - -msgid "Puerto_Rico" -msgstr "" - -msgid "Punta_Arenas" -msgstr "" - -msgid "Pyongyang" -msgstr "" - -msgid "Qatar" -msgstr "" - -msgid "Qostanay" -msgstr "" - -msgid "Queensland" -msgstr "" - -msgid "Qyzylorda" -msgstr "" - -msgid "Rainy_River" -msgstr "" - -msgid "Rangoon" -msgstr "" - -msgid "Rankin_Inlet" -msgstr "" - -msgid "Rarotonga" -msgstr "" - -msgid "Recife" -msgstr "" - -msgid "Regina" -msgstr "" - -msgid "Resolute" -msgstr "" - -msgid "Reunion" -msgstr "" - -msgid "Reykjavik" -msgstr "" - -msgid "Riga" -msgstr "" - -msgid "Rio_Branco" -msgstr "" - -msgid "Rio_Gallegos" -msgstr "" - -msgid "Riyadh" -msgstr "" - -msgid "Rome" -msgstr "" - -msgid "Rosario" -msgstr "" - -msgid "Rothera" -msgstr "" - -msgid "Saigon" -msgstr "" - -msgid "Saipan" -msgstr "" - -msgid "Sakhalin" -msgstr "" - -msgid "Salta" -msgstr "" - -msgid "Samara" -msgstr "" - -msgid "Samarkand" -msgstr "" - -msgid "Samoa" -msgstr "" - -msgid "San_Juan" -msgstr "" - -msgid "San_Luis" -msgstr "" - -msgid "San_Marino" -msgstr "" - -msgid "Santa_Isabel" -msgstr "" - -msgid "Santarem" -msgstr "" - -msgid "Santiago" -msgstr "" - -msgid "Santo_Domingo" -msgstr "" - -msgid "Sao_Paulo" -msgstr "" - -msgid "Sao_Tome" -msgstr "" - -msgid "Sarajevo" -msgstr "" - -msgid "Saratov" -msgstr "" - -msgid "Saskatchewan" -msgstr "" - -msgid "Scoresbysund" -msgstr "" - -msgid "Seoul" -msgstr "" - -msgid "Shanghai" -msgstr "" - -msgid "Shiprock" -msgstr "" - -msgid "Simferopol" -msgstr "" - -msgid "Singapore" -msgstr "" - -msgid "Sitka" -msgstr "" - -msgid "Skopje" -msgstr "" - -msgid "Sofia" -msgstr "" - -msgid "South" -msgstr "" - -msgid "South_Georgia" -msgstr "" - -msgid "South_Pole" -msgstr "" - -msgid "Srednekolymsk" -msgstr "" - -msgid "St_Barthelemy" -msgstr "" - -msgid "St_Helena" -msgstr "" - -msgid "St_Johns" -msgstr "" - -msgid "St_Kitts" -msgstr "" - -msgid "St_Lucia" -msgstr "" - -msgid "St_Thomas" -msgstr "" - -msgid "St_Vincent" -msgstr "" - -msgid "Stanley" -msgstr "" - -msgid "Stockholm" -msgstr "" - -msgid "Swift_Current" -msgstr "" - -msgid "Sydney" -msgstr "" - -msgid "Syowa" -msgstr "" - -msgid "Tahiti" -msgstr "" - -msgid "Taipei" -msgstr "" - -msgid "Tallinn" -msgstr "" - -msgid "Tarawa" -msgstr "" - -msgid "Tashkent" -msgstr "" - -msgid "Tasmania" -msgstr "" - -msgid "Tbilisi" -msgstr "" - -msgid "Tegucigalpa" -msgstr "" - -msgid "Tehran" -msgstr "" - -msgid "Tel_Aviv" -msgstr "" - -msgid "Tell_City" -msgstr "" - -msgid "Thimbu" -msgstr "" - -msgid "Thimphu" -msgstr "" - -msgid "Thule" -msgstr "" - -msgid "Thunder_Bay" -msgstr "" - -msgid "Tijuana" -msgstr "" - -msgid "Timbuktu" -msgstr "" - -msgid "Tirane" -msgstr "" - -msgid "Tiraspol" -msgstr "" - -msgid "Tokyo" -msgstr "" - -msgid "Tomsk" -msgstr "" - -msgid "Tongatapu" -msgstr "" - -msgid "Toronto" -msgstr "" - -msgid "Tortola" -msgstr "" - -msgid "Tripoli" -msgstr "" - -msgid "Troll" -msgstr "" - -msgid "Truk" -msgstr "" - -msgid "Tucuman" -msgstr "" - -msgid "Tunis" -msgstr "" - -msgid "US" -msgstr "" - -msgid "Ujung_Pandang" -msgstr "" - -msgid "Ulaanbaatar" -msgstr "" - -msgid "Ulan_Bator" -msgstr "" - -msgid "Ulyanovsk" -msgstr "" - -msgid "Universal" -msgstr "" - -msgid "Urumqi" -msgstr "" - -msgid "Ushuaia" -msgstr "" - -msgid "Ust-Nera" -msgstr "" - -msgid "Uzhgorod" -msgstr "" - -msgid "Vaduz" -msgstr "" - -msgid "Vancouver" -msgstr "" - -msgid "Vatican" -msgstr "" - -msgid "Vevay" -msgstr "" - -msgid "Victoria" -msgstr "" - -msgid "Vienna" -msgstr "" - -msgid "Vientiane" -msgstr "" - -msgid "Vilnius" -msgstr "" - -msgid "Vincennes" -msgstr "" - -msgid "Virgin" -msgstr "" - -msgid "Vladivostok" -msgstr "" - -msgid "Volgograd" -msgstr "" - -msgid "Vostok" -msgstr "" - -msgid "Wake" -msgstr "" - -msgid "Wallis" -msgstr "" - -msgid "Warsaw" -msgstr "" - -msgid "West" -msgstr "" - -msgid "Whitehorse" -msgstr "" - -msgid "Winamac" -msgstr "" - -msgid "Windhoek" -msgstr "" - -msgid "Winnipeg" -msgstr "" - -msgid "Yakutat" -msgstr "" - -msgid "Yakutsk" -msgstr "" - -msgid "Yancowinna" -msgstr "" - -msgid "Yangon" -msgstr "" - -msgid "Yap" -msgstr "" - -msgid "Yekaterinburg" -msgstr "" - -msgid "Yellowknife" -msgstr "" - -msgid "Yerevan" -msgstr "" - -msgid "Yukon" -msgstr "" - -msgid "Zagreb" -msgstr "" - -msgid "Zaporozhye" -msgstr "" - -msgid "Zulu" -msgstr "" - -msgid "Zurich" -msgstr "" \ No newline at end of file diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index e41e89f..c2997c6 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -33,99 +33,67 @@ msgstr "Ошибка синхронизации аппаратных часов" msgid "Important field is empty" msgstr "Пустое важное поле" -#: source/ubl-strings.h:6 -msgid "Date format:" -msgstr "Формат даты:" - -#: source/ubl-strings.h:6 -msgid "Date\nformat" -msgstr "Дата\nформат" - -#: source/ubl-strings.h:29 -msgid "YYYY" -msgstr "ГГГГ" - -#: source/ubl-strings.h:30 -msgid "MM" -msgstr "ММ" - -#: source/ubl-strings.h:31 -msgid "DD" -msgstr "ДД" - -#: source/ubl-strings.h:32 -msgid "DD.MM.YYYY" -msgstr "ДД.ММ.ГГГГ" - -#: source/ubl-strings.h:33 -msgid "DD-MM-YYYY" -msgstr "ДД-ММ-ГГГГ" - -#: source/ubl-strings.h:34 -msgid "DD/MM/YYYY" -msgstr "ДД/ММ/ГГГГ" - -#: source/ubl-strings.h:35 -msgid "MM-DD-YYYY" -msgstr "ММ-ДД-ГГГГ" - -#: source/ubl-strings.h:7 +#: source/ubl-strings.h:8 msgid "Accept" msgstr "Принять" -#: source/ubl-strings.h:8 +#: source/ubl-strings.h:9 msgid "Cancel" msgstr "Отменить" -#: source/ubl-strings.h:9 +#: source/ubl-strings.h:10 msgid "Current date and time" msgstr "Текущие дата и время" -#: source/ubl-strings.h:10 +#: source/ubl-strings.h:11 msgid "Time:" msgstr "Время:" -#: source/ubl-strings.h:11 +#: source/ubl-strings.h:12 msgid "Date:" msgstr "Дата:" -#: source/ubl-strings.h:12 +#: source/ubl-strings.h:13 msgid "Synchronize" msgstr "Синхронизировать" -#: source/ubl-strings.h:13 +#: source/ubl-strings.h:14 msgid "Synchronize hardware time" msgstr "Синхронизировать аппаратное время" -#: source/ubl-strings.h:13 +#: source/ubl-strings.h:15 msgid "Synchronize hardware time:" msgstr "Синхронизировать аппаратное время:" -#: source/ubl-strings.h:14 +#: source/ubl-strings.h:16 msgid "Synchronize via NTP" msgstr "Синхронизировать через NTP" -#: source/ubl-strings.h:15 +#: source/ubl-strings.h:17 msgid "Default" msgstr "По умолчанию" -#: source/ubl-strings.h:16 -msgid "Stopped" -msgstr "Остановлен" +#: source/ubl-strings.h:18 +msgid "Do not configure" +msgstr "Не настраивать" -#: source/ubl-strings.h:17 -msgid "Manual" -msgstr "Вручную" +#: source/ubl-strings.h:19 +msgid "Stop" +msgstr "Отключить" -#: source/ubl-strings.h:17 +#: source/ubl-strings.h:22 msgid "NTP-servers" msgstr "NTP-серверы" -#: source/ubl-strings.h:17 +#: source/ubl-strings.h:23 msgid "NTP-servers (RU)" msgstr "NTP-серверы (RU)" -#: source/ubl-strings.h:18 +#: source/ubl-strings.h:24 +msgid "Manual" +msgstr "Вручную" + +#: source/ubl-strings.h:25 msgid "" "Enter the name of the ntp server or its ip address. When entering multiple " "addresses, separate them with spaces." @@ -133,22 +101,65 @@ msgstr "" "Введите имя ntp-сервера или его ip-адрес.\n" "При вводе нескольких адресов, разделяйте их запятыми." -#: source/ubl-strings.h:19 +#: source/ubl-strings.h:26 msgid "Time Zone" msgstr "Часовой пояс" -#: source/ubl-strings.h:20 +#: source/ubl-strings.h:27 msgid "Region:" msgstr "Регион:" -#: source/ubl-strings.h:21 +#: source/ubl-strings.h:28 msgid "Zone:" msgstr "Зона:" -#: source/ubl-strings.h:22 +#: source/ubl-strings.h:29 msgid "Local time" msgstr "Локальное время" +#: source/ubl-strings.h:31 +msgid "Date format:" +msgstr "Формат даты:" + +#: source/ubl-strings.h:32 +msgid "" +"Date\n" +"format" +msgstr "" +"Дата\n" +"формат" + +#: source/ubl-strings.h:34 +msgid "YYYY" +msgstr "ГГГГ" + +#: source/ubl-strings.h:35 +msgid "MM" +msgstr "ММ" + +#: source/ubl-strings.h:36 +msgid "DD" +msgstr "ДД" + +#: source/ubl-strings.h:37 +msgid "DD.MM.YYYY" +msgstr "ДД.ММ.ГГГГ" + +#: source/ubl-strings.h:38 +msgid "DD-MM-YYYY" +msgstr "ДД-ММ-ГГГГ" + +#: source/ubl-strings.h:39 +msgid "DD/MM/YYYY" +msgstr "ДД/ММ/ГГГГ" + +#: source/ubl-strings.h:40 +msgid "MM-DD-YYYY" +msgstr "ММ-ДД-ГГГГ" + +msgid "Stopped" +msgstr "Остановлен" + msgid "Abidjan" msgstr "Абиджан"