From 0969f10931c05f4479ef21a3896ff6f9d1c72e99 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 8 Aug 2017 16:41:08 +0200 Subject: [PATCH] Partly revert "english.locale: corrections in channellist locales" This partly reverts commit c647e359eca08896201c0163cc636b4807ecc433. Conflicts: data/locale/english.locale Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3b05300d595e9071ffe75f84785694b855cb07f9 Author: vanhofen Date: 2017-08-08 (Tue, 08 Aug 2017) ------------------ This commit was generated by Migit --- data/locale/english.locale | 60 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/data/locale/english.locale b/data/locale/english.locale index 2216f95d5..28b1f7df7 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -258,52 +258,52 @@ camd_msg_reset camd will be restarted camd_msg_start camd will be started camd_msg_stop camd will be stopped camd_reset camd restart -channellist.additional Additional Informations -channellist.additional_off Off -channellist.additional_on On -channellist.additional_on_minitv On (with MiniTV) -channellist.current_tp Current Transponder +channellist.additional Additional informations +channellist.additional_off off +channellist.additional_on on +channellist.additional_on_minitv on (with MiniTV) +channellist.current_tp Current transponder channellist.edit Edit -channellist.epgtext_align_left Left -channellist.epgtext_align_right Right -channellist.extended Show Event Progress +channellist.epgtext_align_left left +channellist.epgtext_align_right right +channellist.extended Show event progress channellist.extended_colored with colored progressbar channellist.extended_simple with simple progressbar channellist.favs Favorites -channellist.foot Channel Information -channellist.foot_freq Sat/Freq Info -channellist.foot_next Next Event -channellist.foot_off Off -channellist.foot_sort_alpha Sorted[Alpha] -channellist.foot_sort_chnum Sorted[Number] -channellist.foot_sort_freq Sorted[Freq] -channellist.foot_sort_sat Sorted[Sat] -channellist.head All Services +channellist.foot Channel information +channellist.foot_freq Sat/Freq info +channellist.foot_next next event +channellist.foot_off off +channellist.foot_sort_alpha Sorted[alpha] +channellist.foot_sort_chnum Sorted[number] +channellist.foot_sort_freq Sorted[freq] +channellist.foot_sort_sat Sorted[sat] +channellist.head All services channellist.history History -channellist.history_clear Clear History -channellist.keep_numbers Persistent Channel Numbers +channellist.history_clear Clear history +channellist.keep_numbers Persistent channel numbers channellist.make_hdlist Create list of HD channels channellist.make_newlist Create list of new channels channellist.make_removedlist Create list of removed channels channellist.make_webtvlist Create list of WebTV channels -channellist.new_zap_mode Quickzap in List -channellist.new_zap_mode_active Active -channellist.new_zap_mode_allow Allow -channellist.new_zap_mode_off Off +channellist.new_zap_mode Quickzap in list +channellist.new_zap_mode_active active +channellist.new_zap_mode_allow allow +channellist.new_zap_mode_off off channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key -> service) -channellist.numeric_adjust Numeric Zap Adjust +channellist.numeric_adjust Numeric zap adjust channellist.provs Providers channellist.recording_not_possible Recording not possible! channellist.remember Last used channellist.reset_all Reset 'new' flag for all channels channellist.reset_flags Reset 'new' channel flag channellist.sats Satellites -channellist.show_channellogo Show Channel Logos -channellist.show_channelnumber Show Channel Numbers -channellist.show_empty_favs Show empty Favorites Bouquets -channellist.show_infobox Show Bottom Infobox -channellist.since Since -channellist.start Starts +channellist.show_channellogo Show channel logos +channellist.show_channelnumber Show channel numbers +channellist.show_empty_favs Show empty favorites bouquets +channellist.show_infobox Show bottom infobox +channellist.since since +channellist.start starts ci.clock CI clock (Mhz) ci.empty No CAM in slot ci.ignore_msg Ignore CA messages