From 74a6e579a36139f81cae87c6547cb134fa93c614 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 12 Oct 2020 15:22:08 +0200 Subject: [PATCH] Update chinese translastions --- radio/src/fonts/480x272/CMakeLists.txt | 21 ------------- radio/src/fonts/480x272/font_stdsize.png | Bin 22533 -> 0 bytes radio/src/gui/colorlcd/fonts.cpp | 2 +- radio/src/gui/colorlcd/timeedit.cpp | 1 + radio/src/translations/cn.h.txt | 36 ++++++++++------------- 5 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 radio/src/fonts/480x272/CMakeLists.txt delete mode 100644 radio/src/fonts/480x272/font_stdsize.png diff --git a/radio/src/fonts/480x272/CMakeLists.txt b/radio/src/fonts/480x272/CMakeLists.txt deleted file mode 100644 index a8b57384e..000000000 --- a/radio/src/fonts/480x272/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -set(FONT "Roboto/Roboto-Regular") -set(FONT_BOLD "Roboto/Roboto-Bold") -set(FONT_OFFSET 1) - -#set(FONT "Kanit/Kanit-Regular") -#set(FONT_BOLD "Kanit/Kanit-Bold") -#set(FONT_OFFSET -2) - -#set(FONT "Ubuntu/Ubuntu-Regular") -#set(FONT_BOLD "Ubuntu/Ubuntu-Bold") -#set(FONT_OFFSET 1) - -add_truetype_font_target(480x272 tinsize ${FONT} 9 0) -add_truetype_font_target(480x272 smlsize ${FONT} 13 0) -add_truetype_font_target(480x272 stdsize ${FONT} 16 1) -add_truetype_font_target(480x272 stdsizebold ${FONT_BOLD} 16 1) -add_truetype_font_target(480x272 midsize ${FONT} 24 0) -add_truetype_font_target(480x272 dblsize ${FONT_BOLD} 32 0) -add_truetype_font_target(480x272 xxlsize ${FONT_BOLD} 64 0) - -add_custom_target(ttf_horus_fonts DEPENDS ${ttf_480x272_fonts_targets}) diff --git a/radio/src/fonts/480x272/font_stdsize.png b/radio/src/fonts/480x272/font_stdsize.png deleted file mode 100644 index afd1e98b5230abd370ac2c4a23eb003abe54624c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22533 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 K-z&=^e)tD~WSThu diff --git a/radio/src/gui/colorlcd/fonts.cpp b/radio/src/gui/colorlcd/fonts.cpp index 869d76529..5362505a6 100644 --- a/radio/src/gui/colorlcd/fonts.cpp +++ b/radio/src/gui/colorlcd/fonts.cpp @@ -28,7 +28,7 @@ const unsigned char font_xxs[] = { #include "font_9.lbm" }; -#if defined(HARDWARE_TOUCH) +#if LCD_H > 272 const uint16_t font_std_en_specs[] = { #include "font_17en.specs" }; diff --git a/radio/src/gui/colorlcd/timeedit.cpp b/radio/src/gui/colorlcd/timeedit.cpp index 40fff2601..72245d17d 100644 --- a/radio/src/gui/colorlcd/timeedit.cpp +++ b/radio/src/gui/colorlcd/timeedit.cpp @@ -91,6 +91,7 @@ bool TimeEdit::onTouchEnd(coord_t x, coord_t y) void TimeEdit::onFocusLost() { + BaseNumberEdit::onFocusLost(); // NumberKeyboard::instance()->disable(true); } #endif diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 5d58af4a7..0d794342e 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -44,41 +44,37 @@ // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\002" -#define TR_OFFON "关""开" +#define TR_OFFON "关" "开" #define LEN_MMMINV "\003" -#define TR_MMMINV "---""反\0" +#define TR_MMMINV "---" "反\0" -#define LEN_VBEEPMODE "\008" -#define TR_VBEEPMODE "安静\0 ""警告\0 ""忽略按键""全部\0 " +#define LEN_VBEEPMODE "\010" +#define TR_VBEEPMODE "安静\0 " "警告\0 " "忽略按键" "全部\0 " -#define LEN_VBLMODE TR("\004", "\010") -#define TR_VBLMODE TR("关闭""按键""操控""全部""开启", "关闭\0 ""按键\0 ""操控\0 ""全部\0 ""开启\0 ") +#define LEN_VBLMODE "\004" +#define TR_VBLMODE "关闭" "按键" "操控" "全部" "开启" #define LEN_TRNMODE "\003" -#define TR_TRNMODE "关 ""+=\0"":=\0" +#define TR_TRNMODE "关\0" "+=\0" ":=\0" #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_AUX_SERIAL_MODES "\015" -#if defined(CLI) || defined(DEBUG) -#define TR_AUX_SERIAL_MODES "调试\0 ""回传镜像\0 ""回传输入\0 ""SBUS教练\0 ""LUA脚本\0 " -#else -#define TR_AUX_SERIAL_MODES "调试\0 ""回传镜像\0 ""回传输入\0 ""SBUS教练\0 ""LUA脚本\0 " -#endif +#define LEN_AUX_SERIAL_MODES "\010" +#define TR_AUX_SERIAL_MODES "调试\0 " "回传镜像" "回传输入" "SBUS教练" "LUA脚本\0" -#define LEN_SWTYPES "\006" -#define TR_SWTYPES "无\0 ""回弹\0 ""2段\0 ""3段\0 " +#define LEN_SWTYPES "\004" +#define TR_SWTYPES "无\0 " "回弹" "2段\0""3段\0" -#define LEN_POTTYPES TR("\013", "\017") -#define TR_POTTYPES TR("无\0 ""有中点\0 ""多段\0 ""无中点\0 ", "无\0 ""有中点旋钮\0 ""多段旋钮\0 ""无中点旋钮\0 ") +#define LEN_POTTYPES "\012" +#define TR_POTTYPES "无\0 " "有中点旋钮" "多段旋钮\0 " "无中点旋钮" #define LEN_SLIDERTYPES "\006" -#define TR_SLIDERTYPES "无\0 ""侧滑块" +#define TR_SLIDERTYPES "无\0 " "侧滑块" #define LEN_VLCD "\006" -#define TR_VLCD "NormalOptrex" +#define TR_VLCD "Normal" "Optrex" #define LEN_VPERSISTENT "\014" #define TR_VPERSISTENT "OFF\0 ""Flight\0 ""Manual Reset" @@ -178,8 +174,6 @@ #if defined(AUDIO) #define TR_SOUND "播放声音\0 " -#else - #define TR_SOUND "哔哔音\0 " #endif #if defined(HAPTIC)