mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

settings_manager & locale rework , thx svenhoefer

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2121 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2012-02-24 20:59:51 +00:00
parent e48d50efe3
commit 1b0114e523
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/locale/deutsch.locale
View File

@@ -341,7 +341,7 @@ extra.key_timeshift Timeshift
extra.key_unlock Entsperrtaste extra.key_unlock Entsperrtaste
extra.ladirection Breitengrad-Ausrichtung extra.ladirection Breitengrad-Ausrichtung
extra.latitude Breitengrad extra.latitude Breitengrad
extra.loadconfig Lade Einstellungen von extra.loadconfig Neutrino-Einstellungen: Laden von
extra.loadkeys Lade Tastenbelegung von extra.loadkeys Lade Tastenbelegung von
extra.lodirection Längengrad-Ausrichtung extra.lodirection Längengrad-Ausrichtung
extra.logo Logonummer extra.logo Logonummer
@@ -353,7 +353,7 @@ extra.rotor_swap Rotor dreht Ost/West
extra.rounded_corners Eckendarstellung extra.rounded_corners Eckendarstellung
extra.rounded_corners_off eckig extra.rounded_corners_off eckig
extra.rounded_corners_on abgerundet extra.rounded_corners_on abgerundet
extra.saveconfig Speichere Einstellungen als extra.saveconfig Neutrino-Einstellungen: Sichern als
extra.savekeys Speichere Tastenbelegung als extra.savekeys Speichere Tastenbelegung als
extra.scan_fast Schnell extra.scan_fast Schnell
extra.scan_full Total extra.scan_full Total
@@ -1211,7 +1211,7 @@ servicemenu.restart_hint Neutrino wird neu gestartet...
servicemenu.restart_refused_recording Aufnahme läuft. Neustart nicht möglich. servicemenu.restart_refused_recording Aufnahme läuft. Neustart nicht möglich.
servicemenu.scants Kanalsuche servicemenu.scants Kanalsuche
servicemenu.update Software-Aktualisierung servicemenu.update Software-Aktualisierung
settings.backup Alle Settings sichern settings.backup Image-Einstellungen: Sichern
settings.backup_failed Sicherung fehlgeschlagen! settings.backup_failed Sicherung fehlgeschlagen!
settings.help Hilfe settings.help Hilfe
settings.menu_pos Menüposition settings.menu_pos Menüposition
@@ -1223,7 +1223,7 @@ settings.pos_default_center oben Mitte
settings.pos_higher_center unten Mitte settings.pos_higher_center unten Mitte
settings.pos_top_left oben links settings.pos_top_left oben links
settings.pos_top_right oben rechts settings.pos_top_right oben rechts
settings.restore Wiederherstellen aller Settings settings.restore Image-Einstellungen: Wiederherstellen
settings.restore_warn Alle Settings werden ersetzt.\nDie Box wird neu gestartet.\nWeiter? settings.restore_warn Alle Settings werden ersetzt.\nDie Box wird neu gestartet.\nWeiter?
shutdown.recoding_query Aufnahme läuft. Trotzdem beenden? shutdown.recoding_query Aufnahme läuft. Trotzdem beenden?
shutdowntimer.announce Die Box wird in 1 Min. heruntergefahren.\nShutdown abbrechen? shutdowntimer.announce Die Box wird in 1 Min. heruntergefahren.\nShutdown abbrechen?

8
data/locale/english.locale
View File

@@ -341,7 +341,7 @@ extra.key_timeshift Timeshift
extra.key_unlock Unlock key extra.key_unlock Unlock key
extra.ladirection LaDirection extra.ladirection LaDirection
extra.latitude Latitude extra.latitude Latitude
extra.loadconfig Load settings from extra.loadconfig Neutrino-Settings: Load from
extra.loadkeys Load keys from extra.loadkeys Load keys from
extra.lodirection LoDirection extra.lodirection LoDirection
extra.logo Logo number extra.logo Logo number
@@ -353,7 +353,7 @@ extra.rotor_swap Swap rotor east/west
extra.rounded_corners Shape of corners extra.rounded_corners Shape of corners
extra.rounded_corners_off angular extra.rounded_corners_off angular
extra.rounded_corners_on rounded extra.rounded_corners_on rounded
extra.saveconfig Save settings as extra.saveconfig Neutrino-Settings: Save as
extra.savekeys Save keys as extra.savekeys Save keys as
extra.scan_fast Fast extra.scan_fast Fast
extra.scan_full Full extra.scan_full Full
@@ -1211,7 +1211,7 @@ servicemenu.restart_hint Restarting, please wait
servicemenu.restart_refused_recording Cant restart, recording in progress servicemenu.restart_refused_recording Cant restart, recording in progress
servicemenu.scants Servicescan servicemenu.scants Servicescan
servicemenu.update Software Update servicemenu.update Software Update
settings.backup Backup all settings settings.backup Image-Settings: Backup
settings.backup_failed Backup failed! settings.backup_failed Backup failed!
settings.help Help settings.help Help
settings.menu_pos Menu position settings.menu_pos Menu position
@@ -1223,7 +1223,7 @@ settings.pos_default_center top center
settings.pos_higher_center higher center settings.pos_higher_center higher center
settings.pos_top_left top left settings.pos_top_left top left
settings.pos_top_right top right settings.pos_top_right top right
settings.restore Restore all settings settings.restore Image-Settings: Restore
settings.restore_warn This will replace all settings and reboot\nContinue ? settings.restore_warn This will replace all settings and reboot\nContinue ?
shutdown.recoding_query You really want to to stop record ? shutdown.recoding_query You really want to to stop record ?
shutdowntimer.announce Box will shutdown in 1 min.\nCancel Shutdown ? shutdowntimer.announce Box will shutdown in 1 min.\nCancel Shutdown ?

5
data/scripts/backup.sh
View File

@@ -5,9 +5,10 @@ USRF="/var/tuxbox/config/tobackup.conf"
if [ -e "${USRF}" ]; then if [ -e "${USRF}" ]; then
# read user-files from $USRF # read user-files from $USRF
TOBACKUP="${USRF}"
while read i while read i
do [ "${i:0:1}" = "#" ] || TOBACKUP="$TOBACKUP ${i%%#*}" do [ "${i:0:1}" = "#" ] || TOBACKUP="$TOBACKUP ${i%%#*}"
done < $USRF done < $USRF
else else
TOBACKUP="/var/tuxbox/config/" TOBACKUP="/var/tuxbox/config/"

4
src/gui/settings_manager.cpp
View File

@@ -152,8 +152,8 @@ int CSettingsManager::showMenu()
mset->addItem(new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall));// FIXME: RC-button RECALL is broken mset->addItem(new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall));// FIXME: RC-button RECALL is broken
mset->addItem(GenericMenuSeparatorLine); mset->addItem(GenericMenuSeparatorLine);
mset->addItem(new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); mset->addItem(new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
mset->addItem(new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); mset->addItem(new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
mset->addItem(GenericMenuSeparatorLine); mset->addItem(GenericMenuSeparatorLine);
mset->addItem(new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); mset->addItem(new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
mset->addItem(new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); mset->addItem(new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));