From 367977ada4bf202f12c4e7ef84f20e8dcac36411 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 12 Sep 2017 22:30:35 +0200 Subject: [PATCH] network-setup: small changes in locales; move npt-at-boot item up Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/92a8ee74f93994ad12ba0af79e53a03f34074e47 Author: vanhofen Date: 2017-09-12 (Tue, 12 Sep 2017) Origin message was: ------------------ - network-setup: small changes in locales; move npt-at-boot item up --- data/locale/deutsch.locale | 4 ++-- data/locale/english.locale | 2 +- src/gui/network_setup.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 484b3e4dd..b474355b8 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2125,8 +2125,8 @@ networkmenu.ipaddress IP networkmenu.mount Netzwerkfreigaben bearbeiten networkmenu.nameserver Nameserver networkmenu.netmask Netzmaske -networkmenu.ntpatboot Zeit beim Booten synchr. -networkmenu.ntpenable Zeit per INet synchronisieren +networkmenu.ntpatboot Zeit beim Booten synchronisieren +networkmenu.ntpenable Zeit synchronisieren per networkmenu.ntprefresh NTP/DVB-Aktualisierung networkmenu.ntprefresh_hint1 NTP/DVB-Time-Sync [min] networkmenu.ntprefresh_hint2 braucht Reboot oder EPG-Reset diff --git a/data/locale/english.locale b/data/locale/english.locale index 4b83d36b7..7e9d81402 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2124,7 +2124,7 @@ networkmenu.ipaddress IP address networkmenu.mount Edit network shares networkmenu.nameserver Name server networkmenu.netmask Netmask -networkmenu.ntpatboot Sync time while booting +networkmenu.ntpatboot Syncronize time at boot networkmenu.ntpenable Syncronisation via networkmenu.ntprefresh NTP/DVB-Refresh networkmenu.ntprefresh_hint1 NTP/DVB-Time-Sync in minutes diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 638a7d89b..e5e60bdc3 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -417,20 +417,20 @@ void CNetworkSetup::showNetworkNTPSetup(CMenuWidget *menu_ntp) CStringInput * networkSettings_NtpRefresh = new CStringInput(LOCALE_NETWORKMENU_NTPREFRESH, &g_settings.network_ntprefresh, 3,LOCALE_NETWORKMENU_NTPREFRESH_HINT1, LOCALE_NETWORKMENU_NTPREFRESH_HINT2 , "0123456789 ", sectionsdConfigNotifier); CMenuOptionChooser *ntp1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_NTPENABLE, &g_settings.network_ntpenable, OPTIONS_NTPENABLE_OPTIONS, OPTIONS_NTPENABLE_OPTION_COUNT, true, sectionsdConfigNotifier); + CMenuOptionChooser *ntp9 = new CMenuOptionChooser(LOCALE_NETWORKMENU_NTPATBOOT, &g_settings.network_ntpatboot, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); //NI CMenuForwarder *ntp2 = new CMenuDForwarder( LOCALE_NETWORKMENU_NTPSERVER, true , g_settings.network_ntpserver, networkSettings_NtpServer ); CMenuForwarder *ntp3 = new CMenuDForwarder( LOCALE_NETWORKMENU_NTPREFRESH, true , g_settings.network_ntprefresh, networkSettings_NtpRefresh ); - CMenuOptionChooser *ntp9 = new CMenuOptionChooser(LOCALE_NETWORKMENU_NTPATBOOT, &g_settings.network_ntpatboot, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); //NI ntp1->setHint("", LOCALE_MENU_HINT_NET_NTPENABLE); + ntp9->setHint("", LOCALE_MENU_HINT_NET_NTPATBOOT); //NI ntp2->setHint("", LOCALE_MENU_HINT_NET_NTPSERVER); ntp3->setHint("", LOCALE_MENU_HINT_NET_NTPREFRESH); - ntp9->setHint("", LOCALE_MENU_HINT_NET_NTPATBOOT); //NI menu_ntp->addIntroItems(LOCALE_NETWORKMENU_NTPTITLE); menu_ntp->addItem( ntp1); + menu_ntp->addItem( ntp9); //NI menu_ntp->addItem( ntp2); menu_ntp->addItem( ntp3); - menu_ntp->addItem( ntp9); //NI } #ifdef ENABLE_GUI_MOUNT