diff --git a/ChangeLog b/ChangeLog index 573538102c5..7f92e91db61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1227,3 +1227,4 @@ openvix: developer 6.4.011.006 openvix: developer 6.4.011.007 openvix: developer 6.4.011.008 openvix: developer 6.4.011.009 +openvix: developer 6.4.011.010 diff --git a/lib/python/Components/SystemInfo.py b/lib/python/Components/SystemInfo.py index 3802b628dd2..21ba0d6c116 100644 --- a/lib/python/Components/SystemInfo.py +++ b/lib/python/Components/SystemInfo.py @@ -9,8 +9,6 @@ from Tools.Directories import fileCheck, fileExists, fileHas, pathExists, resolveFilename, SCOPE_LIBDIR, SCOPE_SKIN, fileReadLines from Tools.HardwareInfo import HardwareInfo -SystemInfo = {} - class BoxInformation: def __init__(self, root=""): @@ -31,8 +29,6 @@ def __init__(self, root=""): self.setItem(item, self.processValue(value), immutable=True) if self.boxInfo["checksumerror"]: print("[BoxInfo] Data integrity of %s could not be verified." % file) - # else: - # print("[SystemInfo] Enigma information file data loaded into BoxInfo.") else: print("[BoxInfo] ERROR: %s is not available! The system is unlikely to boot or operate correctly." % file) @@ -60,8 +56,6 @@ def getItemsList(self): def getItem(self, item, default=None): if item in self.boxInfo: return self.boxInfo[item] - elif item in SystemInfo: - return SystemInfo[item] return default def setItem(self, item, value, immutable=False, forceOverride=False): @@ -71,7 +65,6 @@ def setItem(self, item, value, immutable=False, forceOverride=False): if immutable and item not in self.immutableList: self.immutableList.append(item) self.boxInfo[item] = value - SystemInfo[item] = value return True def deleteItem(self, item, forceOverride=False): @@ -86,6 +79,9 @@ def deleteItem(self, item, forceOverride=False): BoxInfo = BoxInformation() +SystemInfo = BoxInfo.boxInfo + + ARCHITECTURE = BoxInfo.getItem("architecture") BRAND = BoxInfo.getItem("brand") MODEL = BoxInfo.getItem("model") diff --git a/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py b/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py index 938f86c22a6..8b78472163c 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py +++ b/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py @@ -61,7 +61,7 @@ def __onPartitionChange(*args, **kwargs): config.imagemanager.autosettingsbackup = ConfigYesNo(default=True) choices = getMountChoices() config.imagemanager.backuplocation = ConfigSelection(choices=choices, default=getMountDefault(choices)) -config.imagemanager.extensive_location_search = ConfigYesNo(default=True) +config.imagemanager.extensive_location_search = ConfigYesNo(default=False) harddiskmanager.on_partition_list_change.append(__onPartitionChange) # to update backuplocation choices on mountpoint change config.imagemanager.backupretry = ConfigNumber(default=30) config.imagemanager.backupretrycount = NoSave(ConfigNumber(default=0)) diff --git a/lib/python/Tools/Multiboot.py b/lib/python/Tools/Multiboot.py index 14f1fd7be89..d866c109be6 100644 --- a/lib/python/Tools/Multiboot.py +++ b/lib/python/Tools/Multiboot.py @@ -219,7 +219,7 @@ def createInfo(slot, imagedir="/"): BuildVer = BoxInfo.getItem("imagebuild") BuildDate = VerDate(imagedir) BuildDev = str(BoxInfo.getItem("imagedevbuild")).zfill(3) if BuildType != "rel" else "" - return "%s %s %s %s %s (%s)" % (Creator, BuildImgVersion, BuildType, BuildVer, BuildDev, BuildDate) + return " ".join([x for x in (Creator, BuildImgVersion, BuildType, BuildVer, BuildDev, "(%s)" % BuildDate) if x]) def VerDate(imagedir): diff --git a/po/fi.po b/po/fi.po index bf9fcf37e74..1059311cad3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: enigma2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-27 23:35+0000\n" -"PO-Revision-Date: 2023-12-18 06:59+0200\n" +"PO-Revision-Date: 2024-01-02 19:16+0200\n" "Last-Translator: Orlandox\n" "Language-Team: timoj/Kojo/Samzam/Orlandox\n" "Language: fi\n" @@ -13543,7 +13543,7 @@ msgstr "" "Suomenkielinen käännös: timoj, Kojo, Samzam, Orlandox\n" "\n" "Ylläpito : Orlandox\n" -"18.12.2023\n" +"02.01.2024\n" "http://www.huoltovalikko.com" msgid "TS file is too large for ISO9660 level 1!" @@ -19174,3 +19174,18 @@ msgstr "Sref + striimin url" msgid "Playback" msgstr "Toisto" + +msgid "Extensive search" +msgstr "Laaja haku" + +msgid "Locations searched when creating the images list. Select 'yes' to search all likely locations on your system where images may be located. Select 'no' to limit the search to just the user selected backup location." +msgstr "Sijainnit, joita haetaan imageiden listaa luotaessa. Valitse 'kyllä', jos haluat etsiä järjestelmästäsi kaikista mahdollisista paikoista, joissa imaget saattavat sijaita. Valitse 'ei', jos haluat rajoittaa haun vain käyttäjän valitsemaan varmuuskopiointipaikkaan." + +msgid "Allows you to give your image filename a custom prefix." +msgstr "Voit antaa imagen tiedostonimelle mukautetun etuliitteen." + +msgid "Homebuild URL" +msgstr "Itse luodun imagen URL" + +msgid "If you are running your own build server and want to download your own images directly into ImageManager you can link to the URL of your JSON index. Don't forget to add '%s' where the box name should be inserted into the url. If you need help with implementing this please ask on the forum." +msgstr "Jos käytät omaa koontipalvelinta ja haluat ladata omat imagesi suoraan Imagen Hallinnointiin, voit linkittää JSON-hakemistosi URL-osoitteeseen. Älä unohda lisätä '%s', johon boksin nimi tulee lisätä URL-osoitteeseen. Jos tarvitset apua tämän toteuttamisessa, kysy foorumilta."