From 60e6647244220a14d98030ce9e4fe55ba030ee61 Mon Sep 17 00:00:00 2001 From: martii Date: Sat, 21 Dec 2013 22:02:09 +0100 Subject: [PATCH] gui/scan_setup: add unit to fe timeout chooser (and add unit-locals from martiis-neutrino-mp) --- data/locale/deutsch.locale | 6 +++++- data/locale/english.locale | 6 +++++- src/gui/scan_setup.cpp | 2 ++ src/system/locals.h | 4 ++++ src/system/locals_intern.h | 4 ++++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 9b3d6a51f..4ba581631 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -434,7 +434,7 @@ extra.volume_pos Lautstärkeanzeige extra.volume_size Höhe der Anzeige extra.west Westen extra.zap_cycle Zap nur in Bouquet -extra.zapit_fe_timeout Tuning Timeout (1=10ms) +extra.zapit_fe_timeout Tuning Timeout extra.zapit_hvoltage High (13.5/ 18.5) Voltage extra.zapit_make_bouquet Kanalliste auffüllen extra.zapit_motor_speed Rotor Drehzeit (10 = 1°/ sec) @@ -1947,6 +1947,10 @@ timing.volumebar Lautstärkeanzeige unicable.lnb Unicable Eingang unicable.qrg Unicable Frequenz unicable.scr Unicable SCR +unit.short.hour h +unit.short.millisecond ms +unit.short.minute min +unit.short.second s upnpbrowser.head UPnP Browser upnpbrowser.noservers Kein UPnP-Server gefunden upnpbrowser.rescan Neue Suche diff --git a/data/locale/english.locale b/data/locale/english.locale index b7cade51e..50fff0a72 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -434,7 +434,7 @@ extra.volume_pos Volumebar extra.volume_size Height of display extra.west West extra.zap_cycle Zap cycle -extra.zapit_fe_timeout Tune timeout (1 = 10 msec) +extra.zapit_fe_timeout Tune timeout extra.zapit_hvoltage 18V for rotor moving extra.zapit_make_bouquet Make Remaining Channels list extra.zapit_motor_speed Motor moving speed (10 = 1deg/sec) @@ -1947,6 +1947,10 @@ timing.volumebar Volume bar unicable.lnb Unicable Input unicable.qrg Unicable Frequency unicable.scr Unicable SCR +unit.short.hour h +unit.short.millisecond ms +unit.short.minute min +unit.short.second s upnpbrowser.head UPnP Browser upnpbrowser.noservers No UPnP servers found upnpbrowser.rescan Scan again diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 28fec9539..f65ca2f7e 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -440,6 +440,7 @@ int CScanSetup::showScanMenu() //tune timeout if(CFEManager::getInstance()->getFrontendCount() <= 1) { CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_FE_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 6, 100); + nc->setNumberFormat(std::string("%d0 ") + g_Locale->getText(LOCALE_UNIT_SHORT_MILLISECOND)); nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT); settings->addItem(nc); } @@ -560,6 +561,7 @@ int CScanSetup::showScanMenuFrontendSetup() frontendSetup = mf; } CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_FE_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 6, 100); + nc->setNumberFormat(std::string("%d0 ") + g_Locale->getText(LOCALE_UNIT_SHORT_MILLISECOND)); nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT); setupMenu->addItem(nc); diff --git a/src/system/locals.h b/src/system/locals.h index cfc304ca6..ee5b8a71a 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1974,6 +1974,10 @@ typedef enum LOCALE_UNICABLE_LNB, LOCALE_UNICABLE_QRG, LOCALE_UNICABLE_SCR, + LOCALE_UNIT_SHORT_HOUR, + LOCALE_UNIT_SHORT_MILLISECOND, + LOCALE_UNIT_SHORT_MINUTE, + LOCALE_UNIT_SHORT_SECOND, LOCALE_UPNPBROWSER_HEAD, LOCALE_UPNPBROWSER_NOSERVERS, LOCALE_UPNPBROWSER_RESCAN, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index ea8497b7b..1bd12af3f 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1974,6 +1974,10 @@ const char * locale_real_names[] = "unicable.lnb", "unicable.qrg", "unicable.scr", + "unit.short.hour", + "unit.short.millisecond", + "unit.short.minute", + "unit.short.second", "upnpbrowser.head", "upnpbrowser.noservers", "upnpbrowser.rescan",