From 69ed4e9ad48bd6362f26c3dba0025d2edcd1c27a Mon Sep 17 00:00:00 2001 From: koivo Date: Sun, 14 Oct 2018 09:59:33 +0200 Subject: [PATCH] [softwaremanager] some visual improvements --- .../SystemPlugins/SoftwareManager/plugin.py | 32 +++++++++---------- po/de.po | 22 +++++++++---- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py index 201f9f3422..7a214f7604 100644 --- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py @@ -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) @@ -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) diff --git a/po/de.po b/po/de.po index 1d5a08e9e7..9b00b927d5 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ 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 \n" "Language-Team: openHDF\n" "Language: de\n" @@ -13,7 +13,7 @@ msgstr "" "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..." @@ -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" @@ -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" @@ -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"