From 96c64f2895747b6aa0e62e182bd8c82d3092f2ea Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 21 Mar 2016 23:51:45 +0100 Subject: [PATCH] Add german translations for multi module (Also fix C++11 suffix error when compiling on OS X/clang) --- radio/src/translations/de.h.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index dc6f304a7..cd1ad18e1 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -743,12 +743,11 @@ #define TR_CAL "Kal." #define TR_VTRIM "Trim - +" #define TR_BG "BG:" -<<<<<<< HEAD #if defined(PCBHORUS) #define TR_MENUTOSTART "Press [Enter] to start" #define TR_SETMIDPOINT "Center sticks/pots/sliders and press [Enter]" #define TR_MOVESTICKSPOTS "Move sticks, pots and sliders and press [Enter]" -#if defined(COLORLCD) +#elif defined(COLORLCD) #define TR_MENUTOSTART CENTER"\007" TR_ENTER " zum Start" #define TR_SETMIDPOINT CENTER"\002Knüppel+Potis auf Mitte" #define TR_MOVESTICKSPOTS CENTER"\003Knüppel+Potis bewegen"