From e76e443477aac742e9546da65cddd03a3fe40945 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Nov 2017 00:10:32 +0100 Subject: [PATCH] fix last merge #2 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c1cea39c1dee4c442fbf7ab6e0a6b8446237013e Author: vanhofen Date: 2017-11-03 (Fri, 03 Nov 2017) Origin message was: ------------------ - fix last merge #2 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/english.locale | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/data/locale/english.locale b/data/locale/english.locale index 0b165a3b4..2b0d6a140 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -839,13 +839,8 @@ hdd_60min 60 min. hdd_activate Apply settings hdd_allow_set_recdir Allow recordings immediately hdd_check Check filesystem -<<<<<<< HEAD -hdd_check_failed Device-check failed! -hdd_extended_settings Extended Device-Settings -======= hdd_check_failed Filesystem-check failed! hdd_extended_settings Extended Settings ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb hdd_fast Fast hdd_format Format device hdd_format_failed Formating failed! Make sure device not in use, reboot and try again @@ -1168,11 +1163,7 @@ menu.hint_channellist_foot Show additional information\nin bottom box menu.hint_channellist_mode Use the selected channel list mode on startup if last mode is TV menu.hint_channellist_mode_radio Use the selected channel list mode on startup if last mode is Radio menu.hint_channellist_setup Configure channel list GUI options -<<<<<<< HEAD -menu.hint_channellist_show_channellogo Show channel logos in channellist, eventlist, EPG Plus, EPG-viewer and moviebrowser -======= menu.hint_channellist_show_channellogo Enable/disable channel logos. ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb menu.hint_channellist_show_channelnumber Show channel number in channel list menu.hint_channellist_show_empty_favs Show or hide empty bouquets in favorites menu.hint_channellist_show_infobox Show or hide bottom infobox of channellist @@ -1254,13 +1245,9 @@ menu.hint_inact_timer Shutdown box after inactivity menu.hint_inactive_back Change inactive item background color menu.hint_inactive_textcolor Change inactive item text color menu.hint_inet_radio Internet radio -<<<<<<< HEAD menu.hint_inetradio_autostart Start play of first entry from favorites automatically -menu.hint_info Information about image, box cpu and storage,\nstream information -menu.hint_infobar_analogclock Shows an analog clock instead of the digital display of the time -======= menu.hint_info Show system informations. ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb +menu.hint_infobar_analogclock Shows an analog clock instead of the digital display of the time menu.hint_infobar_back Change infobar background color menu.hint_infobar_buttons_usertitle Forces userdefined titles for the color keys menu.hint_infobar_casys On: display all with colored active, mini: single\nlocked icon, descreet: all active ca-systems @@ -1272,11 +1259,7 @@ menu.hint_infobar_ecminfo Show ecm-info while infobar is displayed menu.hint_infobar_filesys Show flash and HDD used space levels menu.hint_infobar_fonts Change infobar font sizes menu.hint_infobar_logo Logo, channelnumber and signal display; Options in [brackets] will be displayed in small infobox -<<<<<<< HEAD -menu.hint_infobar_logo_dir Select external directory to search for channels logo -======= menu.hint_infobar_logo_dir Set folder for channel logos. ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb menu.hint_infobar_on_epg Show infobar on current EPG event change menu.hint_infobar_radiotext Show radiotext window menu.hint_infobar_res Show channel resolution icons @@ -2300,15 +2283,11 @@ ping.socket is unreachable (socket error) ping.unreachable is unreachable pinprotection.head Enter PIN code pinprotection.wrongcode PIN-Code was wrong! Try again. -<<<<<<< HEAD plugin.hide_no Show plugin.hide_yes Hide plugins.control Control plugins plugins.hdd_dir External plugin directory plugins.hide Hide or show plugins -======= -plugins.hdd_dir Plugin external directory. ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb plugins.no_plugin No plugin plugins.result plugin output plugintype.disabled Disabled @@ -2528,11 +2507,7 @@ servicemenu.restart_tuner Restart tuner servicemenu.restarting_tuner Restarting tuner servicemenu.scants Servicescan servicemenu.update Software Update -<<<<<<< HEAD settings.backup Save NI-Backup -======= -settings.backup Save system settings ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb settings.backup_failed Backup failed! settings.help Help settings.menu_hints Show menu hints @@ -2549,11 +2524,7 @@ settings.pos_higher_center higher center settings.pos_top_center top center settings.pos_top_left top left settings.pos_top_right top right -<<<<<<< HEAD settings.restore Load NI-Backup -======= -settings.restore Restore system settings ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb settings.restore_warn This will replace all settings and reboot\nContinue ? settings.teams Cross-Team Settings settings.teams.backup Save @@ -2793,13 +2764,8 @@ wizard.setup_advanced Advanced wizard.setup_easy Easy wizard.setup_type Installation type wizard.setup_type_hint Easy to setup for CanalDigitaal/TéléSAT/TV Vlaanderen providers or simple cable scan -<<<<<<< HEAD -wizard.welcome_head Welcome to the NI-Setup-Wizard -wizard.welcome_text NI-Image Info:\nYour set-top box can be conveniently controlled\nwith the web interface for timer management or live TV on the Web browser.\nA root-password is not yet set!\nYou should catch up this by using the command "passwd" via telnet asap.\nDo you want to continue? -======= wizard.welcome_head Welcome to the Setup Wizard wizard.welcome_text Neutrino is designed for set-top boxes and is maintained by the Tuxbox community and lives from the support of users and many volontary contributors./nIf you need help or have suggestions, found bugs, please feel free to contact us.\nSupport pages or Contact and / or Web addresses can be found in the main menu under "Information".\nNext steps will guide you through initial installation of the device.\nImportant: Your set-top box can be conveniently controlled\nwith the web interface for timer management or live TV on the Web browser.\nDo not make it accessible to untrusted networks!\nDo you want to continue? ->>>>>>> 83655f78d61451af987359d9eefef0a937b92ecb word.from from word.in in youtube.dev_id YouTube Dev ID