From 721e64c9931ceba2b18b32229d6dc354458aed16 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 30 Oct 2012 23:21:30 +0000 Subject: [PATCH] Issue 148 fixed (translated strings) --- src/model_menus.cpp | 4 ++-- src/translations.cpp | 2 ++ src/translations.h | 2 ++ src/translations/cz.h | 2 ++ src/translations/de.h | 2 ++ src/translations/en.h | 2 ++ src/translations/es.h | 2 ++ src/translations/fr.h | 2 ++ src/translations/it.h | 2 ++ src/translations/se.h | 2 ++ 10 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/model_menus.cpp b/src/model_menus.cpp index bb45cd65d..7e48ed6a9 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -1037,7 +1037,7 @@ void menuModelPhaseOne(uint8_t event) #if defined(GVARS) && !defined(M64) case ITEM_MODEL_PHASE_GVARS_LABEL: - lcd_putsLeft(y, PSTR("Global Variables")); + lcd_putsLeft(y, STR_GLOBAL_VARS); break; default: @@ -1059,7 +1059,7 @@ void menuModelPhaseOne(uint8_t event) putsFlightPhase(MIXES_2ND_COLUMN, y, p+1, !editingName && m_posHorz==1 ? attr : 0); } else { - lcd_putsAtt(MIXES_2ND_COLUMN, y, PSTR("Own"), !editingName && m_posHorz==1 ? attr : 0); + lcd_putsAtt(MIXES_2ND_COLUMN, y, STR_OWN, !editingName && m_posHorz==1 ? attr : 0); } if (attr && !editingName && s_currIdx>0 && m_posHorz==1 && ((editMode>0) || p1valdiff)) { if (v < GVAR_MAX) v = GVAR_MAX; diff --git a/src/translations.cpp b/src/translations.cpp index 85431fae9..65a118069 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -369,6 +369,8 @@ const pm_char STR_SD_SPEED[] PROGMEM = TR_SD_SPEED; const pm_char STR_SD_SECTORS[] PROGMEM = TR_SD_SECTORS; const pm_char STR_SD_SIZE[] PROGMEM = TR_SD_SIZE; const pm_char STR_CURVE_TYPE[] PROGMEM = TR_CURVE_TYPE; +const pm_char STR_GLOBAL_VARS[] PROGMEM = TR_GLOBAL_VARS; +const pm_char STR_OWN[] PROGMEM = TR_OWN; const pm_uchar font[] PROGMEM = { #include "font.lbm" diff --git a/src/translations.h b/src/translations.h index 95b4f330b..d57f6c28c 100644 --- a/src/translations.h +++ b/src/translations.h @@ -462,6 +462,8 @@ extern const pm_char STR_SD_SPEED[]; extern const pm_char STR_SD_SECTORS[]; extern const pm_char STR_SD_SIZE[]; extern const pm_char STR_CURVE_TYPE[]; +extern const pm_char STR_GLOBAL_VARS[]; +extern const pm_char STR_OWN[]; #if defined(VOICE) PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att); diff --git a/src/translations/cz.h b/src/translations/cz.h index 38b21336e..816aa7915 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -452,3 +452,5 @@ #define TR_SD_SECTORS "Sektor\211 :" #define TR_SD_SIZE "Velikost:" #define TR_CURVE_TYPE TR_SD_TYPE +#define TR_GLOBAL_VARS "Global Variables" +#define TR_OWN "Own" diff --git a/src/translations/de.h b/src/translations/de.h index 3073d301a..cf03983f7 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -453,3 +453,5 @@ #define TR_SD_SECTORS "Sectors:" #define TR_SD_SIZE "Size:" #define TR_CURVE_TYPE "Type" +#define TR_GLOBAL_VARS "Global Variables" +#define TR_OWN "Own" diff --git a/src/translations/en.h b/src/translations/en.h index 2bd460428..46cba8dc6 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -458,3 +458,5 @@ #define TR_SD_SECTORS "Sectors:" #define TR_SD_SIZE "Size:" #define TR_CURVE_TYPE "Type" +#define TR_GLOBAL_VARS "Global Variables" +#define TR_OWN "Own" diff --git a/src/translations/es.h b/src/translations/es.h index 66773c48c..36b65943e 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -455,3 +455,5 @@ #define TR_SD_SECTORS "Sectors:" #define TR_SD_SIZE "Size:" #define TR_CURVE_TYPE "Type" +#define TR_GLOBAL_VARS "Global Variables" +#define TR_OWN "Own" diff --git a/src/translations/fr.h b/src/translations/fr.h index 315a07e21..df04f9cc8 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -458,3 +458,5 @@ #define TR_SD_SECTORS "Secteurs:" #define TR_SD_SIZE "Taille:" #define TR_CURVE_TYPE "Type" +#define TR_GLOBAL_VARS "Variables Globales" +#define TR_OWN "Pers" diff --git a/src/translations/it.h b/src/translations/it.h index 1d73a8032..9cb488fb2 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -453,3 +453,5 @@ #define TR_SD_SECTORS "Sectors:" #define TR_SD_SIZE "Size:" #define TR_CURVE_TYPE "Type" +#define TR_GLOBAL_VARS "Global Variables" +#define TR_OWN "Own" diff --git a/src/translations/se.h b/src/translations/se.h index d6108dd94..97ec9b32f 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -461,3 +461,5 @@ #define TR_SD_SECTORS "Sektorer:" #define TR_SD_SIZE "Strl:" #define TR_CURVE_TYPE "Typ " +#define TR_GLOBAL_VARS "Global Variables" +#define TR_OWN "Own"