From 05db343a6d942060684c58ac14d9dc067706b238 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 7 Jul 2025 10:55:49 +0200 Subject: [PATCH] chore: cleanup TR_ENTER translation (#6423) --- radio/src/translations/cn.h | 6 ++---- radio/src/translations/cz.h | 6 ++---- radio/src/translations/da.h | 6 ++---- radio/src/translations/de.h | 6 ++---- radio/src/translations/en.h | 6 ++---- radio/src/translations/es.h | 6 ++---- radio/src/translations/fi.h | 6 ++---- radio/src/translations/fr.h | 6 ++---- radio/src/translations/he.h | 6 ++---- radio/src/translations/it.h | 6 ++---- radio/src/translations/jp.h | 6 ++---- radio/src/translations/ko.h | 8 +++----- radio/src/translations/nl.h | 8 +++----- radio/src/translations/pl.h | 6 ++---- radio/src/translations/pt.h | 6 ++---- radio/src/translations/tw.h | 7 ++----- radio/src/translations/ua.h | 8 +++----- 17 files changed, 37 insertions(+), 72 deletions(-) diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 6ba0cd1c7..1dc61af26 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -229,12 +229,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 1279d9355..81da444b3 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -241,12 +241,10 @@ #endif #endif -#if defined(PCBTARANIS) || defined(PCBHORUS) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[DALŠÍ]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index c3a5d30cc..fe1312fd5 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -235,12 +235,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NÆSTE]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 0c71e48fe..b1d535a5b 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -232,12 +232,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 7b80baf84..88b896e8f 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -232,12 +232,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 861365cbf..a4672b1ab 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -228,12 +228,10 @@ #endif #endif -#if defined(PCBTARANIS) || defined(PCBHORUS) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 043b0cdaf..b958c4bf9 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -237,12 +237,10 @@ #endif #endif -#if defined(PCBTARANIS) || defined(PCBHORUS) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 605bee379..05a1b6ae3 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -237,12 +237,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[SUIVANT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index ea751fea0..b4073c65a 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -236,12 +236,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index b5ee48496..42fafb809 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -232,12 +232,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 86a19394c..4456a4d44 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -231,12 +231,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/ko.h b/radio/src/translations/ko.h index ec333d578..96238ab50 100644 --- a/radio/src/translations/ko.h +++ b/radio/src/translations/ko.h @@ -235,12 +235,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) - #define TR_ENTER "[NEXT]" +#if defined(PCBNV14) || defined(PCBPL18) + #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 623978194..b412217f1 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -229,12 +229,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) - #define TR_ENTER "[NEXT]" +#if defined(PCBNV14) || defined(PCBPL18) + #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 88fedd786..95763b07c 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -228,12 +228,10 @@ #endif #endif -#if defined(PCBTARANIS) || defined(PCBHORUS) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(PCBHORUS) diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 76cc03fe5..ec4a4721f 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -235,12 +235,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif defined(PCBNV14) || defined(PCBPL18) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif #if defined(COLORLCD) diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index f601cdc4c..7ccc85209 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -234,14 +234,11 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" -#elif !defined(HARDWARE_KEYS) +#if defined(PCBNV14) || defined(PCBPL18) #define TR_ENTER "[NEXT]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[ENTER]" #endif - #if defined(COLORLCD) #define TR_EXIT "RTN" #define TR_OK TR_ENTER diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index 07ae6c1f7..66abb60fc 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -234,12 +234,10 @@ #endif #endif -#if defined(PCBFRSKY) - #define TR_ENTER "[ENTER]" /* use english */ -#elif defined(PCBNV14) - #define TR_ENTER "[NEXT]" /* use english */ +#if defined(PCBNV14) || defined(PCBPL18) + #define TR_ENTER "[NEXT]" /* use english */ #else - #define TR_ENTER "[MENU]" /* use english */ + #define TR_ENTER "[ENTER]" /* use english */ #endif #if defined(COLORLCD)