From 2a9d5d4778e7bd1635e93e28efcf16e80d458791 Mon Sep 17 00:00:00 2001 From: Jacek Drewniak Date: Sun, 2 Feb 2014 00:32:39 +0100 Subject: [PATCH 1/3] Fixes --- radio/src/translations/pl.h.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 82c6f47c9..27f401f64 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -60,22 +60,22 @@ #define TR_VRENAVIG "Ne REaREb" #define LEN_VBLMODE TR("\006", "\011") -#define TR_VBLMODE TR("Wył\0 ""Przyc.""Drążki""Oba\0 ""Zał\0 ", "Wyłaczone""Przyciski""Drązki\0 ""Oba\0 ""Włączyć\0 ") +#define TR_VBLMODE TR("Wył\0 ""Przyc.""Drążki""Oba\0 ""Zał\0 ", "Wyłączone""Przyciski""Drązki\0 ""Oba\0 ""Włączyć\0 ") #define LEN_TRNMODE "\003" #define TR_TRNMODE " X "" +="" :=" #define LEN_TRNCHN "\003" -#define TR_TRNCHN "CH1CH2CH3CH4" +#define TR_TRNCHN "KN1KN2KN3KN4" #define LEN_UART3MODES "\017" -#define TR_UART3MODES "OFF\0 ""SPORT Mirror\0 ""Virtual SP2UART" +#define TR_UART3MODES "WYŁ\0 ""SPORT Mirror\0 ""Wirtualny SP2UART" #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" +#define TR_POTTYPES "Potencj.\0 ""Prz.Wielopoz " #define LEN_DATETIME "\006" -#define TR_DATETIME "DANA:""Czas:\0 " +#define TR_DATETIME "DATA:""CZAS:\0 " #define LEN_VLCD "\006" #define TR_VLCD "Normal""Optrex" @@ -683,8 +683,8 @@ #define TR_PERSISTENT_MAH INDENT "Zapisz mAh" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Port szreg." -#define TR_POT1TYPE "Typ P1" -#define TR_POT2TYPE "Typ P2" +#define TR_POT1TYPE "Typ S1" +#define TR_POT2TYPE "Typ S2" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" From e1aba1bc1cf1a3b35abbf00181441331a57d7e81 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sun, 2 Feb 2014 12:14:30 +0100 Subject: [PATCH 2/3] Fixes fixed --- radio/src/translations/pl.h.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 27f401f64..23c962ba7 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -68,14 +68,14 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "KN1KN2KN3KN4" -#define LEN_UART3MODES "\017" -#define TR_UART3MODES "WYŁ\0 ""SPORT Mirror\0 ""Wirtualny SP2UART" +#define LEN_UART3MODES "\021" +#define TR_UART3MODES "WYŁ\0 ""SPORT Mirror\0 ""Wirtualny SP2UART" #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Potencj.\0 ""Prz.Wielopoz " +#define TR_POTTYPES "Potencj.\0 ""Prz.Wielopoz\0 " #define LEN_DATETIME "\006" -#define TR_DATETIME "DATA:""CZAS:\0 " +#define TR_DATETIME "DATA:\0""CZAS:\0" #define LEN_VLCD "\006" #define TR_VLCD "Normal""Optrex" From 6509a5a66e926e6f091fa3ba359a04b00ad9f032 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Mon, 3 Feb 2014 10:17:09 +0100 Subject: [PATCH 3/3] Conflict resolved the wrong way --- radio/src/translations/pl.h.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 94f95686d..9a5f09488 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -68,8 +68,8 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "KN1KN2KN3KN4" -#define LEN_UART3MODES "\021" -#define TR_UART3MODES "Wyłącz\0 ""S-Port Mirror\0 ""Virtual SP2UART" +#define LEN_UART3MODES "\017" +#define TR_UART3MODES "Wyłącz\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" #define TR_POTTYPES "Potencjometr\0 ""Przeł.Wielopoz."