...
 
Commits (32)
......@@ -110,8 +110,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Включите ли опцията, ще бъдете известявани при наличие на нова актуализация"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Изпрати config.txt, cmdline.txt, shutdown.sh, autostart.sh, и kodi.log на http://sprunge.us и покажи съкратен линк"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Изпрати config.txt, cmdline.txt, shutdown.sh, autostart.sh, и kodi.log на http://ix.io и покажи съкратен линк"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -213,10 +213,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Включете за да активирате Cron демона"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Включете за да активирате lirc демона"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -818,11 +814,3 @@ msgstr "Изключи режима за готовност"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Добавката за настройките не е в готовност. Моля, опитайте по-късно."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Включи Lirc"
......@@ -111,8 +111,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Nastavte do polohy povolit, aby se na obrazovce zobrazila informace o nové aktualizaci"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Poslat config.txt, cmdline.txt, shutdown.sh, autostart.sh a kodi.log k http://sprunge.us a zobrazí krátký URL"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Poslat config.txt, cmdline.txt, shutdown.sh, autostart.sh a kodi.log k http://ix.io a zobrazí krátký URL"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -214,10 +214,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Nastavit do polohy povolit pro zapnutí cron daemonu"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Nastavit do polohy povolit pro zapnutí lirc daemonu"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -817,11 +813,3 @@ msgstr "zakázat pohotovostní režim"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Nastavení doplňku není připraveno, prosím zkuste později."
msgctxt "#32391"
msgid "Lirc"
msgstr "LIRC"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Povolit LIRC"
......@@ -111,8 +111,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Schakel in om notificaties op het scherm te krijgen wanneer er een nieuwe update beschikbaar is"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Stuur config.txt, cmdline.txt, shutdown.sh, autostart.sh, en kodi.log naar http://sprunge.us en laat de verkorte URL zien"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Stuur config.txt, cmdline.txt, shutdown.sh, autostart.sh, en kodi.log naar http://ix.io en laat de verkorte URL zien"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -214,10 +214,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Zet AAN om de Cron-daemon in te schakelen"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Zet AAN om lirc daemon in te schakelen"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -817,11 +813,3 @@ msgstr "Standby uitschakelen"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "De Instellingen-Addon is nog niet gereed, probeert u het later nog eens."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Lirc inschakelen"
......@@ -101,7 +101,11 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr ""
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgid "Send boot config files from /flash, kodi.log, kernel log and Samba configs to http://ix.io, and display the short URL"
msgstr ""
msgctxt "#719"
msgid "Send boot config files from /flash, kodi_crash.log, kernel log and Samba configs to http://ix.io, and display the short URL"
msgstr ""
msgctxt "#720"
......@@ -196,10 +200,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr ""
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr ""
msgctxt "#750"
msgid "750"
msgstr ""
......@@ -224,6 +224,18 @@ msgctxt "#755"
msgid "Auto share external drives / partitions"
msgstr ""
msgctxt "#756"
msgid "Disable older SMB protocols by specifying the minimum supported protocol."
msgstr ""
msgctxt "#757"
msgid "Disable more recent SMB protocols for backward compatability with legacy clients."
msgstr ""
msgctxt "#758"
msgid "NetBIOS group to which the server belongs. Default is WORKGROUP."
msgstr ""
msgctxt "#760"
msgid "Select an update channel"
msgstr ""
......@@ -240,6 +252,10 @@ msgctxt "#770"
msgid "Select an available version"
msgstr ""
msgctxt "#771"
msgid "The firewall blocks unwanted network traffic. Home (default) allows traffic from private network ranges (192.168.x.x, 172.16.x.x and 10.x.x.x) only. Public blocks all traffic from all networks. Custom uses rules in /storage/.config/iptables. Off disables the firewall."
msgstr ""
msgctxt "#32001"
msgid "Services"
msgstr ""
......@@ -552,10 +568,22 @@ msgctxt "#32212"
msgid "Cancel"
msgstr ""
msgctxt "#32215"
msgid "Workgroup name"
msgstr ""
msgctxt "#32216"
msgid "Auto-Share External Drives"
msgstr ""
msgctxt "#32217"
msgid "Minimum supported protocol"
msgstr ""
msgctxt "#32218"
msgid "Maximum supported protocol"
msgstr ""
msgctxt "#32300"
msgid "Welcome to @DISTRONAME@"
msgstr ""
......@@ -749,7 +777,11 @@ msgid "Submit Log"
msgstr ""
msgctxt "#32377"
msgid "Pastebin system logs and get short URL"
msgid "Upload latest Kodi log and configs, and view the short URL"
msgstr ""
msgctxt "#32378"
msgid "Upload latest Kodi crash log and configs, and view the short URL"
msgstr ""
msgctxt "#32379"
......@@ -800,10 +832,30 @@ msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr ""
msgctxt "#32391"
msgid "Lirc"
msgctxt "#32393"
msgid "** SAFE MODE! ** SAFE MODE! ** SAFE MODE! **"
msgstr ""
msgctxt "#32394"
msgid "@DISTRONAME@ has temporarily started in safe mode due to repeated Kodi crashes.[CR][CR]You may now investigate the cause of the crashes by enabling ssh or Samba.[CR][CR]Your original Kodi installation can be accessed via \"/storage/.kodi.FAILED\" and the Samba \"Kodi-Failed\" share.[CR][CR]Rebooting will return to your original Kodi installation.[CR][CR]Go to https://forum.libreelec.tv if you require further assistance. When posting to the forum include the link to your crash log which can be viewed by clicking the crash log option in Settings > LibreELEC > System > Submit Log."
msgstr ""
msgctxt "#32395"
msgid "Firewall"
msgstr ""
msgctxt "#32396"
msgid "Custom"
msgstr ""
msgctxt "#32397"
msgid "Off"
msgstr ""
msgctxt "#32398"
msgid "Home"
msgstr ""
msgctxt "#32392"
msgid "Enable Lirc"
msgctxt "#32399"
msgid "Public"
msgstr ""
......@@ -110,8 +110,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Activer cette option affichera une notification à l'écran lorsqu'une mise à jour sera disponible"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Envoie config.txt, cmdline.txt, shutdown.sh, autostart.sh, et kodi.log à http://sprunge.us et affiche l'URL raccourcie"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Envoie config.txt, cmdline.txt, shutdown.sh, autostart.sh, et kodi.log à http://ix.io et affiche l'URL raccourcie"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -213,10 +213,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Activer cette option pour utiliser le démon cron"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Activer cette option pour utiliser le démon lirc"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -816,11 +812,3 @@ msgstr "Désactiver la mise en veille"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Le greffon des paramètres n'est pas encore prêt, veuillez ré-essayer plus tard."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Activer Lirc"
......@@ -110,8 +110,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Auf EIN stellen und eine Bildschirm-Benachrichtigung wird angezeigt, sobald eine neue Aktualisierung verfügbar ist."
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "config.txt, cmdline.txt, shutdown.sh, autostart.sh und kodi.log an http://sprunge.us übermitteln und die Kurz-URL anzeigen"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "config.txt, cmdline.txt, shutdown.sh, autostart.sh und kodi.log an http://ix.io übermitteln und die Kurz-URL anzeigen"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -213,10 +213,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Auf EIN stellen, um den Cron-Daemon zu aktivieren."
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Auf EIN stellen, um den Lirc-Daemon zu aktivieren"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -816,11 +812,3 @@ msgstr "Deaktivere Standby"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Das Einstellungs-Addon ist nicht bereit. Versuch es später erneut."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Lirc aktivieren"
......@@ -110,8 +110,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Impostare su ON per avere una notifica nel caso sia disponibile un aggiornamento"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Invia i file config.txt, cmdline.txt, shutdown.sh, autostart.sh, e kodi.log a http://sprunge.us e mostra l'URL abbreviato"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Invia i file config.txt, cmdline.txt, shutdown.sh, autostart.sh, e kodi.log a http://ix.io e mostra l'URL abbreviato"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -213,10 +213,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Impostare su ON per attivare il demone cron"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Impostare su ON per attivare il servizio lirc"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -816,11 +812,3 @@ msgstr "Disabilita standby"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "L'addon delle impostazioni non è ancora pronto. Provare più tardi."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Abilita Lirc"
......@@ -109,8 +109,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Nustatykite ĮJUNGTA ir ekrane bus rodomas pranešimas, jei prieinama nauja versija"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Nusiųskite config.txt, cmdline.txt, shutdown.sh, autostart.sh ir kodi.log į http://sprunge.us ir pateikite trumpą URL adresą"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Nusiųskite config.txt, cmdline.txt, shutdown.sh, autostart.sh ir kodi.log į http://ix.io ir pateikite trumpą URL adresą"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -212,10 +212,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Nustatykite ĮJUNGTA norėdami įjungti Cron tarnybą"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Nustatykite ĮJUNGTA norėdami įjungti lirc tarnybą"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -815,11 +811,3 @@ msgstr "Išjungti sistemos pristabdymą"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Nustatymų priedas dar neparuoštas, pamėginkite vėliau."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Įjungti Lirc"
......@@ -110,8 +110,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Sett til PÅ og en melding vil vise på skjermen når en oppdatering er tilgjengelig."
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, og kodi.log til http://sprunge.us og vis den korte URLen"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, og kodi.log til http://ix.io og vis den korte URLen"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -213,10 +213,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Sett til PÅ for å aktivere cron daemon"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Sett til PÅ for å aktivere lirc daemon"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -818,11 +814,3 @@ msgstr "Deaktiver Standby"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Innstillinger tillegget er ikke klart ennå, vennligst prøv igjen senere."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Aktiver Lirc"
......@@ -110,8 +110,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Defina como ON e uma notificação na tela será exibida quando uma nova atualização estiver disponível"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Enviar config.txt, cmdline.txt, shutdown.sh, autostart.sh, e kodi.log para http://sprunge.us e exiba a URL encurtada"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Enviar config.txt, cmdline.txt, shutdown.sh, autostart.sh, e kodi.log para http://ix.io e exiba a URL encurtada"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -213,10 +213,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Defina como ON para ativar o daemon cron"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Defina como ON para ativar o daemon lirc"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -816,11 +812,3 @@ msgstr "Desabilitar Modo de Espera"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "O addon de configurações ainda não está pronto. Tente novamente mais tarde."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Habilitar Lirc"
......@@ -109,8 +109,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "Включите, если хотите, чтобы на экране появлялись уведомления о доступности нового ПО для обновления"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Отправить config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log на сайт http://sprunge.us и показать короткую URL ссылку"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Отправить config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log на сайт http://ix.io и показать короткую URL ссылку"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -212,10 +212,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Включение службы CRON для запуска задач по расписанию"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "Включение службы lirc "
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -815,11 +811,3 @@ msgstr "Отключить режим ожидания"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Настройки дополнения ещё не готовы. Повторите попытку позже."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Включить Lirc"
......@@ -109,8 +109,8 @@ msgid "Set to ON and an on-screen notification will be displayed when a new upda
msgstr "När inställningen är PÅ kommer en notis visas när en ny uppdatering finns tillgänglig"
msgctxt "#718"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://sprunge.us and display the short URL"
msgstr "Skicka config.txt, cmdline.txt, shutdown.sh, autostart.sh, och kodi.log till http://sprunge.us och visa den korta URL:en"
msgid "Send config.txt, cmdline.txt, shutdown.sh, autostart.sh, and kodi.log to http://ix.io and display the short URL"
msgstr "Skicka config.txt, cmdline.txt, shutdown.sh, autostart.sh, och kodi.log till http://ix.io och visa den korta URL:en"
msgctxt "#720"
msgid "Set to ON and Bluetooth devices will be disabled during power-saving modes"
......@@ -212,10 +212,6 @@ msgctxt "#745"
msgid "Set to ON to enable the cron daemon"
msgstr "Välj PÅ för att aktivera Cron-tjänsten"
msgctxt "#746"
msgid "Set to ON to enable the lirc daemon"
msgstr "När inställningen är PÅ aktiveras lirc-tjänsten"
msgctxt "#750"
msgid "750"
msgstr "750"
......@@ -816,11 +812,3 @@ msgstr "Inaktivera Standby"
msgctxt "#32390"
msgid "Settings addon is not yet ready, please try again later."
msgstr "Inställnings-tillägget är inte redo, försök igen senare."
msgctxt "#32391"
msgid "Lirc"
msgstr "Lirc"
msgctxt "#32392"
msgid "Enable Lirc"
msgstr "Aktivera Lirc"
......@@ -32,7 +32,7 @@ import xbmcaddon
__scriptid__ = 'service.libreelec.settings'
__addon__ = xbmcaddon.Addon(id=__scriptid__)
__cwd__ = __addon__.getAddonInfo('path')
__media__ = '%s/resources/skins/default/media/' % __cwd__
__media__ = '%s/resources/skins/Default/media/' % __cwd__
_ = __addon__.getLocalizedString
try:
......@@ -41,4 +41,4 @@ try:
sock.send('openConfigurationWindow')
sock.close()
except Exception, e:
xbmc.executebuiltin('Notification("LibreELEC", "%s", 5000, "%sicon.png")' % (_(32390).encode('utf-8'), __media__))
xbmc.executebuiltin('Notification("LibreELEC", "%s", 5000, "%sicons/icon.png")' % (_(32390).encode('utf-8'), __media__))
......@@ -63,19 +63,20 @@ bluetooth = {
services = {
'ENABLED': True,
'KERNEL_CMD': '/proc/cmdline',
'SAMBA_NMDB': '/usr/bin/nmbd',
'SAMBA_SMDB': '/usr/bin/smbd',
'SAMBA_NMDB': '/usr/sbin/nmbd',
'SAMBA_SMDB': '/usr/sbin/smbd',
'D_SAMBA_WORKGROUP': 'WORKGROUP',
'D_SAMBA_SECURE': '0',
'D_SAMBA_USERNAME': 'libreelec',
'D_SAMBA_PASSWORD': 'libreelec',
'D_SAMBA_MINPROTOCOL': 'SMB2',
'D_SAMBA_MAXPROTOCOL': 'SMB3',
'D_SAMBA_AUTOSHARE': '1',
'SSH_DAEMON': '/usr/sbin/sshd',
'OPT_SSH_NOPASSWD': "-o 'PasswordAuthentication no'",
'D_SSH_DISABLE_PW_AUTH': '0',
'AVAHI_DAEMON': '/usr/sbin/avahi-daemon',
'CRON_DAEMON': '/sbin/crond',
'LIRCD_DAEMON': '/usr/sbin/lircd',
'LIRCD_UINPUT_DAEMON': '/usr/sbin/lircd-uinput',
}
system = {
......@@ -112,5 +113,5 @@ _services = {
'bluez': ['bluetooth.service'],
'obexd': ['obex.service'],
'crond': ['cron.service'],
'lircd': ['lircd.service', 'lircd-uinput.service'],
'iptables': ['iptables.service'],
}
......@@ -439,6 +439,11 @@ def copy_file(source, destination, silent=False):
dbg_log('oe::copy_file(' + source + ', ' + destination + ')', 'ERROR: (' + repr(e) + ')')
def is_busy():
global __busy__
return __busy__ > 0
def set_busy(state):
global __busy__, __oe__, input_request, is_service
try:
......@@ -811,6 +816,8 @@ if os.path.exists('/etc/machine-id'):
else:
SYSTEMID = os.environ.get('SYSTEMID', '')
BOOT_STATUS = load_file('/storage/.config/boot.status')
############################################################################################
try:
......
......@@ -405,6 +405,8 @@ class bluetooth:
def menu_connections(self, focusItem=None):
try:
if self.oe.is_busy():
return 0
if not hasattr(self.oe, 'winOeMain'):
return 0
if not self.oe.winOeMain.visible:
......
......@@ -2,6 +2,7 @@
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2013 Lutz Fiebach (lufie@openelec.tv)
# Copyright (C) 2017-present Team LibreELEC
#
# This program is dual-licensed; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -35,6 +36,8 @@ import xbmcgui
import threading
import oeWindows
import ConfigParser
import random
import string
####################################################################
......@@ -489,6 +492,7 @@ class connman:
ENABLED = False
CONNMAN_DAEMON = None
WAIT_CONF_FILE = None
NF_CUSTOM_PATH = "/storage/.config/iptables/"
menu = {
'2': {
'name': 32100,
......@@ -554,7 +558,7 @@ class connman:
'TetheringPassphrase': {
'order': 4,
'name': 32107,
'value': 'libreelec',
'value': ''.join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(10)),
'action': 'set_technologie',
'type': 'text',
'dbus': 'String',
......@@ -646,6 +650,14 @@ class connman:
},
'InfoText': 737,
},
'netfilter': {
'order': 3,
'name': 32395,
'type': 'multivalue',
'values': [],
'action': 'init_netfilter',
'InfoText': 771,
},
},
'order': 4,
},
......@@ -704,6 +716,26 @@ class connman:
self.struct['advanced']['settings']['wait_for_network_time']['value'] = line.split('=')[-1].lower().strip().replace('"',
'')
wait_file.close()
# IPTABLES
nf_values = [self.oe._(32397), self.oe._(32398), self.oe._(32399)]
nf_custom_rules = [self.NF_CUSTOM_PATH + "rules.v4" , self.NF_CUSTOM_PATH + "rules.v6"]
for custom_rule in nf_custom_rules:
if os.path.exists(custom_rule):
nf_values.append(self.oe._(32396))
break
self.struct['advanced']['settings']['netfilter']['values'] = nf_values
if self.oe.get_service_state('iptables') == '1':
nf_option = self.oe.get_service_option('iptables', 'RULES', 'home')
if nf_option == "custom":
nf_option_str = self.oe._(32396)
elif nf_option == "home":
nf_option_str = self.oe._(32398)
elif nf_option == "public":
nf_option_str = self.oe._(32399)
else:
nf_option_str = self.oe._(32397)
self.struct['advanced']['settings']['netfilter']['value'] = nf_option_str
self.oe.dbg_log('connman::load_values', 'exit_function', 0)
except Exception, e:
self.oe.dbg_log('connman::load_values', 'ERROR: (' + repr(e) + ')')
......@@ -1111,6 +1143,7 @@ class connman:
try:
self.oe.dbg_log('connman::start_service', 'enter_function', 0)
self.load_values()
self.init_netfilter(service=1)
self.oe.dbg_log('connman::start_service', 'exit_function', 0)
except Exception, e:
self.oe.dbg_log('connman::start_service', 'ERROR: (' + repr(e) + ')')
......@@ -1145,6 +1178,28 @@ class connman:
except Exception, e:
self.oe.dbg_log('system::set_network_wait', 'ERROR: (' + repr(e) + ')')
def init_netfilter(self, **kwargs):
try:
self.oe.dbg_log('connman::init_netfilter', 'enter_function', 0)
self.oe.set_busy(1)
if 'listItem' in kwargs:
self.set_value(kwargs['listItem'])
state = 1
options = {}
if self.struct['advanced']['settings']['netfilter']['value'] == self.oe._(32396):
options['RULES'] = "custom"
elif self.struct['advanced']['settings']['netfilter']['value'] == self.oe._(32398):
options['RULES'] = "home"
elif self.struct['advanced']['settings']['netfilter']['value'] == self.oe._(32399):
options['RULES'] = "public"
else:
state = 0
self.oe.set_service('iptables', options, state)
self.oe.set_busy(0)
self.oe.dbg_log('connman::init_netfilter', 'exit_function', 0)
except Exception, e:
self.oe.dbg_log('system::init_netfilter', 'ERROR: (' + repr(e) + ')')
def do_wizard(self):
try:
self.oe.dbg_log('connman::do_wizard', 'enter_function', 0)
......
......@@ -35,8 +35,11 @@ class services:
SAMBA_NMDB = None
SAMBA_SMDB = None
D_SAMBA_SECURE = None
D_SAMBA_WORKGROUP = None
D_SAMBA_USERNAME = None
D_SAMBA_PASSWORD = None
D_SAMBA_MINPROTOCOL = None
D_SAMBA_MAXPROTOCOL = None
D_SAMBA_AUTOSHARE = None
KERNEL_CMD = None
SSH_DAEMON = None
......@@ -44,8 +47,6 @@ class services:
OPT_SSH_NOPASSWD = None
AVAHI_DAEMON = None
CRON_DAEMON = None
LIRCD_DAEMON = None
LIRCD_UINPUT_DAEMON = None
menu = {'4': {
'name': 32001,
'menuLoader': 'load_menu',
......@@ -70,8 +71,20 @@ class services:
'type': 'bool',
'InfoText': 738,
},
'samba_secure': {
'samba_workgroup': {
'order': 2,
'name': 32215,
'value': "WORKGROUP",
'action': 'initialize_samba',
'type': 'text',
'parent': {
'entry': 'samba_autostart',
'value': ['1'],
},
'InfoText': 758,
},
'samba_secure': {
'order': 3,
'name': 32202,
'value': None,
'action': 'initialize_samba',
......@@ -83,7 +96,7 @@ class services:
'InfoText': 739,
},
'samba_username': {
'order': 3,
'order': 4,
'name': 32106,
'value': None,
'action': 'initialize_samba',
......@@ -95,7 +108,7 @@ class services:
'InfoText': 740,
},
'samba_password': {
'order': 4,
'order': 5,
'name': 32107,
'value': None,
'action': 'initialize_samba',
......@@ -106,8 +119,42 @@ class services:
},
'InfoText': 741,
},
'samba_minprotocol': {
'order': 6,
'name': 32217,
'value': 'SMB2',
'action': 'initialize_samba',
'type': 'multivalue',
'values': [
'SMB1',
'SMB2',
'SMB3',
],
'parent': {
'entry': 'samba_autostart',
'value': ['1'],
},
'InfoText': 756,
},
'samba_maxprotocol': {
'order': 7,
'name': 32218,
'value': 'SMB3',
'action': 'initialize_samba',
'type': 'multivalue',
'values': [
'SMB1',
'SMB2',
'SMB3',
],
'parent': {
'entry': 'samba_autostart',
'value': ['1'],
},
'InfoText': 757,
},
'samba_autoshare': {
'order': 5,
'order': 8,
'name': 32216,
'value': None,
'action': 'initialize_samba',
......@@ -212,21 +259,6 @@ class services:
},
},
},
'lircd': {
'order': 7,
'name': 32391,
'not_supported': [],
'settings': {
'lircd_autostart': {
'order': 1,
'name': 32392,
'value': None,
'action': 'initialize_lircd',
'type': 'bool',
'InfoText': 746,
},
},
},
}
self.oe = oeMain
......@@ -243,7 +275,6 @@ class services:
self.initialize_avahi(service=1)
self.initialize_cron(service=1)
self.init_bluetooth(service=1)
self.initialize_lircd(service=1)
self.oe.dbg_log('services::start_service', 'exit_function', 0)
except Exception, e:
self.oe.dbg_log('services::start_service', 'ERROR: (%s)' % repr(e))
......@@ -287,12 +318,18 @@ class services:
if os.path.isfile(self.SAMBA_NMDB) and os.path.isfile(self.SAMBA_SMDB):
self.struct['samba']['settings']['samba_autostart']['value'] = self.oe.get_service_state('samba')
self.struct['samba']['settings']['samba_workgroup']['value'] = self.oe.get_service_option('samba', 'SAMBA_WORKGROUP',
self.D_SAMBA_WORKGROUP).replace('"', '')
self.struct['samba']['settings']['samba_secure']['value'] = self.oe.get_service_option('samba', 'SAMBA_SECURE',
self.D_SAMBA_SECURE).replace('true', '1').replace('false', '0').replace('"', '')
self.struct['samba']['settings']['samba_username']['value'] = self.oe.get_service_option('samba', 'SAMBA_USERNAME',
self.D_SAMBA_USERNAME).replace('"', '')
self.struct['samba']['settings']['samba_password']['value'] = self.oe.get_service_option('samba', 'SAMBA_PASSWORD',
self.D_SAMBA_PASSWORD).replace('"', '')
self.struct['samba']['settings']['samba_minprotocol']['value'] = self.oe.get_service_option('samba', 'SAMBA_MINPROTOCOL',
self.D_SAMBA_MINPROTOCOL).replace('"', '')
self.struct['samba']['settings']['samba_maxprotocol']['value'] = self.oe.get_service_option('samba', 'SAMBA_MAXPROTOCOL',
self.D_SAMBA_MAXPROTOCOL).replace('"', '')
self.struct['samba']['settings']['samba_autoshare']['value'] = self.oe.get_service_option('samba', 'SAMBA_AUTOSHARE',
self.D_SAMBA_AUTOSHARE).replace('true', '1').replace('false', '0').replace('"', '')
else:
......@@ -345,13 +382,6 @@ class services:
else:
self.struct['bluez']['hidden'] = 'true'
# LIRCD
if os.path.isfile(self.LIRCD_DAEMON) and os.path.isfile(self.LIRCD_UINPUT_DAEMON):
self.struct['lircd']['settings']['lircd_autostart']['value'] = self.oe.get_service_state('lircd')
else:
self.struct['lircd']['hidden'] = 'true'
self.oe.dbg_log('services::load_values', 'exit_function', 0)
except Exception, e:
self.oe.dbg_log('services::load_values', 'ERROR: (%s)' % repr(e))
......@@ -377,8 +407,11 @@ class services:
val_autoshare = 'true'
else:
val_autoshare = 'false'
options['SAMBA_WORKGROUP'] = '"%s"' % self.struct['samba']['settings']['samba_workgroup']['value']
options['SAMBA_SECURE'] = '"%s"' % val_secure
options['SAMBA_AUTOSHARE'] = '"%s"' % val_autoshare
options['SAMBA_MINPROTOCOL'] = '"%s"' % self.struct['samba']['settings']['samba_minprotocol']['value']
options['SAMBA_MAXPROTOCOL'] = '"%s"' % self.struct['samba']['settings']['samba_maxprotocol']['value']
options['SAMBA_USERNAME'] = '"%s"' % self.struct['samba']['settings']['samba_username']['value']
options['SAMBA_PASSWORD'] = '"%s"' % self.struct['samba']['settings']['samba_password']['value']
else:
......@@ -494,23 +527,6 @@ class services:
self.oe.set_busy(0)
self.oe.dbg_log('services::init_obex', 'ERROR: (' + repr(e) + ')', 4)
def initialize_lircd(self, **kwargs):
try:
self.oe.dbg_log('services::inititialize_lircd', 'enter_function', 0)
self.oe.set_busy(1)
if 'listItem' in kwargs:
self.set_value(kwargs['listItem'])
state = 1
options = {}
if self.struct['lircd']['settings']['lircd_autostart']['value'] != '1':
state = 0
self.oe.set_service('lircd', options, state)
self.oe.set_busy(0)
self.oe.dbg_log('services::inititialize_lircd', 'exit_function', 0)
except Exception, e:
self.oe.set_busy(0)
self.oe.dbg_log('services::inititialize_lircd', 'ERROR: (' + repr(e) + ')', 4)
def exit(self):
try:
self.oe.dbg_log('services::exit', 'enter_function', 0)
......
This diff is collapsed.
......@@ -495,8 +495,12 @@ class wizard(xbmcgui.WindowXMLDialog):
self.getControl(self.buttons[4]['id']).setVisible(False)
self.getControl(self.radiobuttons[1]['id']).setVisible(False)
self.getControl(self.radiobuttons[2]['id']).setVisible(False)
self.set_wizard_title(self.oe._(32301).encode('utf-8'))
self.set_wizard_text(self.oe._(32302).encode('utf-8'))
if self.oe.BOOT_STATUS == "SAFE":
self.set_wizard_title("[COLOR red][B]%s[/B][/COLOR]" % self.oe._(32393).encode('utf-8'))
self.set_wizard_text(self.oe._(32394).encode('utf-8'))
else:
self.set_wizard_title(self.oe._(32301).encode('utf-8'))
self.set_wizard_text(self.oe._(32302).encode('utf-8'))
self.showButton(1, 32303)
self.setFocusId(self.buttons[1]['id'])
except Exception, e:
......@@ -635,6 +639,7 @@ class wizard(xbmcgui.WindowXMLDialog):
self.is_last_wizard = False
break
if self.is_last_wizard == True:
xbmc.executebuiltin('UpdateAddonRepos')
self.oe.write_setting('libreelec', 'wizard_completed', 'True')
self.close()
self.oe.dbg_log('wizard::onClick(' + unicode(controlID) + ')', 'exit_function', 0)
......