From f00d5d9417964487fc61376c605c95b9b44c3d06 Mon Sep 17 00:00:00 2001 From: Benjamin Boy Date: Fri, 23 Sep 2016 13:58:53 +0200 Subject: [PATCH 1/4] Update tts_de.py Translated crow to "Butterfly", changed filenames accordingly to the english ones so its possible to change from english to german without the need of editing the Special Functions section per model. Removed "Minimale Trimmung", in my opinion this makes no sense a trim only can be at maximum or at center. --- radio/util/tts_de.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/radio/util/tts_de.py b/radio/util/tts_de.py index c65653924..cdbb55f86 100755 --- a/radio/util/tts_de.py +++ b/radio/util/tts_de.py @@ -50,8 +50,8 @@ for s, f, a in [(u"Inaktivitätsalarm", "inactiv", 486), (u"Fehler", "error", NO_ALTERNATE), (u"Trim zentriert", "midtrim", 495), (u"Poti zentriert", "midpot", 496), - (u"Maximale Trimmung erreicht", "maxtrim", NO_ALTERNATE), - (u"Minimale Trimmung erreicht", "mintrim", NO_ALTERNATE), + (u"Maximale Trimmung erreicht", "endtrim", NO_ALTERNATE), + # (u"Minimale Trimmung erreicht", "mintrim", NO_ALTERNATE), this makes no sense (u"20 Sekunden", "timer20", 500), (u"30 Sekunden", "timer30", 501), (u"Senderstrom zu hoch!", "highmah", NO_ALTERNATE), @@ -82,27 +82,27 @@ for i, (s, f) in enumerate([(u"Fahrwerk eingezogen", "gearup"), (u"Fahrwerk ausgefahren", "geardn"), (u"Klappen eingefahren", "flapup"), (u"Klappen ausgefahren", "flapdn"), - (u"Landung", "attero"), + (u"Landung", "lnding"), (u"Trainer-Modus ein", "trnon"), (u"Trainer-Modus aus", "trnoff"), (u"Motor aus", "engoff"), (u"Motor an", "engon"), (u"zu hoch", "tohigh"), (u"zu niedrig", "tolow"), - (u"Batterie schwach", "lowbat"), - (u"crow ein", "crowon"), - (u"crow aus", "crowof"), - (u"Geschwindigkeits-Modus ist aktiviert", "spdmod"), - (u"Thermik-Modus ist aktiviert", "thmmod"), - (u"Normal-Modus ist aktiviert", "nrmmod"), - (u"Flugmodus 1", "fltmd1"), - (u"Flugmodus 2", "fltmd2"), - (u"Flugmodus 3", "fltmd3"), - (u"Flugmodus 4", "fltmd4"), - (u"Flugmodus 5", "fltmd5"), - (u"Flugmodus 6", "fltmd6"), - (u"Flugmodus 7", "fltmd7"), - (u"Flugmodus 8", "fltmd8"), - (u"Flugmodus 9", "fltmd9"), + (u"Batterie schwach", "lowbatt"), + (u"Butterfly ein", "crowon"), + (u"Butterfly aus", "crowof"), + (u"Geschwindigkeits-Modus ist aktiviert", "fm-spd"), + (u"Thermik-Modus ist aktiviert", "fm-thm"), + (u"Normal-Modus ist aktiviert", "fm-nrm"), + (u"Flugmodus 1", "fm-1"), + (u"Flugmodus 2", "fm-2"), + (u"Flugmodus 3", "fm-3"), + (u"Flugmodus 4", "fm-4"), + (u"Flugmodus 5", "fm-5"), + (u"Flugmodus 6", "fm-6"), + (u"Flugmodus 7", "fm-7"), + (u"Flugmodus 8", "fm-8"), + (u"Flugmodus 9", "fm-9"), ]): sounds.append((s, filename(f, PROMPT_CUSTOM_BASE + i))) From 069576515de2b59c76c6cd70d7af61f9df2bc9ab Mon Sep 17 00:00:00 2001 From: Benjamin Boy Date: Mon, 26 Sep 2016 14:24:48 +0200 Subject: [PATCH 2/4] Update tts_de.py --- radio/util/tts_de.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/util/tts_de.py b/radio/util/tts_de.py index cdbb55f86..2378fe79e 100755 --- a/radio/util/tts_de.py +++ b/radio/util/tts_de.py @@ -51,7 +51,7 @@ for s, f, a in [(u"Inaktivitätsalarm", "inactiv", 486), (u"Trim zentriert", "midtrim", 495), (u"Poti zentriert", "midpot", 496), (u"Maximale Trimmung erreicht", "endtrim", NO_ALTERNATE), - # (u"Minimale Trimmung erreicht", "mintrim", NO_ALTERNATE), this makes no sense + (u"Maximale Trimmung erreicht", "mintrim", NO_ALTERNATE), this makes no sense (u"20 Sekunden", "timer20", 500), (u"30 Sekunden", "timer30", 501), (u"Senderstrom zu hoch!", "highmah", NO_ALTERNATE), From 33608b3eb2f42c605669999ab6ea7c8d640c4098 Mon Sep 17 00:00:00 2001 From: Benjamin Boy Date: Mon, 26 Sep 2016 15:55:12 +0200 Subject: [PATCH 3/4] Update tts_de.py Changed Endtrim and Mintrim to the same spoken words. --- radio/util/tts_de.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/util/tts_de.py b/radio/util/tts_de.py index 2378fe79e..2a0c8d65d 100755 --- a/radio/util/tts_de.py +++ b/radio/util/tts_de.py @@ -51,7 +51,7 @@ for s, f, a in [(u"Inaktivitätsalarm", "inactiv", 486), (u"Trim zentriert", "midtrim", 495), (u"Poti zentriert", "midpot", 496), (u"Maximale Trimmung erreicht", "endtrim", NO_ALTERNATE), - (u"Maximale Trimmung erreicht", "mintrim", NO_ALTERNATE), this makes no sense + (u"Maximale Trimmung erreicht", "mintrim", NO_ALTERNATE), (u"20 Sekunden", "timer20", 500), (u"30 Sekunden", "timer30", 501), (u"Senderstrom zu hoch!", "highmah", NO_ALTERNATE), From b95deeee9f5dc32f74e03c6299ebbcd2448ec4d0 Mon Sep 17 00:00:00 2001 From: Benjamin Boy Date: Mon, 26 Sep 2016 21:37:24 +0200 Subject: [PATCH 4/4] Update tts_de.py Final change for trims. --- radio/util/tts_de.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/util/tts_de.py b/radio/util/tts_de.py index 2a0c8d65d..93ce4ad53 100755 --- a/radio/util/tts_de.py +++ b/radio/util/tts_de.py @@ -50,8 +50,8 @@ for s, f, a in [(u"Inaktivitätsalarm", "inactiv", 486), (u"Fehler", "error", NO_ALTERNATE), (u"Trim zentriert", "midtrim", 495), (u"Poti zentriert", "midpot", 496), - (u"Maximale Trimmung erreicht", "endtrim", NO_ALTERNATE), - (u"Maximale Trimmung erreicht", "mintrim", NO_ALTERNATE), + (u"Obere Trimmungsgrenze erreicht", "maxtrim", NO_ALTERNATE), + (u"Untere Trimmungsgrenze erreicht", "mintrim", NO_ALTERNATE), (u"20 Sekunden", "timer20", 500), (u"30 Sekunden", "timer30", 501), (u"Senderstrom zu hoch!", "highmah", NO_ALTERNATE),