CZ translations - Radio

Conflicts: radio/src/translations/cz.h.txt
2014-09-15 10:16:31 +02:00
parent f705adde02
commit 6306c9da27
1 changed files with 4 additions and 0 deletions
@@ -80,7 +80,11 @@
 #define TR_TRNCHN              "CH1CH2CH3CH4"

 #define LEN_UART3MODES         "\017"
+<<<<<<< HEAD
 #define TR_UART3MODES          "VYP\0           ""S-Port Mirror\0 ""Telemetrie\0    ""Trainer\0       ""Debug\0         "
+=======
+#define TR_UART3MODES          "VYP\0           ""S-Port Mirror\0 ""Telemetrie\0    ""Debug\0         "
+>>>>>>> 2073a1f... CZ translations - Radio

 #define LEN_POTTYPES           "\017"
 #define TR_POTTYPES            "Není\0          ""Pot s aretací\0 ""Vícepol. přep.\0""Potenciometr\0"