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

Image backup apollo Part #2

Browse Source 
- Add locales for progressbar


Origin commit data
------------------
Commit: 2e360ca480
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)
This commit is contained in:
Michael Liebmann
2013-09-21 19:48:17 +02:00
parent 786fd14316
commit 3c9cdf38c6
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/locale/deutsch.locale
View File

@@ -486,6 +486,9 @@ flashupdate.md5check Imageprüfung
flashupdate.md5sumerror Das Image ist fehlerhaft
flashupdate.menu_apply_kernel Kernel flashen
flashupdate.menu_apply_settings Settingsübernahme erlauben
flashupdate.mkfs_create_image Image erstellen
flashupdate.mkfs_preparing_files Dateien und Verzeichnisse vorbereiten
flashupdate.mkfs_using_sumtool Benutze Sumtool
flashupdate.msgbox Es wurde folgendes neues File gefunden:\nDatum: %s, %s\nBasisImage: %s\nTyp: %s\n\nWollen Sie diese Version jetzt herunterladen\nund installieren?
flashupdate.msgbox_manual Es wurde ein neues Image gefunden:\nDatum: %s, %s\nBasisImage: %s\nImageTyp: %s\n\nWollen Sie diese Version jetzt installieren?
flashupdate.mtdselector Partitions-Auswahl

3
data/locale/english.locale
View File

@@ -486,6 +486,9 @@ flashupdate.md5check checking image
flashupdate.md5sumerror image has errors
flashupdate.menu_apply_kernel Flashing kernel
flashupdate.menu_apply_settings Allow apply settings
flashupdate.mkfs_create_image Create image
flashupdate.mkfs_preparing_files Preparing files and directories
flashupdate.mkfs_using_sumtool Using sumtool
flashupdate.msgbox Found the following new file:\nDate: %s, %s\nBaseImage: %s\nType: %s\n\nDo you want to download and install this version now?
flashupdate.msgbox_manual Found the following new image:\nDate: %s, %s\nBaseImage: %s\nImageType: %s\n\nDo you want to install this version now?
flashupdate.mtdselector Partition-Selector

3
src/system/locals.h
View File

@@ -513,6 +513,9 @@ typedef enum
LOCALE_FLASHUPDATE_MD5SUMERROR,
LOCALE_FLASHUPDATE_MENU_APPLY_KERNEL,
LOCALE_FLASHUPDATE_MENU_APPLY_SETTINGS,
LOCALE_FLASHUPDATE_MKFS_CREATE_IMAGE,
LOCALE_FLASHUPDATE_MKFS_PREPARING_FILES,
LOCALE_FLASHUPDATE_MKFS_USING_SUMTOOL,
LOCALE_FLASHUPDATE_MSGBOX,
LOCALE_FLASHUPDATE_MSGBOX_MANUAL,
LOCALE_FLASHUPDATE_MTDSELECTOR,

3
src/system/locals_intern.h
View File

@@ -513,6 +513,9 @@ const char * locale_real_names[] =
"flashupdate.md5sumerror",
"flashupdate.menu_apply_kernel",
"flashupdate.menu_apply_settings",
"flashupdate.mkfs_create_image",
"flashupdate.mkfs_preparing_files",
"flashupdate.mkfs_using_sumtool",
"flashupdate.msgbox",
"flashupdate.msgbox_manual",
"flashupdate.mtdselector",

9
src/system/mtdutils/mkfs.jffs2.cpp
View File

@@ -69,6 +69,9 @@
#include <string>
#include "rbtree.h"
#include <system/localize.h>
extern CLocaleManager *g_Locale;
#define PROGRAM_NAME "mkfs.jffs2"
@@ -1239,7 +1242,7 @@ bool CMkfsJFFS2::makeJffs2Image(std::string& path,
if (progressBar != NULL) {
progressBar->showLocalStatus(0);
progressBar->showGlobalStatus(0);
progressBar->showStatusMessageUTF("Read Files and Directories");
progressBar->showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_MKFS_PREPARING_FILES));
}
fse_root = recursive_add_host_directory(NULL, "/", cwd, skipSpezialFolders, progressBar);
if (progressBar != NULL) {
@@ -1264,11 +1267,12 @@ bool CMkfsJFFS2::makeJffs2Image(std::string& path,
if (progressBar != NULL) {
progressBar->showLocalStatus(0);
progressBar->showStatusMessageUTF("Create Image");
progressBar->showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_MKFS_CREATE_IMAGE));
}
create_target_filesystem(fse_root);
if (progressBar != NULL) {
progressBar->showGlobalStatus(90);
progressBar->showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_MKFS_USING_SUMTOOL));
}
if (printProgress)
printProgressData(true);
@@ -1280,7 +1284,6 @@ bool CMkfsJFFS2::makeJffs2Image(std::string& path,
CSumtoolJFFS2 st;
st.sumtool(imageName_, sumName_, eraseBlockSize, ((padFsSize==0)?0:1), addCleanmarkers, targetEndian);
unlink(imageName_.c_str());
sync();
}
if (progressBar != NULL) {
paintProgressBar(true);