mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Software Update with apply the settings (Part4)

Browse Source 
- Use locale for message boxes


Origin commit data
------------------
Branch: ni/coolstream
Commit: dc8ddc5325
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part4)

- Use locale for message boxes


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2012-10-24 23:20:41 +02:00
parent 43e82e3288
commit 33c7b51731
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/ext_update.cpp
View File

@@ -141,7 +141,7 @@ bool CExtUpdate::writemtdExt(const std::string & filename)
WRITE_UPDATE_LOG("ERROR: %s", err);
return false;
}
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "Settingsübernahme erfolgreich.\nDas Image kann jetzt geflasht werden.", CMessageBox::mbrOk, CMessageBox::mbOk, NEUTRINO_ICON_INFO);
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SUCCESSFULLY), CMessageBox::mbrOk, CMessageBox::mbOk, NEUTRINO_ICON_INFO);
WRITE_UPDATE_LOG("\n");
WRITE_UPDATE_LOG("##### Settings taken. #####\n");
CFlashExpert::getInstance()->writemtd(filename, mtdNumber);
@@ -152,7 +152,7 @@ bool CExtUpdate::writemtdExt(const std::string & filename)
bool CExtUpdate::writemtdExt()
{
if(!hintBox)
hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Image wird bearbeitet...");
hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED));
hintBox->paint();
mtdRamError = "";
std::string osrelease = "";
@@ -468,7 +468,7 @@ bool CExtUpdate::readBackupList(const std::string & dstPath)
// special folders
else if ((line == "/") || (line == "/*") || (line == "/*.*") || (line.find("/dev") == 0) || (line.find("/proc") == 0) ||
(line.find("/sys") == 0) || (line.find("/mnt") == 0) || (line.find("/tmp") == 0)) {
snprintf(buf, sizeof(buf), "Ordner [%s] kann nicht übertragen werden. Eintrag wird übersprungen.", line.c_str());
snprintf(buf, sizeof(buf), g_Locale->getText(LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SKIPPED), line.c_str());
WRITE_UPDATE_LOG("%s%s", buf, "\n");
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, buf, CMessageBox::mbrOk, CMessageBox::mbOk, NEUTRINO_ICON_INFO);
continue;