Skip to content

Commit

Permalink
[softwaremanager] some visual improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@koivo
koivo committed Oct 14, 2018
1 parent 58632f0 commit 69ed4e9
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 23 deletions.
32 changes: 16 additions & 16 deletions lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
View file
Expand Up @@ -201,15 +201,15 @@ def __init__(self, session, args = 0):
self.backupdirs = ' '.join( config.plugins.configurationbackup.backupdirs.value )
if self.menu == 0:
print "building menu entries"
self.list.append(("software-update", _("Software update"), _("\nOnline update of your %s %s software.") % (getMachineBrand(), getMachineName()) + self.oktext, None))
self.list.append(("software-restore", _("Software restore"), _("\nRestore your %s %s with a new firmware.") % (getMachineBrand(), getMachineName()) + self.oktext, None))
self.list.append(("install-extensions", _("Manage extensions"), _("\nManage extensions or plugins for your %s %s") % (getMachineBrand(), getMachineName()) + self.oktext, None))
self.list.append(("backup-image", _("Image Full-Backup"), _("\nBackup your running %s %s image to HDD or USB.") % (getMachineBrand(), getMachineName()) + self.oktext, None))
self.list.append(("software-update", _("Software update"), _("\nOnline update of your %s %s software.") % (getMachineBrand(), getMachineName()) + "\n" + self.oktext, None))
self.list.append(("software-restore", _("Software restore"), _("\nRestore your %s %s with a new firmware.") % (getMachineBrand(), getMachineName()) + "\n" + self.oktext, None))
self.list.append(("install-extensions", _("Manage extensions"), _("\nManage extensions or plugins for your %s %s") % (getMachineBrand(), getMachineName()) + "\n" + self.oktext, None))
self.list.append(("backup-image", _("Image Full-Backup"), _("\nBackup your running %s %s image to HDD or USB.") % (getMachineBrand(), getMachineName()) + "\n" + self.oktext, None))
if not boxtype.startswith('az') and not boxtype in ('dm500hd','dm500hdv2','dm900','dm800','dm800se','dm800sev2','dm7020hd','dm7020hdv2','dm8000') and not brandoem.startswith('cube') and not brandoem.startswith('wetek'):
self.list.append(("flash-online", _("Image Online-Flash"), _("\nFlash on the fly your %s %s.") % (getMachineBrand(), getMachineName()) + self.oktext, None))
self.list.append(("system-backup", _("Backup system settings"), _("\nBackup your %s %s settings.") % (getMachineBrand(), getMachineName()) + self.oktext + "\n\n" + self.infotext, None))
self.list.append(("system-restore",_("Restore system settings"), _("\nRestore your %s %s settings.") % (getMachineBrand(), getMachineName()) + self.oktext, None))
self.list.append(("ipkg-install", _("Install local extension"), _("\nScan for local extensions and install them.") + self.oktext, None))
self.list.append(("flash-online", _("Image Online-Flash"), _("\nFlash on the fly your %s %s.") % (getMachineBrand(), getMachineName()) + "\n" + self.oktext, None))
self.list.append(("system-backup", _("Backup system settings"), _("\nBackup your %s %s settings.") % (getMachineBrand(), getMachineName()) + "\n" + self.oktext, None))
self.list.append(("system-restore",_("Restore system settings"), _("\nRestore your %s %s settings.") % (getMachineBrand(), getMachineName()) + "\n" + self.oktext, None))
self.list.append(("ipkg-install", _("Install local extension"), _("\nScan for local extensions and install them.") + "\n" + self.oktext, None))
for p in plugins.getPlugins(PluginDescriptor.WHERE_SOFTWAREMANAGER):
if p.__call__.has_key("SoftwareSupported"):
callFnc = p.__call__["SoftwareSupported"](None)
Expand All @@ -224,16 +224,16 @@ def __init__(self, session, args = 0):
menuEntryDescription = _('Extended Software Plugin')
self.list.append(('default-plugin', menuEntryName, menuEntryDescription + self.oktext, callFnc))
if config.usage.setup_level.index >= 2: # expert+
self.list.append(("advanced", _("Advanced options"), _("\nAdvanced options and settings." ) + self.oktext, None))
self.list.append(("advanced", _("Advanced options"), _("\nAdvanced options and settings." ) + "\n" + self.oktext, None))
elif self.menu == 1:
self.list.append(("advancedrestore", _("Advanced restore"), _("\nRestore your backups by date." ) + self.oktext, None))
self.list.append(("backuplocation", _("Select backup location"), _("\nSelect your backup device.\nCurrent device: " ) + config.plugins.configurationbackup.backuplocation.value + self.oktext, None))
self.list.append(("backupfiles", _("Select backup files"), _("Select files for backup.") + self.oktext + "\n\n" + self.infotext, None))
self.list.append(("resetbackupfiles",_("Set backupfiles to defaults"), _("\nReset selection of files for backup to default." ) + self.oktext, None))
self.list.append(("autorestorebackup",_("Restore settings backup after restart"), _("\nRestore automatically your saved settings after Enigma restart." ) + self.oktext, None))
self.list.append(("advancedrestore", _("Advanced restore"), _("\nRestore your backups by date." ) + "\n" + self.oktext, None))
self.list.append(("backuplocation", _("Select backup location"), _("\nSelect your backup device.\nCurrent device: " ) + config.plugins.configurationbackup.backuplocation.value + "\n" + self.oktext, None))
self.list.append(("backupfiles", _("Select backup files"), _("\nSelect files for backup.") + "\n" + self.oktext, None))
self.list.append(("resetbackupfiles",_("Set backupfiles to defaults"), _("\nReset selection of files for backup to default." ) + "\n" + self.oktext, None))
self.list.append(("autorestorebackup",_("Restore settings backup after restart"), _("\nRestore automatically your saved settings after Enigma restart.\nWhen selected, the last backup of the settings for the box is used.\nWhen restarting Enigma2, a restore will be displayed on the screen." ) + "\n" + self.oktext, None))
if config.usage.setup_level.index >= 2: # expert+
self.list.append(("ipkg-manager", _("Packet management"), _("\nView, install and remove available or installed packages." ) + self.oktext, None))
self.list.append(("ipkg-source",_("Select upgrade source"), _("\nEdit the upgrade source address." ) + self.oktext, None))
self.list.append(("ipkg-manager", _("Packet management"), _("\nView, install and remove available or installed packages." ) + "\n" + self.oktext, None))
self.list.append(("ipkg-source",_("Select upgrade source"), _("\nEdit the upgrade source address." ) + "\n" + self.oktext, None))
for p in plugins.getPlugins(PluginDescriptor.WHERE_SOFTWAREMANAGER):
if p.__call__.has_key("AdvancedSoftwareSupported"):
callFnc = p.__call__["AdvancedSoftwareSupported"](None)
Expand Down
22 changes: 15 additions & 7 deletions po/de.po
View file
Expand Up @@ -5,15 +5,15 @@ msgstr ""
"Project-Id-Version: tuxbox-enigma 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-19 23:44+0100\n"
"PO-Revision-Date: 2018-10-13 20:06+0200\n"
"PO-Revision-Date: 2018-10-14 09:57+0200\n"
"Last-Translator: Koivo <koivo@hdfreaks.cc>\n"
"Language-Team: openHDF\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.1.1\n"
"X-Generator: Poedit 2.2\n"
"X-Poedit-SourceCharset: UTF-8\n"

msgid "Welcome..."
Expand Down Expand Up @@ -2121,7 +2121,7 @@ msgid "Set backupfiles to defaults"
msgstr "Zurücksetzen der Dateien"

msgid "Restore settings backup after restart"
msgstr "Automatische Wiederherstellung"
msgstr "Automatische Wiederherstellung der eigenen Settings"

msgid "Restore after Restart Enigma"
msgstr "Wiederherstellung nach Enigma Neustart"
Expand All @@ -2134,10 +2134,14 @@ msgstr "Sollen die gesicherten Einstellungen nach einem Neustart automatisch wie

msgid ""
"\n"
"Restore automatically your saved settings after Enigma restart."
"Restore automatically your saved settings after Enigma restart.\n"
"When selected, the last backup of the settings for the box is used.\n"
"When restarting Enigma2, a restore will be displayed on the screen."
msgstr ""
"\n"
"Automatisches Wiederherstellen der gesicherten Settings nach einem Enigma Neustart."
"Automatisches Wiederherstellen der gesicherten Einstellungen nach einem Enigma Neustart.\n"
"Bei Auswahl wird die letzte Sicherung der Einstellungen für diese Box benutzt.\n"
"Bei einem Enigma2 Neustart wird dann ein Restore auf dem Bildschirm angezeigt."

msgid ""
"\n"
Expand Down Expand Up @@ -8433,8 +8437,12 @@ msgstr "Wähle Image vom Feed-Server"
msgid "Select destination for:"
msgstr "Wähle Ziel für:"

msgid "Select files for backup."
msgstr "Wähle Dateien zum sichern."
msgid ""
"\n"
"Select files for backup."
msgstr ""
"\n"
"Wähle Dateien zum sichern."

msgid "Select files/folders to backup"
msgstr "Wähle Dateien/Ordner für die Sicherung"
Expand Down

0 comments on commit 69ed4e9

Please sign in to comment.