Revert "- flashtool: localize getType() function"

This reverts commit 66b44f2a0f.
It wasn't a good idea to localize these output. Parsing is much
easier with hardcoded strings.


Origin commit data
------------------
Commit: a1575562b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-06 (Sat, 06 Jan 2018)
This commit is contained in:
vanhofen
2018-01-06 00:06:40 +01:00
parent 197fce2e13
commit c1b55b9bc7
5 changed files with 11 additions and 45 deletions

View File

@@ -762,15 +762,6 @@ flashupdate.start_ofgwrite Starte ofgwrite ...
flashupdate.start_selected_partition Starte ausgewählte Partition? flashupdate.start_selected_partition Starte ausgewählte Partition?
flashupdate.titlereadflash Flash auslesen flashupdate.titlereadflash Flash auslesen
flashupdate.titlewriteflash Flash schreiben flashupdate.titlewriteflash Flash schreiben
flashupdate.type_addon Erweiterung
flashupdate.type_beta Beta
flashupdate.type_internal Intern
flashupdate.type_locale Sprachdatei
flashupdate.type_release Release
flashupdate.type_settings Einstellungen
flashupdate.type_text Text
flashupdate.type_unknown Unbekannt
flashupdate.type_update Aktualisierung
flashupdate.update_with_settings_del_skipped Ordner [%s] kann nicht gelöscht werden. Eintrag wird übersprungen. flashupdate.update_with_settings_del_skipped Ordner [%s] kann nicht gelöscht werden. Eintrag wird übersprungen.
flashupdate.update_with_settings_error Error Flashspeicher!\n \nIm neuen Image sind nur noch %ld KB (von %ld KB) frei,\ndas ist zu wenig, um einen sicheren Betrieb zu gewährleisten.\n \nDer Vorgang wird abgebrochen! flashupdate.update_with_settings_error Error Flashspeicher!\n \nIm neuen Image sind nur noch %ld KB (von %ld KB) frei,\ndas ist zu wenig, um einen sicheren Betrieb zu gewährleisten.\n \nDer Vorgang wird abgebrochen!
flashupdate.update_with_settings_processed Image wird bearbeitet ... flashupdate.update_with_settings_processed Image wird bearbeitet ...

View File

@@ -762,15 +762,6 @@ flashupdate.start_ofgwrite Starting ofgwrite ...
flashupdate.start_selected_partition Start chosen partition? flashupdate.start_selected_partition Start chosen partition?
flashupdate.titlereadflash Reading Flash flashupdate.titlereadflash Reading Flash
flashupdate.titlewriteflash Writing Flash flashupdate.titlewriteflash Writing Flash
flashupdate.type_addon Addon
flashupdate.type_beta Beta
flashupdate.type_internal Internal
flashupdate.type_locale Locale
flashupdate.type_release Release
flashupdate.type_settings Settings
flashupdate.type_text Text
flashupdate.type_unknown Unknown
flashupdate.type_update Update
flashupdate.update_with_settings_del_skipped Folder [%s] can not be deleted. Entry is skipped. flashupdate.update_with_settings_del_skipped Folder [%s] can not be deleted. Entry is skipped.
flashupdate.update_with_settings_error Flash Error!\n \nNew Image only has %ld KB (out of %ld KB) left. Not\nenough space to complete this operation.\n \nCanceling operation! flashupdate.update_with_settings_error Flash Error!\n \nNew Image only has %ld KB (out of %ld KB) left. Not\nenough space to complete this operation.\n \nCanceling operation!
flashupdate.update_with_settings_processed Image is being processed ... flashupdate.update_with_settings_processed Image is being processed ...

View File

@@ -549,26 +549,28 @@ const char *CFlashVersionInfo::getReleaseCycle(void) const
const char *CFlashVersionInfo::getType(void) const const char *CFlashVersionInfo::getType(void) const
{ {
// TODO: localize it
switch (snapshot) switch (snapshot)
{ {
case '0': case '0':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_RELEASE); return "Release";
case '1': case '1':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_BETA); return "Beta";
case '2': case '2':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_INTERNAL); return "Internal";
case 'L': case 'L':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_LOCALE); return "Locale";
case 'S': case 'S':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_SETTINGS); return "Settings";
case 'A': case 'A':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_ADDON); return "Addon";
case 'U': case 'U':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UPDATE); return "Update";
case 'T': case 'T':
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_TEXT); return "Text";
default: default:
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UNKNOWN); return "Unknown";
} }
} }

View File

@@ -788,15 +788,6 @@ typedef enum
LOCALE_FLASHUPDATE_START_SELECTED_PARTITION, LOCALE_FLASHUPDATE_START_SELECTED_PARTITION,
LOCALE_FLASHUPDATE_TITLEREADFLASH, LOCALE_FLASHUPDATE_TITLEREADFLASH,
LOCALE_FLASHUPDATE_TITLEWRITEFLASH, LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
LOCALE_FLASHUPDATE_TYPE_ADDON,
LOCALE_FLASHUPDATE_TYPE_BETA,
LOCALE_FLASHUPDATE_TYPE_INTERNAL,
LOCALE_FLASHUPDATE_TYPE_LOCALE,
LOCALE_FLASHUPDATE_TYPE_RELEASE,
LOCALE_FLASHUPDATE_TYPE_SETTINGS,
LOCALE_FLASHUPDATE_TYPE_TEXT,
LOCALE_FLASHUPDATE_TYPE_UNKNOWN,
LOCALE_FLASHUPDATE_TYPE_UPDATE,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED, LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_ERROR, LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_ERROR,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED, LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,

View File

@@ -788,15 +788,6 @@ const char * locale_real_names[] =
"flashupdate.start_selected_partition", "flashupdate.start_selected_partition",
"flashupdate.titlereadflash", "flashupdate.titlereadflash",
"flashupdate.titlewriteflash", "flashupdate.titlewriteflash",
"flashupdate.type_addon",
"flashupdate.type_beta",
"flashupdate.type_internal",
"flashupdate.type_locale",
"flashupdate.type_release",
"flashupdate.type_settings",
"flashupdate.type_text",
"flashupdate.type_unknown",
"flashupdate.type_update",
"flashupdate.update_with_settings_del_skipped", "flashupdate.update_with_settings_del_skipped",
"flashupdate.update_with_settings_error", "flashupdate.update_with_settings_error",
"flashupdate.update_with_settings_processed", "flashupdate.update_with_settings_processed",