From 1284ed20514d2b769ea9d764114c52b8725d0002 Mon Sep 17 00:00:00 2001 From: "bernet.andre@gmail.com" Date: Tue, 19 Mar 2013 23:15:00 +0000 Subject: [PATCH] Translation files updated --- src/translations/cz.h | 18 +++++++++--------- src/translations/de.h | 24 ++++++++++++------------ src/translations/en.h | 4 ++-- src/translations/es.h | 18 ++++++++++-------- src/translations/fr.h | 36 ++++++++++++++++++++++++++---------- src/translations/it.h | 20 +++++++++++--------- src/translations/pt.h | 18 ++++++++++-------- src/translations/se.h | 18 ++++++++++-------- src/x9d/board_x9d.h | 2 +- 9 files changed, 91 insertions(+), 67 deletions(-) diff --git a/src/translations/cz.h b/src/translations/cz.h index e166a9406..71f06ce97 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -54,6 +54,9 @@ #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") + #define LEN_VTRIMINC "\007" #define TR_VTRIMINC "Expo\0 ""ExJemn\212""Jemn\212\0 ""St\206edn\204""Hrub\212\0 " @@ -313,18 +316,15 @@ #define INDENT_WIDTH (FW/2) #if defined(PCBX9D) - #define TR_POPUPS "[ENTER]\010[EXIT]" - #define OFS_EXIT 7 + #define TR_ENTER "[ENTER]" #else - #define TR_POPUPS "[MENU]\010[EXIT]" - #define OFS_EXIT 6 + #define TR_ENTER "[MENU]" #endif -#if defined(PCBX9D) - #define TR_MENUWHENDONE CENTER"\005[ENTER] > DAL\207\214" -#else - #define TR_MENUWHENDONE CENTER"\007[MENU] > DAL\207\214" -#endif +#define TR_POPUPS TR_ENTER"\010[EXIT]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER"\007"TR_ENTER" > DAL\207\214" #define TR_FREE "voln\202:" #define TR_DELETEMODEL "SMAZAT MODEL" #define TR_COPYINGMODEL "Kop\204ruji model.." diff --git a/src/translations/de.h b/src/translations/de.h index 91711eb0e..459bec6d4 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -56,6 +56,9 @@ #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Expo. ""X-Fein""Fein ""Mittel""Grob " @@ -314,19 +317,16 @@ #define LEN_INDENT 1 #define INDENT_WIDTH (FW/2) -#define TR_ENTER "[MENU]" +#if defined(PCBX9D) + #define TR_ENTER "[ENTER]" +#else + #define TR_ENTER "[MENU]" +#endif -#if defined(PCBX9D) -#define TR_POPUPS "[ENTER]\010[EXIT]" -#else -#define TR_POPUPS "[MENU]\010[EXIT]" -#endif -#define OFS_EXIT 7 -#if defined(PCBX9D) - #define TR_MENUWHENDONE CENTER"\006[ENTER] > Weiter" -#else - #define TR_MENUWHENDONE CENTER"\006[MENU] > Weiter" -#endif +#define TR_POPUPS TR_ENTER"\010[EXIT]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" > Weiter" #define TR_FREE "frei" #define TR_DELETEMODEL "Modell l\203schen?" #define TR_COPYINGMODEL "Kopiere Modell" diff --git a/src/translations/en.h b/src/translations/en.h index cdd157dab..4803c86ca 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -330,9 +330,9 @@ #define INDENT_WIDTH (FW/2) #if defined(PCBX9D) - #define TR_ENTER "[ENTER]" + #define TR_ENTER "[ENTER]" #else - #define TR_ENTER "[MENU]" + #define TR_ENTER "[MENU]" #endif #define TR_POPUPS TR_ENTER"\010[EXIT]" diff --git a/src/translations/es.h b/src/translations/es.h index 079970330..572d3ee05 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -54,6 +54,9 @@ #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") + #define LEN_VTRIMINC TR("\006","\013") #define TR_VTRIMINC TR("Expo ""ExFino""Fino ""Medio ""Grueso","Exponencial""Extra Fino ""Fino ""Medio ""Grueso ") @@ -313,16 +316,15 @@ #define INDENT_WIDTH (FW/2) #if defined(PCBX9D) -#define TR_POPUPS "[INTRO]\010[SALIR]" + #define TR_ENTER "[ENTER]" #else -#define TR_POPUPS "[MENU]\010[SALIR]" -#endif -#define OFS_EXIT 7 -#if defined(PCBX9D) - #define TR_MENUWHENDONE CENTER"\006[INTRO]AL ACABAR" -#else - #define TR_MENUWHENDONE CENTER"\006[MENU]AL ACABAR" + #define TR_ENTER "[MENU]" #endif + +#define TR_POPUPS TR_ENTER"\010[SALIR]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER"\006"TR_ENTER"AL ACABAR" #define TR_FREE "libre" #define TR_DELETEMODEL "BORRAR MODELO" #define TR_COPYINGMODEL "Copiando modelo.." diff --git a/src/translations/fr.h b/src/translations/fr.h index 6bc0f4163..d6c3843e1 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -1,7 +1,21 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer * * open9x is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, @@ -54,6 +68,9 @@ #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0""Japon\0 ""Europe\0") + #define LEN_VTRIMINC TR("\006","\013") #define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") @@ -313,16 +330,15 @@ #define INDENT_WIDTH (FW/2) #if defined(PCBX9D) -#define TR_POPUPS "[ENTER]\010[EXIT]" + #define TR_ENTER "[ENTER]" #else -#define TR_POPUPS "[MENU]\010[EXIT]" -#endif -#define OFS_EXIT 7 -#if defined(PCBX9D) - #define TR_MENUWHENDONE CENTER"\005[ENTER] QUAND PRET" -#else - #define TR_MENUWHENDONE CENTER"\006[MENU] QUAND PRET" + #define TR_ENTER "[MENU]" #endif + +#define TR_POPUPS TR_ENTER"\010[EXIT]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" QUAND PRET" #define TR_FREE "disp" #define TR_DELETEMODEL "SUPPRIMER MODELE" #define TR_COPYINGMODEL "Copie..." @@ -403,8 +419,8 @@ #define TR_ALARMWARNING INDENT"Sons d\200sactiv\200s" #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLEREVERSE "Inversion gaz" -#define TR_MINUTEBEEP INDENT"Chaque minute" -#define TR_BEEPCOUNTDOWN TR(INDENT"Cpt. \202 rebours",INDENT"Compte \202 rebours") +#define TR_MINUTEBEEP TR(INDENT"Bip minute",INDENT"Chaque minute") +#define TR_BEEPCOUNTDOWN TR(INDENT"Bip rebours",INDENT"Compte \202 rebours") #define TR_BACKLIGHT_LABEL "R\200tro\200clairage" #define TR_BLDELAY INDENT"Dur\200e" #define TR_BLONBRIGHTNESS INDENT"Luminosit\200 ON" diff --git a/src/translations/it.h b/src/translations/it.h index 1132f732b..eb725d675 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -19,7 +19,7 @@ * GNU General Public License for more details. * */ - +// NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "OFF""ON\0" @@ -53,6 +53,9 @@ #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Exp ""ExFine""Fine ""Medio ""Ampio " @@ -312,16 +315,15 @@ #define INDENT_WIDTH (FW/2) #if defined(PCBX9D) -#define TR_POPUPS "[ENTER]\004[EXIT]" + #define TR_ENTER "[ENTER]" #else -#define TR_POPUPS "[MEN\200]\004[EXIT]" -#endif -#define OFS_EXIT 7 -#if defined(PCBX9D) - #define TR_MENUWHENDONE CENTER"\006[ENTER] Conferma" -#else - #define TR_MENUWHENDONE CENTER"\006[Men\200] Conferma" + #define TR_ENTER "[Men\200]" #endif + +#define TR_POPUPS TR_ENTER"\004[EXIT]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" Conferma" #define TR_FREE " Disp." #define TR_DELETEMODEL "Elimina modello?" #define TR_COPYINGMODEL "Copia in corso.." diff --git a/src/translations/pt.h b/src/translations/pt.h index 89572fcd5..f4b9d7c3a 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -32,6 +32,9 @@ #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Expo ""ExFino""Fino ""Medio ""Largo " @@ -291,16 +294,15 @@ #define INDENT_WIDTH (FW/2) #if defined(PCBX9D) -#define TR_POPUPS "[ENTER]\010[EXIT]" + #define TR_ENTER "[ENTER]" #else -#define TR_POPUPS "[MENU]\010[EXIT]" -#endif -#define OFS_EXIT 7 -#if defined(PCBX9D) - #define TR_MENUWHENDONE CENTER"\006[ENTER]QDO PRONTO" -#else - #define TR_MENUWHENDONE CENTER"\006[MENU]QDO PRONTO" + #define TR_ENTER "[MENU]" #endif + +#define TR_POPUPS TR_ENTER"\010[EXIT]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER"\006"TR_ENTER"QDO PRONTO" #define TR_FREE "Livre" #define TR_DELETEMODEL "EXCLUI MODELO" #define TR_COPYINGMODEL "Copiando modelo" diff --git a/src/translations/se.h b/src/translations/se.h index ef0b34f3e..f43e10cff 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -54,6 +54,9 @@ #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") + #define LEN_VTRIMINC TR("\006","\014") #define TR_VTRIMINC TR("Expo ""xFin ""Fin ""Medium""Grov ","Exponentiell""Extra Fin ""Fin ""Medium ""Grov ") @@ -313,16 +316,15 @@ #define INDENT_WIDTH (FW/2) #if defined(PCBX9D) -#define TR_POPUPS "[ENTER]\010[EXIT]" + #define TR_ENTER "[ENTER]" #else -#define TR_POPUPS "[MENU]\010[EXIT]" -#endif -#define OFS_EXIT 7 -#if defined(PCBX9D) - #define TR_MENUWHENDONE CENTER"\006[ENTER] Avslutar " -#else - #define TR_MENUWHENDONE CENTER"\006[MENU] Avslutar " + #define TR_ENTER "[MENU]" #endif + +#define TR_POPUPS TR_ENTER"\010[EXIT]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" Avslutar " #define TR_FREE "kvar" #define TR_DELETEMODEL "Radera Modell" #define TR_COPYINGMODEL "Kopierar Modell " diff --git a/src/x9d/board_x9d.h b/src/x9d/board_x9d.h index 4cdb1683a..de3a8e2f5 100644 --- a/src/x9d/board_x9d.h +++ b/src/x9d/board_x9d.h @@ -88,7 +88,7 @@ uint8_t usbPlugged(void); void delaysInit(); #define DEBUG_UART_BAUDRATE 115200 -#define SPORT_BAUDRATE 9600 +#define SPORT_BAUDRATE 57600 void uartInit(uint32_t baudrate); void uartPutc(const char c);