Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Developer' into Release
Browse files Browse the repository at this point in the history
  • Loading branch information
Huevos committed Mar 3, 2025
2 parents c2de6a0 + f769531 commit fb6491f
Show file tree
Hide file tree
Showing 6 changed files with 274 additions and 54 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -1402,3 +1402,5 @@ openvix: developer 6.7.003.002
openvix: developer 6.7.003.003
openvix: developer 6.7.003.004
openvix: developer 6.7.004.001
openvix: developer 6.7.005.001
openvix: developer 6.7.005.002
4 changes: 2 additions & 2 deletions lib/python/Components/Harddisk.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def addInstallTask(job, package):
task = Components.Task.LoggingTask(job, _("Update packages..."))
task.setTool("opkg")
task.args.append("update")
task = Components.Task.LoggingTask(job, _(f"Install '{package}'"))
task = Components.Task.LoggingTask(job, _("Install '%s'") % package)
task.setTool("opkg")
task.args.append("install")
task.args.append(package)
Expand Down Expand Up @@ -868,7 +868,7 @@ def getUserfriendlyDeviceName(self, device, physicalDevice):
description = readFile(ospath.join(physicalDevice, "name"))
if description is None:
# print(f"[Harddisk][getUserfriendlyDeviceName] Error: Couldn't read harddisk model on '{device}' ('{physicalDevice}')!")
description = _(f"Device {dev}")
description = _("Device %s") % dev
if part: # and part != 1: # Not wholedisk and not partition 1.
description = "%s %s" % (description, _("(Partition %d)") % part)
return description
Expand Down
3 changes: 2 additions & 1 deletion lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ def processAddDevice(self):
if DEVPATH.startswith(physdevprefix):
description = _(pdescription)

text = f"{_("A new storage device has been connected:")}\n{ID_MODEL} - ({bytesToHumanReadable(ID_PART_ENTRY_SIZE * 512)})\n{description}"
text = _("A new storage device has been connected:")
text = f"{text}\n{ID_MODEL} - ({bytesToHumanReadable(ID_PART_ENTRY_SIZE * 512)})\n{description}"

def newDeviceCallback(answer):
if answer:
Expand Down
99 changes: 86 additions & 13 deletions po/enigma2.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-01-07 19:53+0100\n"
"POT-Creation-Date: 2025-03-03 12:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -1471,6 +1471,9 @@ msgstr ""
msgid "A highlight on the remote control image shows which button the help refers to. If more than one button performs the indicated function, more than one highlight will be shown. Text below the list indicates whether the function is for a long press of the button(s)."
msgstr ""

msgid "A new storage device has been connected:"
msgstr ""

#, python-format
msgid ""
"A recording has been started:\n"
Expand Down Expand Up @@ -5622,6 +5625,15 @@ msgstr ""
msgid "From:"
msgstr ""

msgid "Front USB"
msgstr ""

msgid "Front USB 3.0"
msgstr ""

msgid "Front panel USB"
msgstr ""

msgid "Full factory reset"
msgstr ""

Expand Down Expand Up @@ -7122,6 +7134,9 @@ msgstr ""
msgid "Loop through from"
msgstr ""

msgid "Lower USB"
msgstr ""

msgid "Lower case"
msgstr ""

Expand Down Expand Up @@ -7357,6 +7372,9 @@ msgstr ""
msgid "Mexico"
msgstr ""

msgid "MicroSD"
msgstr ""

msgid "Micronesia (Federated States of)"
msgstr ""

Expand Down Expand Up @@ -9599,6 +9617,36 @@ msgstr ""
msgid "Really upgrade your %s %s and reboot now?"
msgstr ""

msgid "Rear Left USB"
msgstr ""

msgid "Rear Left USB 3.0"
msgstr ""

msgid "Rear Lower USB"
msgstr ""

msgid "Rear Lower USB 3.0"
msgstr ""

msgid "Rear MicroSD"
msgstr ""

msgid "Rear Right USB"
msgstr ""

msgid "Rear USB"
msgstr ""

msgid "Rear USB-C"
msgstr ""

msgid "Rear Upper USB"
msgstr ""

msgid "Rear Upper USB 3.0"
msgstr ""

msgid "Reboot"
msgstr ""

Expand Down Expand Up @@ -9767,6 +9815,10 @@ msgstr ""
msgid "Remote control type"
msgstr ""

#, python-format
msgid "Remote:\t%s\n"
msgstr ""

msgid "Removal has completed."
msgstr ""

Expand Down Expand Up @@ -10179,6 +10231,9 @@ msgstr ""
msgid "SAT"
msgstr ""

msgid "SATA"
msgstr ""

msgid "SCPC optimized search range"
msgstr ""

Expand All @@ -10194,6 +10249,9 @@ msgstr ""
msgid "SCREEN"
msgstr ""

msgid "SD"
msgstr ""

msgid "SDCARD"
msgstr ""

Expand Down Expand Up @@ -11687,9 +11745,6 @@ msgstr ""
msgid "Sorry your uShare config is missing"
msgstr ""

msgid "Sorry, but the file is not compatible with this image version."
msgstr ""

msgid "Sorry, but the restore failed."
msgstr ""

Expand Down Expand Up @@ -13346,6 +13401,9 @@ msgstr ""
msgid "Upon completion the receiver will reboot and display the First Install Wizard."
msgstr ""

msgid "Upper USB"
msgstr ""

msgid "Upper case"
msgstr ""

Expand Down Expand Up @@ -13757,6 +13815,9 @@ msgstr ""
msgid "Waiting"
msgstr ""

msgid "Waiting for mount"
msgstr ""

msgid "Waiting for mount."
msgstr ""

Expand Down Expand Up @@ -14709,6 +14770,9 @@ msgstr ""
msgid "eMMC"
msgstr ""

msgid "eSATA"
msgstr ""

msgid "east"
msgstr ""

Expand Down Expand Up @@ -16075,6 +16139,9 @@ msgstr ""
msgid "Alignment of timeline date"
msgstr ""

msgid "Allow CEC address change *"
msgstr ""

msgid "Allow fast skin reload"
msgstr ""

Expand All @@ -16090,6 +16157,9 @@ msgstr ""
msgid "Allow unstable (experimental) updates"
msgstr ""

msgid "Allows swapping between oe-alliance/branding or oe-alliance/remotes for button position mapping and rc graphic."
msgstr ""

msgid "Allows the %s %s to load the saved EPG data regularly."
msgstr ""

Expand Down Expand Up @@ -16231,6 +16301,12 @@ msgstr ""
msgid "Broadcasters sometimes split long event names into the event description using ... Choose whether to prevent this behaviour."
msgstr ""

msgid "CEC address *"
msgstr ""

msgid "CEC address, to override enable CEC address change. *Reboot required to activate"
msgstr ""

msgid "Can be used for different fps between external subtitles and video."
msgstr ""

Expand Down Expand Up @@ -16825,6 +16901,9 @@ msgstr ""
msgid "Enable to highlight events that are currently in progress."
msgstr ""

msgid "Enabled *"
msgstr ""

msgid "Enigma2 debug level."
msgstr ""

Expand Down Expand Up @@ -16876,9 +16955,6 @@ msgstr ""
msgid "Finetune"
msgstr ""

msgid "Fix CEC address setting, default is 1.0.0.0"
msgstr ""

msgid "Font size"
msgstr ""

Expand Down Expand Up @@ -17056,9 +17132,6 @@ msgstr ""
msgid "Ignore DVB-T namespace sub network"
msgstr ""

msgid "In Developer images only. Allows swapping between oe-alliance/branding or oe-alliance/remotes for button position mapping and rc graphic."
msgstr ""

msgid "In Setup screens choose whether to show the default value of the selected item in the description field."
msgstr ""

Expand Down Expand Up @@ -17587,9 +17660,6 @@ msgstr ""
msgid "Set end time"
msgstr ""

msgid "Set fixed CEC address"
msgstr ""

msgid "Set fps for external subtitles"
msgstr ""

Expand Down Expand Up @@ -18304,6 +18374,9 @@ msgstr ""
msgid "When enabled the set top box is able to wakeup on LAN"
msgstr ""

msgid "When enabled will allow CEC address change. *Reboot required to activate"
msgstr ""

msgid "When enabled, AIT data will be included in http streams. This allows a client receiver to use HbbTV."
msgstr ""

Expand Down
Loading

0 comments on commit fb6491f

Please sign in to comment.