From c762e1bf6504a3c15bf852825c720d241aaafaa8 Mon Sep 17 00:00:00 2001 From: "bernet.andre@gmail.com" Date: Sun, 19 May 2013 22:47:08 +0000 Subject: [PATCH] No data reset with EXIT when menus are enabled --- src/gui/view_main.cpp | 2 ++ src/translations/fr.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/view_main.cpp b/src/gui/view_main.cpp index 7a89c011f..90c2f314b 100644 --- a/src/gui/view_main.cpp +++ b/src/gui/view_main.cpp @@ -600,10 +600,12 @@ void menuMainView(uint8_t event) AUDIO_KEYPAD_UP(); break; +#if !defined(NAVIGATION_MENUS) case EVT_KEY_LONG(KEY_EXIT): resetAll(); AUDIO_KEYPAD_UP(); break; +#endif } { diff --git a/src/translations/fr.h b/src/translations/fr.h index 0e1765af5..6028e2e6e 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -416,8 +416,8 @@ #define TR_MULTPX "Op\200ration" #define TR_DELAYDOWN "Retard bas" #define TR_DELAYUP "Retard haut" -#define TR_SLOWDOWN "Ralenti haut" -#define TR_SLOWUP "Ralenti bas" +#define TR_SLOWDOWN "Ralenti bas" +#define TR_SLOWUP "Ralenti haut" #define TR_MIXER "MIXEUR" #define TR_CV "CB" #define TR_GV "VG"