From 90e24747302ced590f9f523cd11ef34287dec311 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Thu, 26 Oct 2023 03:32:15 +0300 Subject: [PATCH 1/2] Language updates Some string shortening --- src/language.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/language.h b/src/language.h index 90acffa..0e05b42 100644 --- a/src/language.h +++ b/src/language.h @@ -905,7 +905,7 @@ static const char* const myLanguage[18][207] = { "Απαλοιφή θορύβου FM", // 65 "Οι προεπιλογές φορτώθηκαν", // 66 "Έξοδος ήχου", // 67 - "Συντονισμός κατά την προστασία οθόνης", // 68 + "Συντονισμός σε προστασία οθόνης", // 68 "Αναστροφή χρωμάτων οθόνης", // 69 "Πληροφορίες λογισμικού", // 70 "Κύριος κώδικας:", // 71 @@ -931,9 +931,9 @@ static const char* const myLanguage[18][207] = { "Προστασία οθόνης", // 91 "Δευτ.", // 92 "ΠΙΕΣΤΕ BAND ΓΙΑ ΚΛΕΙΣΙΜΟ", // 93 - "1% φωτεινότητα", // 94 - "25% φωτεινότητα", // 95 - "50% φωτεινότητα", // 96 + "1% φωτεινή", // 94 + "25% φωτεινή", // 95 + "50% φωτεινή", // 96 "AM Ολίσθηση επιπέδου RF:", // 97 "Μονάδα μέτρησης σήματος:", // 98 "Χρήση AF:", // 99 @@ -3413,13 +3413,13 @@ static const char* const myLanguage[18][207] = { "Atenuador de ruido FM", // 65 "Carga de configuración predeterminada", // 66 "Salida de audio", // 67 - "Sintonización durante el protector de pantalla", // 68 + "Sintonización durante el protector", // 68 "Invertir pantalla", // 69 "Acerca del software", // 70 "Código principal:", // 71 "Colaboradores:", // 72 "Desconocido", // 73 - "Screensaver options", // 74 + "Opciones de protector de pantalla", // 74 "Temporizador de tiempo muerto", // 75 "Apagar pantalla", // 76 "Tema", // 77 @@ -3524,7 +3524,7 @@ static const char* const myLanguage[18][207] = { "Buffering de RT", // 176 "Configuración principal", // 177 "Configuración de audio", // 178 - "Configuración de pantalla", // 179 + "Configuración de visualización", // 179 "Configuración de RDS", // 180 "Configuración de FM", // 181 "Configuración de AM", // 182 @@ -3536,7 +3536,7 @@ static const char* const myLanguage[18][207] = { "Contador de detección de co-canal", // 188 "PRINCIPAL", // 189 "AUDIO", // 190 - "PANTALLA", // 191 + "VISUALIZACIÓN", // 191 "RDS", // 192 "FM", // 193 "AM", // 194 @@ -3551,7 +3551,7 @@ static const char* const myLanguage[18][207] = { "PS rápido", // 203 "Aplicaciones detectadas", // 204 "Min.", // 205 - "Velocidad de SPI dinámica" // 206 + "Velocidad de SPI" // 206 }, { "Português", // Portuguese @@ -3579,8 +3579,8 @@ static const char* const myLanguage[18][207] = { "Definir borda da faixa baixa", // 22 "Definir borda da faixa alta", // 23 "Definir deslocamento de nível", // 24 - "Definir limiar de separação estéreo", // 25 - "Definir frequência do canto de corte alto", // 26 + "Limiar de separação estéreo", // 25 + "Frequência do canto de corte alto", // 26 "Definir limiar de corte alto", // 27 "Definir limiar de nível baixo", // 28 "Definir brilho da tela", // 29 @@ -3595,7 +3595,7 @@ static const char* const myLanguage[18][207] = { "Mostrar erros RDS", // 38 "Idioma", // 39 "Escolha o idioma", // 40 - "PRESSIONE O MODO PARA SAIR E SALVAR", // 41 + "PRESSIONE O MODE PARA SAIR E SALVAR", // 41 "Ligado", // 42 "Silenciamento suave FM", // 43 "Silenciamento suave AM", // 44 @@ -3622,7 +3622,7 @@ static const char* const myLanguage[18][207] = { "Supressor de ruído FM", // 65 "Padrões carregados", // 66 "Saída de áudio", // 67 - "Ajuste durante a proteção de tela", // 68 + "Sintonização com proteção de tela", // 68 "Inverter a tela", // 69 "Sobre o software", // 70 "Código principal:", // 71 @@ -3641,9 +3641,9 @@ static const char* const myLanguage[18][207] = { "Sakura", // 84 "Branco total", // 85 "NÃO POSSÍVEL", // 86 - "Nenhum AF disponível", // 87 - "Nenhum EON disponível", // 88 - "Nenhum RT+ disponível", // 89 + "AF não disponível", // 87 + "EON não disponível", // 88 + "RT+ não disponível", // 89 "Passo padrão FM", // 90 "Proteção de tela", // 91 "Segundos", // 92 @@ -3663,7 +3663,7 @@ static const char* const myLanguage[18][207] = { "OIRT", // 106 "Rotativo enquanto a tela está desligada", // 107 "Seletor de modelo", // 108 - "Base (ILI9341)", // 109 + "Básico (ILI9341)", // 109 "Portátil (ILI9341)", // 110 "Toque portátil (ILI9341)", // 111 "Título", // 112 @@ -3733,7 +3733,7 @@ static const char* const myLanguage[18][207] = { "Buffering RT", // 176 "Configurações principais", // 177 "Configurações de áudio", // 178 - "Configurações de tela", // 179 + "Configurações de exibição", // 179 "Configurações RDS", // 180 "Configurações FM", // 181 "Configurações AM", // 182 From 281e2945e6c9217aab08eb040735a1cabd9e4357 Mon Sep 17 00:00:00 2001 From: MCelliotG Date: Thu, 26 Oct 2023 03:43:53 +0300 Subject: [PATCH 2/2] Add space after Default on SPI speed selection --- src/gui.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui.cpp b/src/gui.cpp index d653c2d..0de7675 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -393,7 +393,7 @@ void BuildMenu() { case PORTABLE_TOUCH_ILI9341: tftPrint(1, myLanguage[language][111], 310, ITEM1 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; } - if (spispeed == SPI_SPEED_DEFAULT) tftPrint(1, myLanguage[language][78] + String(SPI_FREQUENCY / 1000000, DEC), 270, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); + if (spispeed == SPI_SPEED_DEFAULT) tftPrint(1, myLanguage[language][78] + " " + String(SPI_FREQUENCY / 1000000, DEC), 270, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, String(spispeed * 10 , DEC), 270, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); if (touchrotating) tftPrint(1, myLanguage[language][42], 310, ITEM2 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM2 + 6, PrimaryColor, PrimaryColorSmooth, 16); @@ -895,13 +895,13 @@ void MenuUp() { break; case ITEM3: - if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, BackgroundColor, BackgroundColor, 28); + if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + " " + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, BackgroundColor, BackgroundColor, 28); else tftPrint(0, String(spispeed * 10 , DEC) + " Mhz", 155, 118, BackgroundColor, BackgroundColor, 28); spispeed++; if (spispeed > SPI_SPEED_COUNT - 1) spispeed = 0; - if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); + if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + " " + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, String(spispeed * 10 , DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); if (spispeed == SPI_SPEED_DEFAULT) SPI.setFrequency(SPI_FREQUENCY); else SPI.setFrequency(spispeed * 1000000); @@ -1446,13 +1446,13 @@ void MenuDown() { if (touchrotating) tftPrint(0, myLanguage[language][42], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case ITEM3: - if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, BackgroundColor, BackgroundColor, 28); + if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + " " + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, BackgroundColor, BackgroundColor, 28); else tftPrint(0, String(spispeed * 10 , DEC) + " Mhz", 155, 118, BackgroundColor, BackgroundColor, 28); spispeed--; if (spispeed > SPI_SPEED_COUNT - 1) spispeed = SPI_SPEED_COUNT - 1; - if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); + if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + " " + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, String(spispeed * 10 , DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); if (spispeed == SPI_SPEED_DEFAULT) SPI.setFrequency(SPI_FREQUENCY); else SPI.setFrequency(spispeed * 1000000); @@ -2057,7 +2057,7 @@ void DoMenu() { case ITEM3: tftPrint(0, myLanguage[language][206], 155, 78, ActiveColor, ActiveColorSmooth, 28); - if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); + if (spispeed == SPI_SPEED_DEFAULT) tftPrint(0, myLanguage[language][78] + " " + String(SPI_FREQUENCY / 1000000, DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, String(spispeed * 10 , DEC) + " Mhz", 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; @@ -2420,4 +2420,4 @@ void DoMenu() { menuopen = false; BuildMenu(); } -} \ No newline at end of file +}