Skip to content

Commit eef6cab

Browse files
pfeerickPat6874HThuren
committed
chore: major translation catchup (#4613)
Co-authored-by: Patrick <126767069+Pat6874@users.noreply.github.com> Co-authored-by: HThuren <thuren.henrik@gmail.com>
1 parent 6b3e3b3 commit eef6cab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+92757
-87223
lines changed

companion/src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ foreach(qm_file ${companion_QM} ${qt_QM} ${qtbase_QM})
129129
endforeach()
130130
configure_file(${COMPANION_SRC_DIRECTORY}/translations.qrc.in ${TRANSLATIONS_QRC} @ONLY)
131131

132-
### Add optional "translations" target for updating .ts files
132+
### Add optional "companion_translations" target for updating .ts files
133133
if(QT_LUPDATE_EXECUTABLE)
134134
add_custom_target(companion_translations
135135
WORKING_DIRECTORY ${COMPANION_SRC_DIRECTORY}
136-
COMMAND ${QT_LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
136+
COMMAND ${QT_LUPDATE_EXECUTABLE} ${COMPANION_SRC_DIRECTORY} -no-obsolete -ts ${companion_TS}
137137
)
138138
else()
139-
message(STATUS "Qt lupdate not found, 'translations' target will not be availabe.")
139+
message(STATUS "Qt lupdate not found, 'companion_translations' target will not be availabe.")
140140
endif()
141141

142142
############# Import radio hardware definitions ###############

companion/src/translations/companion_cs.ts

Lines changed: 1400 additions & 1281 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_da.ts

Lines changed: 536 additions & 493 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_de.ts

Lines changed: 1413 additions & 1294 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_en.ts

Lines changed: 1382 additions & 1263 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_es.ts

Lines changed: 1409 additions & 1290 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_fi.ts

Lines changed: 1399 additions & 1280 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_fr.ts

Lines changed: 1659 additions & 1538 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_he.ts

Lines changed: 1350 additions & 1231 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_it.ts

Lines changed: 1401 additions & 1282 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_ja.ts

Lines changed: 1440 additions & 1316 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_nl.ts

Lines changed: 1350 additions & 1231 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_pl.ts

Lines changed: 1409 additions & 1290 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_pt.ts

Lines changed: 1350 additions & 1231 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_ru.ts

Lines changed: 1383 additions & 1264 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_sv.ts

Lines changed: 395 additions & 372 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_zh_CN.ts

Lines changed: 1400 additions & 1281 deletions
Large diffs are not rendered by default.

companion/src/translations/companion_zh_TW.ts

Lines changed: 1400 additions & 1281 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_arimo_ua_13.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "definitions.h"
12
#include "lz4_fonts.h"
23

34
static const uint8_t lz4FontData[] ={
@@ -673,6 +674,8 @@ static const etxFontCmap cmaps[] = {
673674
{ .range_start = 1100, .range_length = 62551, .glyph_id_start = 172, .list_length = 68, .type = 3, .unicode_list = 1928, .glyph_id_ofs_list = 0 },
674675
};
675676

677+
static uint8_t etxUncompBuf[16958] __SDRAMFONTS;
678+
676679
const etxLz4Font lv_font_arimo_ua_13 = {
677680
.uncomp_size = 16566,
678681
.comp_size = 10542,
@@ -694,4 +697,6 @@ const etxLz4Font lv_font_arimo_ua_13 = {
694697
.right_class_mapping = 16326,
695698
.cmaps = cmaps,
696699
.compressed = lz4FontData,
700+
.lvglFontBuf = etxUncompBuf,
701+
.lvglFontBufSize = 16958,
697702
};

radio/src/fonts/lvgl/lv_font_arimo_ua_24.c

Lines changed: 798 additions & 857 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_arimo_ua_9.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "definitions.h"
12
#include "lz4_fonts.h"
23

34
static const uint8_t lz4FontData[] ={
@@ -459,6 +460,8 @@ static const etxFontCmap cmaps[] = {
459460
{ .range_start = 1100, .range_length = 62551, .glyph_id_start = 172, .list_length = 68, .type = 3, .unicode_list = 1928, .glyph_id_ofs_list = 0 },
460461
};
461462

463+
static uint8_t etxUncompBuf[11820] __SDRAMFONTS;
464+
462465
const etxLz4Font lv_font_arimo_ua_9 = {
463466
.uncomp_size = 11428,
464467
.comp_size = 7113,
@@ -480,4 +483,6 @@ const etxLz4Font lv_font_arimo_ua_9 = {
480483
.right_class_mapping = 11188,
481484
.cmaps = cmaps,
482485
.compressed = lz4FontData,
486+
.lvglFontBuf = etxUncompBuf,
487+
.lvglFontBufSize = 11820,
483488
};

radio/src/fonts/lvgl/lv_font_arimo_ua_bold_16.c

Lines changed: 846 additions & 0 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_arimo_ua_bold_32.c

Lines changed: 938 additions & 0 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_arimo_ua_bold_64.c

Lines changed: 1189 additions & 0 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_cn_13.c

Lines changed: 3082 additions & 3051 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_cn_16.c

Lines changed: 831 additions & 701 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_cn_24.c

Lines changed: 5818 additions & 5751 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_cn_9.c

Lines changed: 1820 additions & 1802 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_cn_bold_16.c

Lines changed: 3568 additions & 3522 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_cn_bold_32.c

Lines changed: 8402 additions & 8298 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_jp_13.c

Lines changed: 2118 additions & 2109 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_jp_16.c

Lines changed: 559 additions & 537 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_jp_24.c

Lines changed: 4051 additions & 4033 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_jp_9.c

Lines changed: 1365 additions & 1358 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_jp_bold_16.c

Lines changed: 2972 additions & 2960 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_jp_bold_32.c

Lines changed: 5577 additions & 5549 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_tw_13.c

Lines changed: 3253 additions & 3237 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_tw_16.c

Lines changed: 848 additions & 790 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_tw_24.c

Lines changed: 6629 additions & 6591 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_tw_9.c

Lines changed: 1877 additions & 1869 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_tw_bold_16.c

Lines changed: 4471 additions & 4447 deletions
Large diffs are not rendered by default.

radio/src/fonts/lvgl/lv_font_noto_tw_bold_32.c

Lines changed: 9240 additions & 9180 deletions
Large diffs are not rendered by default.

radio/src/opentx.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ void generalDefault()
292292

293293
#if defined(DEFAULT_INTERNAL_MODULE)
294294
g_eeGeneral.internalModule = DEFAULT_INTERNAL_MODULE;
295-
if (DEFAULT_INTERNAL_MODULE == MODULE_TYPE_CROSSFIRE)
296-
g_eeGeneral.internalModuleBaudrate = CROSSFIRE_MAX_INTERNAL_BAUDRATE;
295+
if (g_eeGeneral.internalModule == MODULE_TYPE_CROSSFIRE)
296+
g_eeGeneral.internalModuleBaudrate = min(1, (int)CROSSFIRE_MAX_INTERNAL_BAUDRATE); // 921k if possible
297297
#endif
298298

299299
adcCalibDefaults();

radio/src/translations/cn.h

Lines changed: 52 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
#define TR_AUX_SERIAL_MODES "调试","回传镜像","回传输入","SBUS教练","LUA脚本","CLI","GPS","Debug","SpaceMouse","外置发射"
5353
#define TR_SWTYPES "无","回弹","2段","3段"
54-
#define TR_POTTYPES "无","无中点旋钮","有中点旋钮","侧滑块","多段旋钮","Axis X","Axis Y","Switch"
54+
#define TR_POTTYPES "无","无中点旋钮",TR("中点旋钮","有中点旋钮"),"侧滑块",TR("多段","多段按键"),"X 轴","Y 轴","开关"
5555
#define TR_VPERSISTENT "禁用","随飞行记录复位","随手动复位"
5656
#define TR_COUNTRY_CODES "美国","日本","欧洲"
5757
#define TR_USBMODES "询问","游戏柄","U盘","串行"
@@ -89,7 +89,7 @@
8989
#define TR_SF_FAILSAFE "设置失控保护"
9090
#define TR_SF_RANGE_CHECK "测距模式"
9191
#define TR_SF_MOD_BIND "模块对频"
92-
#define TR_SF_RGBLEDS "RGB leds"
92+
#define TR_SF_RGBLEDS "RGB led灯"
9393

9494
#define TR_SOUND "播放声音"
9595
#define TR_PLAY_TRACK TR("Ply Trk", "播放音频文件")
@@ -161,16 +161,16 @@
161161
#define TR_HATSOPT "微调","导航键","可切换","全局"
162162
#define TR_HATSMODE_TRIMS "按键帽: 微调"
163163
#define TR_HATSMODE_KEYS "按键帽: 导航键"
164-
#define TR_HATSMODE_KEYS_HELP "Left side:\n"\
165-
" Right = MDL\n"\
166-
" Up = SYS\n"\
167-
" Down = TELE\n"\
164+
#define TR_HATSMODE_KEYS_HELP "左侧按键帽:\n"\
165+
" = MDL\n"\
166+
" = SYS\n"\
167+
" = TELE\n"\
168168
"\n"\
169-
"Right side:\n"\
170-
" Left = PAGE<\n"\
171-
" Right = PAGE>\n"\
172-
" Up = PREV/INC\n"\
173-
" Down = NEXT/DEC"
169+
"右侧按键帽:\n"\
170+
" = PAGE<\n"\
171+
" = PAGE>\n"\
172+
" = PREV/INC\n"\
173+
" = NEXT/DEC"
174174
#endif
175175

176176
#if defined(COLORLCD)
@@ -389,7 +389,7 @@
389389
#define TR_ADJUST_RTC "时钟设置"
390390
#define TR_GPS "GPS"
391391
#define TR_DEF_CHAN_ORD TR("通道顺序", "默认通道顺序")
392-
#define TR_STICKS "摇杆"
392+
#define TR_STICKS "摇杆(轴)"
393393
#define TR_POTS "电位器"
394394
#define TR_SWITCHES "开关"
395395
#define TR_SWITCHES_DELAY TR("开关经过延时", "延时播放(开关经过)")
@@ -401,18 +401,23 @@
401401
#define TR_VTRIM "微调-+"
402402
#define TR_CALIB_DONE "校准完成"
403403
#if defined(PCBHORUS)
404-
#define TR_MENUTOSTART "按[Enter]键开始"
405-
#define TR_SETMIDPOINT "将摇杆、旋钮、滑块居中后按[Enter]开始"
406-
#define TR_MOVESTICKSPOTS "转动摇杆、旋钮、滑块到最大边界后按[Enter]结束"
404+
#define TR_MENUTOSTART "按[Enter]键开始校准"
405+
#define TR_SETMIDPOINT "校准中点:摇杆(轴)、旋钮、滑块,按[Enter]保存"
406+
#define TR_MOVESTICKSPOTS "校准边界:摇杆(轴)、旋钮、滑块,按[Enter]保存并完成"
407407
#elif defined(COLORLCD)
408408
#define TR_MENUTOSTART "按[Enter]键开始"
409-
#define TR_SETMIDPOINT "将摇杆、旋钮、滑块居中后按[Enter]开始"
410-
#define TR_MOVESTICKSPOTS "转动摇杆、旋钮、滑块到最大边界后按[Enter]结束"
409+
#define TR_SETMIDPOINT "校准中点,按[Enter]保存"
410+
#define TR_MOVESTICKSPOTS "校准边界,按[Enter]保存并完成"
411+
#else
412+
#define TR_MENUTOSTART CENTER "\010按" TR_ENTER " 开始"
413+
#if defined(SURFACE_RADIO)
414+
#define TR_SETMIDPOINT CENTER "\006校准中点"
415+
#define TR_MOVESTICKSPOTS CENTER "\002校准边界"
411416
#else
412-
#define TR_MENUTOSTART CENTER "\010按[Enter]键开始"
413-
#define TR_SETMIDPOINT TR(CENTER "\004摇杆、旋钮和滑块居中", CENTER "\004摇杆、旋钮和滑块居中")
414-
#define TR_MOVESTICKSPOTS CENTER "\006摇杆、旋钮和滑块最大边界"
415-
#define TR_MENUWHENDONE CENTER "\006按[Enter]键完成"
417+
#define TR_SETMIDPOINT TR(CENTER "\006校准中点", CENTER "\004校准中点")
418+
#define TR_MOVESTICKSPOTS CENTER "\007校准边界"
419+
#endif
420+
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " 完成"
416421
#endif
417422
#define TR_TXnRX "Tx:\0Rx:"
418423
#define OFS_RX 4
@@ -481,8 +486,13 @@
481486
#define TR_CHANNEL2FAILSAFE "导入当前通道值"
482487
#define TR_MENUMODELSEL TR("模型选择", "模型选择")
483488
#define TR_MENU_MODEL_SETUP TR("模型设置", "模型设置")
484-
#define TR_MENUFLIGHTMODES "飞行模式设置"
485-
#define TR_MENUFLIGHTMODE "飞行模式"
489+
#if defined(SURFACE_RADIO)
490+
#define TR_MENUFLIGHTMODES "驾驶模式"
491+
#define TR_MENUFLIGHTMODE "驾驶模式"
492+
#else
493+
#define TR_MENUFLIGHTMODES "飞行模式设置"
494+
#define TR_MENUFLIGHTMODE "飞行模式"
495+
#endif
486496
#define TR_MENUHELISETUP "直升机设置"
487497

488498
#define TR_MENUINPUTS "输入设置"
@@ -611,8 +621,8 @@
611621
#define TR_MENU_MODULES_RX_VERSION "模块/接收机版本"
612622
#define TR_MENU_FIRM_OPTIONS "固件选项"
613623
#define TR_IMU "陀螺仪"
614-
#define TR_STICKS_POTS_SLIDERS "摇杆/旋钮/滑块"
615-
#define TR_PWM_STICKS_POTS_SLIDERS "PWM 摇杆/旋钮/滑块"
624+
#define TR_STICKS_POTS_SLIDERS "摇杆(轴)/旋钮/滑块"
625+
#define TR_PWM_STICKS_POTS_SLIDERS "PWM摇杆(轴)/旋钮/滑块"
616626
#define TR_RF_PROTOCOL "射频协议"
617627
#define TR_MODULE_OPTIONS "选项"
618628
#define TR_POWER "功率"
@@ -702,12 +712,12 @@
702712

703713
#if defined(COLORLCD)
704714
#define TR_MODEL_QUICK_SELECT "快速选择模型"
705-
#define TR_LABELS_SELECT "Label select"
706-
#define TR_LABELS_MATCH "Label matching"
707-
#define TR_FAV_MATCH "Favorites matching"
708-
#define TR_LABELS_SELECT_MODE "Multi select","Single select"
709-
#define TR_LABELS_MATCH_MODE "Match all","Match any"
710-
#define TR_FAV_MATCH_MODE "Must match","Optional match"
715+
#define TR_LABELS_SELECT "标签类型选择"
716+
#define TR_LABELS_MATCH "标签匹配类型"
717+
#define TR_FAV_MATCH "收藏夹匹配类型"
718+
#define TR_LABELS_SELECT_MODE "复选项","单选项"
719+
#define TR_LABELS_MATCH_MODE "全部匹配","任意匹配"
720+
#define TR_FAV_MATCH_MODE "必须匹配","可选匹配"
711721
#endif
712722

713723
#define TR_SELECT_TEMPLATE_FOLDER "选择一个模板文件夹:"
@@ -811,7 +821,7 @@
811821
#define TR_JACK_MODE "教练插口模式"
812822
#define TR_VOICE_LANGUAGE "播报语言"
813823
#define TR_UNITS_SYSTEM "单位"
814-
#define TR_UNITS_PPM "PPM Units"
824+
#define TR_UNITS_PPM "PPM 单位"
815825
#define TR_EDIT "编辑"
816826
#define TR_INSERT_BEFORE "在本条前插入"
817827
#define TR_INSERT_AFTER "在本条后插入"
@@ -822,7 +832,7 @@
822832
#define TR_PASTE_BEFORE "粘贴到本条之前"
823833
#define TR_DELETE "删除"
824834
#define TR_INSERT "插入"
825-
#define TR_RESET_FLIGHT "复位飞行记录"
835+
#define TR_RESET_FLIGHT "复位飞行数据"
826836
#define TR_RESET_TIMER1 "复位计时器1"
827837
#define TR_RESET_TIMER2 "复位计时器2"
828838
#define TR_RESET_TIMER3 "复位计时器3"
@@ -883,7 +893,7 @@
883893
#define TR_INTERVAL "间隔"
884894
#define TR_REPEAT "循环"
885895
#define TR_ENABLE "启用"
886-
#define TR_DISABLE "Disable"
896+
#define TR_DISABLE "禁用"
887897
#define TR_TOPLCDTIMER "Top LCD Timer"
888898
#define TR_UNIT "单位"
889899
#define TR_TELEMETRY_NEWSENSOR INDENT "添加新传感器..."
@@ -925,9 +935,9 @@
925935
#define TR_MIXSOURCE "混控源"
926936
#define TR_CONSTANT "固定值"
927937
#define TR_PREFLIGHT_POTSLIDER_CHECK "关闭","开启","自动"
928-
#define TR_PREFLIGHT "初始位置检查"
938+
#define TR_PREFLIGHT "初始检查"
929939
#define TR_CHECKLIST TR(INDENT "显示列表", INDENT "显示列表")
930-
#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist")
940+
#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "检查列表", INDENT "自定义检查列表", INDENT "自定义检查列表")
931941
#define TR_AUX_SERIAL_MODE "串口"
932942
#define TR_AUX2_SERIAL_MODE "串口 2"
933943
#define TR_AUX_SERIAL_PORT_POWER "串口供电"
@@ -1127,7 +1137,7 @@
11271137
#define TR_TEXT_VIEWER "文本视图"
11281138
#define TR_MENU_INPUTS STR_CHAR_INPUT "输入"
11291139
#define TR_MENU_LUA STR_CHAR_LUA "LUA脚本"
1130-
#define TR_MENU_STICKS STR_CHAR_STICK "摇杆"
1140+
#define TR_MENU_STICKS STR_CHAR_STICK "摇杆(轴)"
11311141
#define TR_MENU_POTS STR_CHAR_POT "旋钮"
11321142
#define TR_MENU_MIN STR_CHAR_FUNCTION "最小"
11331143
#define TR_MENU_MAX STR_CHAR_FUNCTION "最大"
@@ -1226,7 +1236,7 @@
12261236
#define TR_VOICE_TAIWANESE "中文-台湾国语"
12271237
#define TR_VOICE_JAPANESE "日文"
12281238
#define TR_VOICE_HEBREW "希伯来语"
1229-
#define TR_VOICE_UKRAINIAN "Ukrainian"
1239+
#define TR_VOICE_UKRAINIAN "乌克兰语"
12301240

12311241
#define TR_USBJOYSTICK_LABEL "USB 游戏柄"
12321242
#define TR_USBJOYSTICK_EXTMODE "模式"
@@ -1264,12 +1274,12 @@
12641274
#define TR_RADIO_MENU_TABS "系统功能选项卡"
12651275
#define TR_MODEL_MENU_TABS "模型功能选项卡"
12661276

1267-
#define TR_SELECT_MENU_ALL "All"
1268-
#define TR_SELECT_MENU_CLR "Clear"
1269-
#define TR_SELECT_MENU_INV "Invert"
1277+
#define TR_SELECT_MENU_ALL "全部"
1278+
#define TR_SELECT_MENU_CLR "清除"
1279+
#define TR_SELECT_MENU_INV "反向"
12701280

12711281
#define TR_SORT_ORDERS "名称 A-Z","名称 Z-A","不常用","常用"
12721282
#define TR_SORT_MODELS_BY "排序"
12731283
#define TR_CREATE_NEW "新建"
12741284

1275-
#define TR_MIX_SLOW_PREC TR("Slow prec", "Slow up/dn prec")
1285+
#define TR_MIX_SLOW_PREC TR("慢放精度", "慢放精度 上行/下行")

0 commit comments

Comments
 (0)