diff --git a/MDUV380_firmware/application/include/user_interface/languages/catalan.h b/MDUV380_firmware/application/include/user_interface/languages/catalan.h index 7969042..3445349 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/catalan.h +++ b/MDUV380_firmware/application/include/user_interface/languages/catalan.h @@ -345,6 +345,7 @@ const stringsTable_t catalanLanguage= .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Barres", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/croatian.h b/MDUV380_firmware/application/include/user_interface/languages/croatian.h index 6dc1aad..2fc5ab6 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/croatian.h +++ b/MDUV380_firmware/application/include/user_interface/languages/croatian.h @@ -345,6 +345,7 @@ const stringsTable_t croatianLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Trake", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/czech.h b/MDUV380_firmware/application/include/user_interface/languages/czech.h index 36cecbd..aefff3e 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/czech.h +++ b/MDUV380_firmware/application/include/user_interface/languages/czech.h @@ -345,6 +345,7 @@ const stringsTable_t czechLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Pruhy", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/danish.h b/MDUV380_firmware/application/include/user_interface/languages/danish.h index 9f8098b..ddf56cc 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/danish.h +++ b/MDUV380_firmware/application/include/user_interface/languages/danish.h @@ -345,6 +345,7 @@ const stringsTable_t danishLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Bjælker", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/dutch.h b/MDUV380_firmware/application/include/user_interface/languages/dutch.h index 6544027..7a47eef 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/dutch.h +++ b/MDUV380_firmware/application/include/user_interface/languages/dutch.h @@ -345,6 +345,7 @@ const stringsTable_t dutchLanguage = .sms_own_id_only = "Alleen mijn ID", // MaxLen: 16 .message_from = "Bericht van", // MaxLen: 16 .delete_message = "Bericht wissen?", // MaxLen: 16 +.battery_bars = "Balken", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/english.h b/MDUV380_firmware/application/include/user_interface/languages/english.h index 0e1f129..bb82e30 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/english.h +++ b/MDUV380_firmware/application/include/user_interface/languages/english.h @@ -345,6 +345,7 @@ const stringsTable_t englishLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Bars", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/finnish.h b/MDUV380_firmware/application/include/user_interface/languages/finnish.h index fd2ccbe..db79c37 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/finnish.h +++ b/MDUV380_firmware/application/include/user_interface/languages/finnish.h @@ -345,6 +345,7 @@ const stringsTable_t finnishLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Palkit", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/french.h b/MDUV380_firmware/application/include/user_interface/languages/french.h index 7a50eac..6851a4e 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/french.h +++ b/MDUV380_firmware/application/include/user_interface/languages/french.h @@ -345,6 +345,7 @@ const stringsTable_t frenchLanguage = .sms_own_id_only = "Mon ID seul", // MaxLen: 16 .message_from = "Message de", // MaxLen: 16 .delete_message = "Suppr. message?", // MaxLen: 16 +.battery_bars = "Barres", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/german.h b/MDUV380_firmware/application/include/user_interface/languages/german.h index c03e8e3..dcd01f4 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/german.h +++ b/MDUV380_firmware/application/include/user_interface/languages/german.h @@ -345,6 +345,7 @@ const stringsTable_t germanLanguage = .sms_own_id_only = "Nur eigene ID", // MaxLen: 16 .message_from = "Nachricht von", // MaxLen: 16 .delete_message = "Nachricht lösch.", // MaxLen: 16 +.battery_bars = "Balken", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/hungarian.h b/MDUV380_firmware/application/include/user_interface/languages/hungarian.h index 6cc187d..c62af6d 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/hungarian.h +++ b/MDUV380_firmware/application/include/user_interface/languages/hungarian.h @@ -345,6 +345,7 @@ const stringsTable_t hungarianLanguage= .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Sávok", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/italian.h b/MDUV380_firmware/application/include/user_interface/languages/italian.h index 252d196..917d95f 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/italian.h +++ b/MDUV380_firmware/application/include/user_interface/languages/italian.h @@ -345,6 +345,7 @@ const stringsTable_t italianLanguage = .sms_own_id_only = "Solo mio ID", // MaxLen: 16 .message_from = "Messaggio da", // MaxLen: 16 .delete_message = "Elimina msg?", // MaxLen: 16 +.battery_bars = "Barre", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/japanese.h b/MDUV380_firmware/application/include/user_interface/languages/japanese.h index e114451..76142d1 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/japanese.h +++ b/MDUV380_firmware/application/include/user_interface/languages/japanese.h @@ -345,6 +345,7 @@ const stringsTable_t japaneseLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Bar", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/polish.h b/MDUV380_firmware/application/include/user_interface/languages/polish.h index 063e244..5ceb0fe 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/polish.h +++ b/MDUV380_firmware/application/include/user_interface/languages/polish.h @@ -345,6 +345,7 @@ const stringsTable_t polishLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Paski", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/portugues_brazil.h b/MDUV380_firmware/application/include/user_interface/languages/portugues_brazil.h index a417627..07ae3cd 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/portugues_brazil.h +++ b/MDUV380_firmware/application/include/user_interface/languages/portugues_brazil.h @@ -345,6 +345,7 @@ const stringsTable_t portuguesBrazilLanguage = .sms_own_id_only = "Só meu ID", // MaxLen: 16 .message_from = "Mensagem de", // MaxLen: 16 .delete_message = "Apagar msg?", // MaxLen: 16 +.battery_bars = "Barras", // MaxLen: 16 }; /********************************************************************* * diff --git a/MDUV380_firmware/application/include/user_interface/languages/portuguese.h b/MDUV380_firmware/application/include/user_interface/languages/portuguese.h index 055b571..0029077 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/portuguese.h +++ b/MDUV380_firmware/application/include/user_interface/languages/portuguese.h @@ -345,6 +345,7 @@ const stringsTable_t portuguesLanguage = .sms_own_id_only = "Só meu ID", // MaxLen: 16 .message_from = "Mensagem de", // MaxLen: 16 .delete_message = "Apagar msg?", // MaxLen: 16 +.battery_bars = "Barras", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/romanian.h b/MDUV380_firmware/application/include/user_interface/languages/romanian.h index 86cae76..38c6b9a 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/romanian.h +++ b/MDUV380_firmware/application/include/user_interface/languages/romanian.h @@ -345,6 +345,7 @@ const stringsTable_t romanianLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Bare", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/slovenian.h b/MDUV380_firmware/application/include/user_interface/languages/slovenian.h index b86bf4b..c961a1b 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/slovenian.h +++ b/MDUV380_firmware/application/include/user_interface/languages/slovenian.h @@ -345,6 +345,7 @@ const stringsTable_t slovenianLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Stolpci", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/spanish.h b/MDUV380_firmware/application/include/user_interface/languages/spanish.h index 347418c..3f063fa 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/spanish.h +++ b/MDUV380_firmware/application/include/user_interface/languages/spanish.h @@ -345,6 +345,7 @@ const stringsTable_t spanishLanguage = .sms_own_id_only = "Solo mi ID", // MaxLen: 16 .message_from = "Mensaje de", // MaxLen: 16 .delete_message = "¿Borrar mensaje?", // MaxLen: 16 +.battery_bars = "Barras", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/swedish.h b/MDUV380_firmware/application/include/user_interface/languages/swedish.h index 0e3a0ff..1ca15da 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/swedish.h +++ b/MDUV380_firmware/application/include/user_interface/languages/swedish.h @@ -345,6 +345,7 @@ const stringsTable_t swedishLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Staplar", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/turkish.h b/MDUV380_firmware/application/include/user_interface/languages/turkish.h index dc7148d..6e7a8bf 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/turkish.h +++ b/MDUV380_firmware/application/include/user_interface/languages/turkish.h @@ -345,6 +345,7 @@ const stringsTable_t turkishLanguage = .sms_own_id_only = "My ID only", // MaxLen: 16 .message_from = "Message from", // MaxLen: 16 .delete_message = "Delete message?", // MaxLen: 16 +.battery_bars = "Çubuklar", // MaxLen: 16 }; /******************************************************************** * diff --git a/MDUV380_firmware/application/include/user_interface/languages/uiLanguage.h b/MDUV380_firmware/application/include/user_interface/languages/uiLanguage.h index c423e6e..cb2a00b 100644 --- a/MDUV380_firmware/application/include/user_interface/languages/uiLanguage.h +++ b/MDUV380_firmware/application/include/user_interface/languages/uiLanguage.h @@ -35,7 +35,7 @@ #else #define LANGUAGE_TAG_MAGIC_NUMBER { 'G', 'D', '7', '7' }, { 'L', 'A', 'N', 'G' } // Never change this tag. #endif -#define LANGUAGE_TAG_VERSION { 0x00, 0x00, 0x00, 0x06 } // Bump the version each time the language struct is changed +#define LANGUAGE_TAG_VERSION { 0x00, 0x00, 0x00, 0x07 } // Bump the version each time the language struct is changed typedef struct { @@ -353,6 +353,7 @@ typedef struct const char sms_own_id_only[LANGUAGE_TEXTS_LENGTH]; const char message_from[LANGUAGE_TEXTS_LENGTH]; const char delete_message[LANGUAGE_TEXTS_LENGTH]; + const char battery_bars[LANGUAGE_TEXTS_LENGTH]; // "Bars" battery header display mode } stringsTable_t; #endif // _OPENGD77_UILANGUAGE_H_ diff --git a/MDUV380_firmware/application/source/user_interface/menuDisplayOptions.c b/MDUV380_firmware/application/source/user_interface/menuDisplayOptions.c index 72365cd..29ffe40 100644 --- a/MDUV380_firmware/application/source/user_interface/menuDisplayOptions.c +++ b/MDUV380_firmware/application/source/user_interface/menuDisplayOptions.c @@ -321,8 +321,7 @@ static void updateScreen(bool isFirstRun) rightSideUnitsStr = "V"; break; case BATTERY_UNIT_BARS: - // Plain literal -> rightSideVar (voice-safe), like the Screen Dim entry above. - snprintf(rightSideVar, SCREEN_LINE_BUFFER_SIZE, "%s", "Bars"); + rightSideConst = currentLanguage->battery_bars; break; default: // BATTERY_UNIT_PERCENTAGE rightSideUnitsPrompt = PROMPT_PERCENT;