Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 04:45:17 +03:00
Code Issues Wiki Activity

Projectkk2glider/issue 4138 and other fixes (#4182)

Browse source 
* Fixed Companion translations cmake target

* Some translations had problems with string termination (missing or excessive " characters)

* Fixes #4138: Use [RTN] instead of [EXIT] on Horus

* Define spare bits if BUZZER is not defined
This commit is contained in:
Damjan Adamic 2017-01-02 11:31:55 +01:00 • committed by Bertrand Songis
parent afe3d4a1e9
commit 803dc7d853
12 changed files with 65 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/CMakeLists.txt
View file

@ -416,7 +416,7 @@ endif()
if(LUPDATE_FOUND)
add_custom_target(translations
WORKING_DIRECTORY ${COMPANION_SRC_DIRECTORY}
COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
COMMAND ${LUPDATE_EXECUTABLE} ${COMPANION_SRC_DIRECTORY} -no-obsolete -ts ${companion_TS}
)
else()
add_custom_target(translations

10
radio/src/datastructs.h
View file

@ -885,7 +885,7 @@ PACK(struct TrainerData {
NOBACKUP(uint8_t countryCode); \
NOBACKUP(uint8_t imperial:1); \
NOBACKUP(uint8_t jitterFilter:1); /* 0 - active */\
NOBACKUP(uint8_t spareExtra:6); \
NOBACKUP(uint8_t spareExtraArm:6); \
NOBACKUP(char ttsLanguage[2]); \
NOBACKUP(int8_t beepVolume:4); \
NOBACKUP(int8_t wavVolume:4); \
@ -914,7 +914,7 @@ PACK(struct TrainerData {
#define EXTRA_GENERAL_FIELDS \
EXTRA_GENERAL_FIELDS_ARM \
uint8_t serial2Mode:4; \
uint8_t spare:4; \
uint8_t spareExtra:4; \
uint32_t switchConfig; \
uint8_t potsType; /*two bits for every pot*/\
char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]; \
@ -980,7 +980,11 @@ PACK(struct RadioData {
NOBACKUP(int8_t backlightMode);
NOBACKUP(TrainerData trainer);
NOBACKUP(uint8_t view); // index of view in main screen
NOBACKUP(int8_t buzzerMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all
#if defined(BUZZER)
NOBACKUP(int8_t buzzerMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware)
#else
NOBACKUP(int8_t spareRadio:2);
#endif
NOBACKUP(uint8_t fai:1);
NOBACKUP(int8_t beepMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all
NOBACKUP(uint8_t alarmsFlash:1);

6
radio/src/translations/cz.h.txt
View file

@ -112,7 +112,7 @@
#define TR_MULTI_CUSTOM "Custom"
#define LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0"V9x9""V6x6""V912""CX20"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912""CX20"
#define LEN_SUBTYPE_AFHDS2A "\010"
#define TR_SUBTYPE_AFHDS2A "PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"
@ -669,7 +669,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER

4
radio/src/translations/en.h.txt
View file

@ -645,7 +645,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBFLAMENCO)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER

6
radio/src/translations/es.h.txt
View file

@ -107,7 +107,7 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006"
#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""
#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 "
#define TR_MULTI_CUSTOM "Custom"
@ -630,7 +630,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[SALIR]"
#endif
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER

6
radio/src/translations/fi.h.txt
View file

@ -112,7 +112,7 @@
#define TR_MULTI_CUSTOM "Custom"
#define LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0"V9x9""V6x6""V912""CX20"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912""CX20"
#define LEN_SUBTYPE_AFHDS2A "\010"
#define TR_SUBTYPE_AFHDS2A "PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"
@ -630,7 +630,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER

4
radio/src/translations/fr.h.txt
View file

@ -658,7 +658,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER

6
radio/src/translations/it.h.txt
View file

@ -112,7 +112,7 @@
#define TR_MULTI_CUSTOM "Custom"
#define LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0"V9x9""V6x6""V912""CX20"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912""CX20"
#define LEN_SUBTYPE_AFHDS2A "\010"
#define TR_SUBTYPE_AFHDS2A "PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"
@ -652,7 +652,11 @@
#define TR_ENTER "[Menù]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER

6
radio/src/translations/nl.h.txt
View file

@ -117,7 +117,7 @@
#define TR_MULTI_CUSTOM "Custom"
#define LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0"V9x9""V6x6""V912""CX20"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912""CX20"
#define LEN_SUBTYPE_AFHDS2A "\010"
#define TR_SUBTYPE_AFHDS2A "PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"
@ -641,7 +641,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBFLAMENCO)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER

6
radio/src/translations/pl.h.txt
View file

@ -113,7 +113,7 @@
#define TR_MULTI_CUSTOM "Custom"
#define LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0"V9x9""V6x6""V912""CX20"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912""CX20"
#define LEN_SUBTYPE_AFHDS2A "\010"
#define TR_SUBTYPE_AFHDS2A "PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"
@ -654,7 +654,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[WYJŚ]"
#endif
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER

4
radio/src/translations/pt.h.txt
View file

@ -625,7 +625,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER

6
radio/src/translations/se.h.txt
View file

@ -112,7 +112,7 @@
#define TR_MULTI_CUSTOM "Custom"
#define LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0"V9x9""V6x6""V912""CX20"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912""CX20"
#define LEN_SUBTYPE_AFHDS2A "\010"
#define TR_SUBTYPE_AFHDS2A "PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"
@ -654,7 +654,11 @@
#define TR_ENTER "[MENU]"
#endif
#if defined(PCBHORUS)
#define TR_EXIT "[RTN]"
#else
#define TR_EXIT "[EXIT]"
#endif
#if defined(PCBFLAMENCO)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER