From f2dcecc0596b3c7a864f2e2360ed96f3d5b61953 Mon Sep 17 00:00:00 2001 From: "flyingframes.film@gmail.com" Date: Thu, 7 Jun 2012 20:43:44 +0000 Subject: [PATCH] Removed checkboxes from german translation graphics. New warning icon. --- src/asterisk.lbm | 10 ++++---- src/asterisk.xbm | 28 +++++++++++----------- src/translations/de.h | 46 ++++++++++++++++++++---------------- src/translations/font_de.lbm | 2 +- src/translations/font_de.xbm | 11 ++++----- 5 files changed, 51 insertions(+), 46 deletions(-) diff --git a/src/asterisk.lbm b/src/asterisk.lbm index dcd2243b3..7c7042d43 100644 --- a/src/asterisk.lbm +++ b/src/asterisk.lbm @@ -1,5 +1,5 @@ -27,32, -0xfc,0x04,0x04,0x04,0x04,0x04,0x04,0x84,0xc4,0x84,0x04,0xe4,0xf4,0xe4,0x04,0x84,0xc4,0xc4,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0xfc, -0xff,0x00,0x00,0x00,0xfc,0xfe,0x00,0xff,0xff,0xff,0x80,0xff,0xff,0xff,0x80,0xff,0xff,0xff,0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00,0xff, -0xff,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf8,0xfc,0xff,0x3f,0x0f,0x03,0x00,0x00,0xff, -0x3f,0x20,0x20,0x20,0x21,0x27,0x27,0x2f,0x2f,0x2f,0x2b,0x27,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x27,0x23,0x20,0x20,0x20,0x20,0x20,0x20,0x3f, +27,32, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xe0,0x78,0x1c,0x78,0xe0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xe0,0x78,0x1e,0x07,0x01,0xf8,0xfc,0xf8,0x01,0x07,0x1e,0x78,0xe0,0x80,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x80,0xe0,0x78,0x1e,0x07,0x01,0x00,0x00,0x00,0x00,0x3f,0x7f,0x3f,0x00,0x00,0x00,0x00,0x01,0x07,0x1e,0x78,0xe0,0x80,0x00,0x00, +0x18,0x3e,0x37,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x37,0x37,0x37,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x31,0x37,0x3e,0x18, diff --git a/src/asterisk.xbm b/src/asterisk.xbm index 894680c26..d6e01d3aa 100644 --- a/src/asterisk.xbm +++ b/src/asterisk.xbm @@ -1,14 +1,14 @@ -#define asterisk_width 27 -#define asterisk_height 32 -static unsigned char asterisk_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x07, - 0x01, 0x00, 0x00, 0x04, 0x01, 0x10, 0x00, 0x04, 0x01, 0x38, 0x00, 0x04, - 0x01, 0x39, 0x03, 0x04, 0x81, 0xbb, 0x03, 0x04, 0x81, 0xbb, 0x03, 0x04, - 0xa1, 0xbb, 0x03, 0x04, 0xb1, 0xbb, 0x03, 0x04, 0xb1, 0xbb, 0x03, 0x04, - 0xb1, 0xbb, 0x03, 0x04, 0xb1, 0xbb, 0x03, 0x04, 0xb1, 0xbb, 0x03, 0x04, - 0xb1, 0xff, 0xe3, 0x04, 0xf1, 0xff, 0xf3, 0x04, 0xf1, 0xff, 0xf3, 0x04, - 0xf1, 0xff, 0x7b, 0x04, 0xf1, 0xff, 0x7f, 0x04, 0xf1, 0xff, 0x3f, 0x04, - 0xf1, 0xff, 0x3f, 0x04, 0xf1, 0xff, 0x1f, 0x04, 0xf1, 0xff, 0x1f, 0x04, - 0xf1, 0xff, 0x0f, 0x04, 0xe1, 0xff, 0x0f, 0x04, 0xe1, 0xfb, 0x07, 0x04, - 0x81, 0xf7, 0x03, 0x04, 0x01, 0x00, 0x00, 0x04, 0xff, 0xff, 0xff, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +#define asterisk_width 27 +#define asterisk_height 32 +static unsigned char asterisk_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, + 0x00, 0x70, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, + 0x00, 0xd8, 0x00, 0x00, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x8c, 0x01, 0x00, + 0x00, 0x06, 0x03, 0x00, 0x00, 0x26, 0x03, 0x00, 0x00, 0x73, 0x06, 0x00, + 0x00, 0x73, 0x06, 0x00, 0x80, 0x71, 0x0c, 0x00, 0x80, 0x71, 0x0c, 0x00, + 0xc0, 0x70, 0x18, 0x00, 0xc0, 0x70, 0x18, 0x00, 0x60, 0x70, 0x30, 0x00, + 0x60, 0x70, 0x30, 0x00, 0x30, 0x70, 0x60, 0x00, 0x30, 0x70, 0x60, 0x00, + 0x18, 0x70, 0xc0, 0x00, 0x18, 0x20, 0xc0, 0x00, 0x0c, 0x00, 0x80, 0x01, + 0x0c, 0x70, 0x80, 0x01, 0x06, 0x70, 0x00, 0x03, 0x06, 0x70, 0x00, 0x03, + 0x03, 0x00, 0x00, 0x06, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/src/translations/de.h b/src/translations/de.h index 50856ffa8..e1937af28 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -1,6 +1,6 @@ // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" -#define TR_OFFON " \210 "" \211 " +#define TR_OFFON "AUS""AN\0" #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" @@ -15,13 +15,13 @@ #define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" #define LEN_VRENAVIG "\003" -#define TR_VRENAVIG "No REaREb" +#define TR_VRENAVIG "AUSREaREb" #define LEN_VFILTERADC "\004" #define TR_VFILTERADC "SING""OSMP""FILT" #define LEN_TRNMODE "\003" -#define TR_TRNMODE " \210 "" +="" :=" +#define TR_TRNMODE "AUS"" +="" :=" #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" @@ -45,15 +45,20 @@ #define LEN_VPROTOS "\006" #ifdef PXX -#define TR_PXX "PXX\0 " +#define TR_PXX "PXX\0 " #else -#define TR_PXX "[PXX]\0" +#define TR_PXX "[PXX]\0" #endif #ifdef DSM2 -#define TR_DSM2 "DSM2\0 " +#define TR_DSM2 "DSM2\0 " #else -#define TR_DSM2 "[DSM2]" +#define TR_DSM2 "[DSM2]" #endif +#ifdef IRPROTOS +#define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" +#else +#define TR_IRPROTOS +#endif #define TR_VPROTOS "PPM\0 ""PPM16\0""PPMsim" TR_PXX TR_DSM2 #define LEN_POSNEG "\003" @@ -80,7 +85,7 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS " \210 "" \211 ""Rud""Ele""Thr""Ail" +#define TR_VMIXTRIMS "AUS""AN ""Rud""Ele""Thr""Ail" #define LEN_VCSWFUNC "\007" #define TR_VCSWFUNC "----\0 ""v>ofs ""vofs""|v|v2 ""v1=v2 ""v1<=v2 " @@ -103,9 +108,9 @@ #endif #if defined(PCBV4) #if defined(SDCARD) -#define TR_SDCLOGS "SDCARD Logs " +#define TR_SDCLOGS "SDcard Logs " #else -#define TR_SDCLOGS "[SDCARD Logs]" +#define TR_SDCLOGS "[SDcard Logs]" #endif #if defined(SOMO) #define TR_PLAY_TRACK "Play Track\0 " @@ -118,6 +123,7 @@ #define TR_SDCLOGS #define TR_PLAY_TRACK #define TR_PLAY_VALUE + #endif #ifdef DEBUG #define TR_TEST "Test\0 " @@ -248,7 +254,7 @@ #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_INSERTMIX "INSERT MIX " -#define TR_EDITMIX "MISCHER " +#define TR_EDITMIX "MIXER " #define TR_SOURCE "Quelle" #define TR_WEIGHT "Gewicht" #define TR_MIXERWEIGHT "Mixer Weight" @@ -261,7 +267,7 @@ #define TR_CURVES "Kurven" #define TR_FPHASE "F.Phase" #define TR_MIXWARNING "Warnung" -#define TR_OFF "OFF" +#define TR_OFF "AUS" #define TR_MULTPX "Multpx" #define TR_DELAYDOWN "Verz. Unten" #define TR_DELAYUP "Verz. Oben" @@ -388,11 +394,11 @@ #define TR_BACKUP_MODEL "Modell Backup" #define TR_DELETE_MODEL "Modell L\203schen" // TODO merged into DELETEMODEL? #define TR_RESTORE_MODEL "Modell Restore" -#define TR_SDCARD_ERROR "SDCARD Error" -#define TR_NO_SDCARD "Keine SDCARD" -#define TR_WARNING "WARNUNG" -#define TR_EEPROMWARN "EEPROM" -#define TR_THROTTLEWARN "GAS" -#define TR_ALARMSWARN "ALARM" -#define TR_SWITCHWARN "SCHALTER" -#define TR_INVERT_THR "Invert Thr?" +#define TR_SDCARD_ERROR "SDcard Error" +#define TR_NO_SDCARD "Keine SDcard" +#define TR_WARNING "WARNUNG" +#define TR_EEPROMWARN "EEPROM" +#define TR_THROTTLEWARN "GAS" +#define TR_ALARMSWARN "ALARM" +#define TR_SWITCHWARN "SCHALTER" +#define TR_INVERT_THR "Invert Thr?" diff --git a/src/translations/font_de.lbm b/src/translations/font_de.lbm index 9efcf852d..b776fbfe8 100644 --- a/src/translations/font_de.lbm +++ b/src/translations/font_de.lbm @@ -1 +1 @@ -0x7c,0x13,0x12,0x13,0x7c,0x20,0x55,0x54,0x55,0x78,0x3c,0x43,0x42,0x43,0x3c,0x38,0x45,0x44,0x45,0x38,0x3e,0x41,0x40,0x41,0x3e,0x3c,0x41,0x40,0x21,0x7c,0x7e,0x01,0x49,0x56,0x20,0x00,0x02,0x05,0x02,0x00,0x7e,0x42,0x42,0x42,0x7e,0x6e,0x5e,0x6e,0x76,0x7a, +0x7c,0x13,0x12,0x13,0x7c,0x20,0x55,0x54,0x55,0x78,0x3c,0x43,0x42,0x43,0x3c,0x38,0x45,0x44,0x45,0x38,0x3e,0x41,0x40,0x41,0x3e,0x3c,0x41,0x40,0x21,0x7c,0x7e,0x01,0x49,0x56,0x20, diff --git a/src/translations/font_de.xbm b/src/translations/font_de.xbm index 308456ef1..c65590d32 100644 --- a/src/translations/font_de.xbm +++ b/src/translations/font_de.xbm @@ -1,8 +1,7 @@ -#define font_de_width 50 +#define font_de_width 35 #define font_de_height 8 static unsigned char font_de_bits[] = { - 0x4a, 0x29, 0xa5, 0x94, 0x21, 0x00, 0x00, 0x0e, 0x38, 0x10, 0x41, 0x52, - 0xff, 0x03, 0xd1, 0x45, 0x17, 0x63, 0x22, 0xf1, 0x01, 0x11, 0xc6, 0x18, - 0x63, 0x01, 0xf1, 0x02, 0xdf, 0xc7, 0x18, 0x63, 0x02, 0x51, 0x03, 0x31, - 0xc6, 0x18, 0x73, 0x04, 0xb1, 0x03, 0xd1, 0x3b, 0xe7, 0x6c, 0x03, 0xff, - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x4a, 0x29, 0xa5, 0x94, 0x01, 0x0e, 0x38, 0x10, 0x41, 0x02, 0xd1, 0x45, + 0x17, 0x63, 0x02, 0x11, 0xc6, 0x18, 0x63, 0x01, 0xdf, 0xc7, 0x18, 0x63, + 0x02, 0x31, 0xc6, 0x18, 0x73, 0x04, 0xd1, 0x3b, 0xe7, 0x6c, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00 };