diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp index 20eeb43f05e..5eb357df0ec 100644 --- a/radio/src/gui/128x64/model_special_functions.cpp +++ b/radio/src/gui/128x64/model_special_functions.cpp @@ -312,9 +312,14 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF } #endif #if defined(SDCARD) - else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT || func==FUNC_RGB_LED) { + else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT || func == FUNC_RGB_LED) { + coord_t x = MODEL_SPECIAL_FUNC_3RD_COLUMN - 6; + if (func == FUNC_PLAY_SCRIPT) + x = x - 5 * FW; + else if (func == FUNC_PLAY_TRACK) + x = x - 2 * FW; if (ZEXIST(cfn->play.name)) - lcdDrawSizedText(MODEL_SPECIAL_FUNC_3RD_COLUMN-6, y, cfn->play.name, sizeof(cfn->play.name), attr); + lcdDrawSizedText(x, y, cfn->play.name, sizeof(cfn->play.name), attr); else lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_VCSWFUNC, 0, attr); if (active && event==EVT_KEY_BREAK(KEY_ENTER)) { diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index d70d00ec449..ce9fd5d0361 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -92,14 +92,14 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "播放声音" -#define TR_PLAY_TRACK "播放音频文件" +#define TR_PLAY_TRACK TR("Ply Trk", "播放音频文件") #define TR_PLAY_VALUE "播放数值" #define TR_SF_HAPTIC "振动" #define TR_SF_BG_MUSIC "播放背景音乐" #define TR_SF_BG_MUSIC_PAUSE "暂停背景音乐" #define TR_SF_LOGS "记录日志到SD卡" #define TR_ADJUST_GVAR "修改全局变量GV值" -#define TR_SF_PLAY_SCRIPT "Lua脚本" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua脚本") #define TR_SF_BACKLIGHT "背光" #define TR_SF_VARIO "Vario传感器" #define TR_SF_TEST "测试" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 262504af228..02e020efa04 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -108,7 +108,7 @@ #define TR_PLAY_TRACK TR3("\200\201Stopa", "\200\201Stopa", "Přehrát wav") #define TR_PLAY_VALUE TR3("\200\201Hlásit ", "\200\201Hlásit ", "Hlásit stav") #define TR_SF_HAPTIC "Vibrovat" -#define TR_SF_PLAY_SCRIPT "Lua Skript" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Skript") #define TR_SF_BG_MUSIC TR3("\200\201Hudba","\200\201Hudba","Hudba") #define TR_SF_BG_MUSIC_PAUSE TR3("\200\201Hudba ||","\200\201Hudba ||","Hudba pauza") #define TR_SF_LOGS "Loguj na SD" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 346ced2c8e3..d9b5aeb22d2 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -103,10 +103,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Spil lyd" -#define TR_PLAY_TRACK TR("Afspil lyd", "Afspil lydfil") +#define TR_PLAY_TRACK TR("Ply Trk", "Afspil lydfil") #define TR_PLAY_VALUE TR("Spil Vær","Spil Værdi") #define TR_SF_HAPTIC TR("Vib.", "Vibration") -#define TR_SF_PLAY_SCRIPT "Lua Script" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script") #define TR_SF_BG_MUSIC "BgMusik" #define TR_SF_BG_MUSIC_PAUSE "BgMusik ||" #define TR_SF_LOGS "SD Log" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index ee02509a05b..3eb20472b59 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -100,10 +100,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Spiel Töne" -#define TR_PLAY_TRACK "Sag Text" +#define TR_PLAY_TRACK TR("Ply Trk", "Sag Text") #define TR_PLAY_VALUE "Sag Wert" #define TR_SF_HAPTIC "Haptik" -#define TR_SF_PLAY_SCRIPT "Lua Skript" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Skript") #define TR_SF_BG_MUSIC "StartMusik" #define TR_SF_BG_MUSIC_PAUSE "Stop Musik" #define TR_SF_LOGS "SD-Aufz." diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index f1ff657ef60..67bebf90247 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -96,10 +96,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Play Sound" -#define TR_PLAY_TRACK "Play Track" +#define TR_PLAY_TRACK TR("Ply Trk", "Play Track") #define TR_PLAY_VALUE TR("Play Val","Play Value") #define TR_SF_HAPTIC "Haptic" -#define TR_SF_PLAY_SCRIPT "Lua Script" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script") #define TR_SF_BG_MUSIC "BgMusic" #define TR_SF_BG_MUSIC_PAUSE "BgMusic ||" #define TR_SF_LOGS "SD Logs" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index a0bf0773934..0b8b36d342e 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -98,10 +98,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Oir sonido" -#define TR_PLAY_TRACK "Oir pista" +#define TR_PLAY_TRACK TR("Ply Trk", "Oir pista") #define TR_PLAY_VALUE "Oir valor" #define TR_SF_HAPTIC "Haptic" -#define TR_SF_PLAY_SCRIPT "Lua Script" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script") #define TR_SF_BG_MUSIC "BgMúsica" #define TR_SF_BG_MUSIC_PAUSE "BgMúsica||" #define TR_SF_LOGS "SD Logs" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index afd546acac3..f60d713b57b 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -103,10 +103,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Play Sound" -#define TR_PLAY_TRACK "Play Track" +#define TR_PLAY_TRACK TR("Ply Trk", "Play Track") #define TR_PLAY_VALUE TR("Play Val","Play Value") #define TR_SF_HAPTIC "Haptic" -#define TR_SF_PLAY_SCRIPT "Lua Script" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script") #define TR_SF_BG_MUSIC "BgMusic" #define TR_SF_BG_MUSIC_PAUSE "BgMusic ||" #define TR_SF_LOGS "SD Logs" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index f00e329a2f4..d8d92b025a1 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -102,10 +102,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Jouer son" -#define TR_PLAY_TRACK "Jouer fichier" +#define TR_PLAY_TRACK TR("Ply Trk", "Jouer fichier") #define TR_PLAY_VALUE "Lire valeur" #define TR_SF_HAPTIC "Vibreur" -#define TR_SF_PLAY_SCRIPT "Script Lua" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Script Lua") #define TR_SF_BG_MUSIC "Musique" #define TR_SF_BG_MUSIC_PAUSE "Pause Musique" #define TR_SF_LOGS "Logs SD" diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index 4bd9258e53f..adc57abb903 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -98,16 +98,15 @@ #define TR_SF_MOD_BIND "ModuleBind" #define TR_SOUND "Play Sound" -#define TR_PLAY_TRACK "Play Track" +#define TR_PLAY_TRACK TR("Ply Trk", "Play Track") #define TR_PLAY_VALUE TR("Play Val","Play Value") #define TR_SF_HAPTIC "Haptic" -#define TR_SF_PLAY_SCRIPT "Lua Script" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script") #define TR_SF_BG_MUSIC "BgMusic" #define TR_SF_BG_MUSIC_PAUSE "BgMusic ||" #define TR_SF_LOGS "SD Logs" #define TR_ADJUST_GVAR "Adjust" #define TR_SF_BACKLIGHT "Backlight" -#define TR_SF_PLAY_SCRIPT "Lua Script" #define TR_SF_VARIO "Vario" #define TR_SF_TEST "Test" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index c1c4f4cac37..8b96b070877 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -101,10 +101,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Suona" -#define TR_PLAY_TRACK "Suona Traccia" +#define TR_PLAY_TRACK TR("Ply Trk", "Suona Traccia") #define TR_PLAY_VALUE TR("LeggiVal","Leggi Valore") #define TR_SF_HAPTIC "Vibrazione" -#define TR_SF_PLAY_SCRIPT "Script Lua" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Script Lua") #define TR_SF_BG_MUSIC "Musica Sf" #define TR_SF_BG_MUSIC_PAUSE "Musica Sf ||" #define TR_SF_LOGS "Logs SDCard" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 4636ce60d10..af2e8cb5cab 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -99,7 +99,7 @@ #define TR_PLAY_TRACK "音源再生" #define TR_PLAY_VALUE TR("Play Val","再生値") #define TR_SF_HAPTIC "バイブレート" -#define TR_SF_PLAY_SCRIPT "LUAスクリプト" +#define TR_SF_PLAY_SCRIPT TR("Lua", "LUAスクリプト") #define TR_SF_BG_MUSIC "BGM再生" #define TR_SF_BG_MUSIC_PAUSE "BGM一時停止" #define TR_SF_LOGS "SDログ出力" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 093beb2f651..199d661fe30 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -98,10 +98,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Geluid" -#define TR_PLAY_TRACK "Play Track" +#define TR_PLAY_TRACK TR("Ply Trk", "Play Track") #define TR_PLAY_VALUE TR("Play Val","Play Value") #define TR_SF_HAPTIC "Haptic" -#define TR_SF_PLAY_SCRIPT "Lua Script" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua Script") #define TR_SF_BG_MUSIC "BgMusic" #define TR_SF_BG_MUSIC_PAUSE "BgMusic ||" #define TR_SF_LOGS "SD Logs" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 9c35bb6ca74..834d20e3699 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -97,10 +97,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "GrajDźwięk" -#define TR_PLAY_TRACK "GrajŚcieżk" +#define TR_PLAY_TRACK TR("Ply Trk", "GrajŚcieżk") #define TR_PLAY_VALUE TR("Graj Wart","GrajWartoś") #define TR_SF_HAPTIC "Wibracje" -#define TR_SF_PLAY_SCRIPT "SkryptyLua" +#define TR_SF_PLAY_SCRIPT TR("Lua", "SkryptyLua") #define TR_SF_BG_MUSIC "Muz. tła" #define TR_SF_BG_MUSIC_PAUSE "Muz. tła ||" #define TR_SF_LOGS "Logi->SD" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 75f5cd68eea..2984e5fe117 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -99,10 +99,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Tocar Som" -#define TR_PLAY_TRACK "Tocar Trilha" +#define TR_PLAY_TRACK TR("Ply Trk", "Tocar Trilha") #define TR_PLAY_VALUE TR("RepValor","Rep Valor") #define TR_SF_HAPTIC "Vibrar" -#define TR_SF_PLAY_SCRIPT "Script Lua" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Script Lua") #define TR_SF_BG_MUSIC "BgMusica" #define TR_SF_BG_MUSIC_PAUSE "BgMusica ||" #define TR_SF_LOGS "Logs SD" diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index 987c4a1b78b..dd322d86d6e 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -98,10 +98,10 @@ #define TR_SF_RGBLEDS "RGB" #define TR_SOUND "Играть звук" -#define TR_PLAY_TRACK "Играть трек" +#define TR_PLAY_TRACK TR("Ply Trk", "Играть трек") #define TR_PLAY_VALUE TR("Play Val","Play Value") #define TR_SF_HAPTIC "Вибро" -#define TR_SF_PLAY_SCRIPT "Lua скрипт" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua скрипт") #define TR_SF_BG_MUSIC "Муз. фон" #define TR_SF_BG_MUSIC_PAUSE "Муз. ||" #define TR_SF_LOGS "SD логи" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 33292f3876a..86897a2794a 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -107,10 +107,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "Spela ljud" -#define TR_PLAY_TRACK "Spela upp" +#define TR_PLAY_TRACK TR("Ply Trk", "Spela upp") #define TR_PLAY_VALUE "Säg värdet" #define TR_SF_HAPTIC "Haptisk" -#define TR_SF_PLAY_SCRIPT "Lua-skript" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua-skript") #define TR_SF_BG_MUSIC "Musik" #define TR_SF_BG_MUSIC_PAUSE "Pausa Musik" #define TR_SF_LOGS "Logga data" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 9dd37119377..5513a2201df 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -97,10 +97,10 @@ #define TR_SF_RGBLEDS "RGB leds" #define TR_SOUND "播放聲音" -#define TR_PLAY_TRACK "播放音頻文件" +#define TR_PLAY_TRACK TR("Ply Trk", "播放音頻文件") #define TR_PLAY_VALUE "播放數值" #define TR_SF_HAPTIC "振動" -#define TR_SF_PLAY_SCRIPT "Lua腳本" +#define TR_SF_PLAY_SCRIPT TR("Lua", "Lua腳本") #define TR_SF_BG_MUSIC "播放背景音樂" #define TR_SF_BG_MUSIC_PAUSE "暫停背景音樂" #define TR_SF_LOGS "記錄日誌到SD卡"