From 3c0c5d594a4efcb778b662ba1706b8b10f3b27e7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 19 Nov 2016 21:30:53 +0100 Subject: [PATCH] re-add our welcome message to vfd; we're NI \o/ Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9d5fb8ee3fb110b1dc1044278da707a1e326b05b Author: vanhofen Date: 2016-11-19 (Sat, 19 Nov 2016) Origin message was: ------------------ - re-add our welcome message to vfd; we're NI \o/ ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 3 ++- data/locale/english.locale | 3 ++- src/neutrino.cpp | 2 +- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 647dbb45b..e9b9a23a3 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2070,7 +2070,7 @@ networkmenu.ssid_scan WLAN-Netzwerke suchen networkmenu.ssid_scan_error Keine WLAN-Netzwerke gefunden. networkmenu.ssid_scan_wait WLAN-Netzwerke werden gesucht... networkmenu.test Netzwerk testen -neutrino_starting NI \o/ +neutrino_starting %s %s wird gestartet... nfs.alreadymounted Verzeichnis bereits gemountet. nfs.automount Beim Start mounten nfs.dir Verzeichnis/Freigabe @@ -2094,6 +2094,7 @@ nfs.umount Netzwerk Verzeichnis unmounten nfs.umounterror Umount-Fehler nfs.username Benutzername nfsmenu.head NFS/CIFS/FTPFS Einstellungen +ni NI \o/ nimenu.head NI-Einstellungen nimenu.head_special Extra-Einstellungen nvod.percentage (%d%% vorbei) diff --git a/data/locale/english.locale b/data/locale/english.locale index 748ba33d9..d5e765e11 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2070,7 +2070,7 @@ networkmenu.ssid_scan WLAN network scan networkmenu.ssid_scan_error No WLAN networks are found. networkmenu.ssid_scan_wait WLAN network scan in progress... networkmenu.test Test network now -neutrino_starting NI \o/ +neutrino_starting %s %s starting... nfs.alreadymounted directory already mounted nfs.automount Mount on startup nfs.dir directory/share @@ -2094,6 +2094,7 @@ nfs.umount Umount Network volume nfs.umounterror error umounting volume nfs.username username nfsmenu.head NFS/CIFS/FTPFS settings +ni NI \o/ nimenu.head NI-Settings nimenu.head_special Special settings nvod.percentage (%d%% over) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 64ab3e251..60c300d06 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2173,7 +2173,7 @@ TIMER_START(); CVFD::getInstance()->init(neutrinoFonts->fontDescr.filename.c_str(), neutrinoFonts->fontDescr.name.c_str()); CVFD::getInstance()->Clear(); - CVFD::getInstance()->ShowText(start_text); + CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_NI)); //NI CVFD::getInstance()->setBacklight(g_settings.backlight_tv); if (!scanSettings.loadSettings(NEUTRINO_SCAN_SETTINGS_FILE)) diff --git a/src/system/locals.h b/src/system/locals.h index da4bd8c6b..de173d6bb 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2121,6 +2121,7 @@ typedef enum LOCALE_NFS_UMOUNTERROR, LOCALE_NFS_USERNAME, LOCALE_NFSMENU_HEAD, + LOCALE_NI, LOCALE_NIMENU_HEAD, LOCALE_NIMENU_HEAD_SPECIAL, LOCALE_NVOD_PERCENTAGE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index be6e6a969..996dc0d94 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2121,6 +2121,7 @@ const char * locale_real_names[] = "nfs.umounterror", "nfs.username", "nfsmenu.head", + "ni", "nimenu.head", "nimenu.head_special", "nvod.percentage",