From 832ac1927b3b1b2957d51ec9bcfff65f4e6f1792 Mon Sep 17 00:00:00 2001 From: mhotar Date: Thu, 27 Feb 2014 12:01:38 +0100 Subject: [PATCH 1/5] delta character bitmaps --- radio/src/fonts/sqt5/font_05x07_avr.png | Bin 0 -> 995 bytes radio/src/fonts/std/font_05x07_avr.png | Bin 0 -> 636 bytes radio/src/fonts/std/font_05x07_extra.png | Bin 161 -> 184 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 radio/src/fonts/sqt5/font_05x07_avr.png create mode 100644 radio/src/fonts/std/font_05x07_avr.png diff --git a/radio/src/fonts/sqt5/font_05x07_avr.png b/radio/src/fonts/sqt5/font_05x07_avr.png new file mode 100644 index 0000000000000000000000000000000000000000..4843d8f6cb650721297fcffac67461c70a52fa5f GIT binary patch literal 995 zcmV<9104K`P)h(B?n9~^2IvMcC$lF{xu7BY1nb>hr%qNdZ4g1Dfc?AG$5Oz~MLKH+m zeX`9n5GV;z5Hj)e@Kz$RsTCorhhZfisR5dR^GFHHYoNdb>5y*qSZ!Rf&quz0@_3>jDy!aJ7GchjmVcjpW`~ z_r!}7NJ$6wLt&M8IWCfq zLv4NQ+vqD1&Nzshy=*n6oEB|z+ZLsXt9{S)NDd#F`ZiyPa};$_**}F?f}n+TO>R^a zQEELWb0ojM$)!n|xwpbw^c8aWl~>E^$_<5hl>&vLaCQF>vOft(`TSoQh~ssaG|ued zFg=um1*!*=gxpB#LC`V+@rT=$kTnP@+l>7m1uaFyZe^pB=rxEB+dRyV5o&WLo*bfg z&Y!vhmy2l$<+~p9Hb%2jV9+wpAx0=@^uMd~ zT*{B5+%sNF{e(agokCg5_He?P6R<5FlNUfW(4scT2h-9EIUM;N`eB)?@ejvby}9vM Rtt0>d002ovPDHLkV1mtU!*u`v literal 0 HcmV?d00001 diff --git a/radio/src/fonts/std/font_05x07_avr.png b/radio/src/fonts/std/font_05x07_avr.png new file mode 100644 index 0000000000000000000000000000000000000000..c95126af548eb8c3c9ba8353aeb953e06ad6af4b GIT binary patch literal 636 zcmV-?0)zdDP)cpX#2K`c|higuPMf&+bZTV z9FUoi_r_R>&0#jfK^cp?KE|RODyB0WkgeFbCTRPXihdyT$0wh}{huo284k++|No{K zY}m9VdQ1*eW*o1*$dEGgjOCnU2DX3a7}9p0;=Gm2z}g(gkhWE=AZ&`n;s0|P($*d* zoR$t0jb=!jd(LoLT0`5v`wUYU^t{5R&Ty~2&G3Ei`|5k&XB__z6m=GC5G*iwZh4U* zdCs%F?}~O^7d!`Kez$#Jv}?P@Ife;L-&r)6c9m=TF?;p1EYG+-yJjd|4 zS+Ma#f!YJ03E%$%!SDV5>;E(GI15;wD{hcK{Ewk{&fA^miuaU%t^+dv?mV}8S2d8y z-7LHF+}*O;Px~0EroY{JYTdg!AhSB^?XFd2_v#DpG1SbJJziRNK>h#&!+$XN_y6}l z2J`#>>+P#{JOo-1e*b^nh3Y*|fy|U(Nw;?%8;*(^GL-jxv&b{ru@va^5}EHzABuLQ zYMujH{M_ze(Tt@)_m(hAxP2^8IRJETIoQ2>p94(*(jd+QYXmd8nt^AsAkgWJ53;v2 z6!ZKBI(@f8K??(qy!6gi+;; WSsS{$Y|Hcj0000l5 zkh8!evY3H^TNs2H8D`Cq01C2~c>21s-(!;IvS51^d_oc^WZ~)J7{YNqdB^wv|Npb| z)bjt^tZp#nukY>o2MXT5zEsLBk+;5fUoPX}xfN~m*(DmX{uvnjVPDC@uqR4(cjgtI SFF-RGJYD@<)-gLJGywq8t2GS( delta 125 zcmdnNxR6n?Gr-TCmrII^fq{Y7)59eQNXr2+2O~3(yi#~KeWIf1L}%%MyKLOtqJr6} z|Gopo^*mi1LpZJ{@A&@zzkJ(1_WzL*r~WN_o4Dh9=}W1$+u8H;6L$!o|Io~+^IP77 Zf#G?Yq?Vj8qdZV2gQu&X%Q~loCIA=WDV+cS From c0b3c1c6e9963ea52fdb17da820b52925036b6bd Mon Sep 17 00:00:00 2001 From: mhotar Date: Thu, 27 Feb 2014 14:51:41 +0100 Subject: [PATCH 2/5] translation files updated -delta added to VCSWFUNC -"Set" added to VFSWFUNC --- radio/src/translations.cpp | 6 +++++- radio/src/translations/cz.h.txt | 8 ++++++-- radio/src/translations/de.h.txt | 8 ++++++-- radio/src/translations/en.h | 6 +++++- radio/src/translations/es.h.txt | 8 ++++++-- radio/src/translations/fi.h.txt | 6 +++++- radio/src/translations/fr.h.txt | 8 ++++++-- radio/src/translations/it.h.txt | 14 +++++++++----- radio/src/translations/pl.h.txt | 23 ++++++++--------------- radio/src/translations/pt.h.txt | 16 ++++++++++------ radio/src/translations/se.h.txt | 10 +++++++--- radio/util/translate.py | 13 +++++++++++-- 12 files changed, 84 insertions(+), 42 deletions(-) diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ef7c278b0..b1de8a33d 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -449,7 +449,7 @@ const pm_char STR_SD_SECTORS[] PROGMEM = TR_SD_SECTORS; const pm_char STR_SD_SIZE[] PROGMEM = TR_SD_SIZE; const pm_char STR_TYPE[] PROGMEM = TR_TYPE; const pm_char STR_GLOBAL_VARS[] PROGMEM = TR_GLOBAL_VARS; -const pm_char STR_GLOBAL_V[] PROGMEM = TR_GLOBAL_V; +const pm_char STR_GLOBAL_V[] PROGMEM = TR_GLOBAL_V; const pm_char STR_GLOBAL_VAR[] PROGMEM = TR_GLOBAL_VAR; const pm_char STR_OWN[] PROGMEM = TR_OWN; const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER; @@ -579,7 +579,11 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; #endif const pm_uchar font_5x7[] PROGMEM = { +#if defined (CPUARM) #include "font_05x07.lbm" +#else +#include "font_05x07_avr.lbm" +#endif #if defined(TRANSLATIONS_DE) #include "font_de_05x07.lbm" #elif defined(TRANSLATIONS_CZ) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index d1b9d986e..32beb0af9 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -174,7 +174,11 @@ #endif #define LEN_VCSWFUNC "\005" -#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a Date: Thu, 27 Feb 2014 15:18:00 +0100 Subject: [PATCH 3/5] PL translations- string lengths corrected --- radio/src/translations/pl.h.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 43407d8be..631985f79 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -191,7 +191,7 @@ #if defined(AUDIO) #define TR_SOUND "\222 Dźwięk\0 " #else - #define TR_SOUND "Pikanie\0 " + #define TR_SOUND "Pikanie\0 " #endif #if defined(HAPTIC) @@ -210,8 +210,8 @@ #define TR_PLAY_VALUE "\222 Wartość\0 " #else #define TR_PLAY_TRACK "[\222]Ścieżka " - #define TR_PLAY_BOTH "[\222 Oba]\0 " - #define TR_PLAY_VALUE "[\222 Wart.]\0" + #define TR_PLAY_BOTH "[\222 Oba]\0 " + #define TR_PLAY_VALUE "[\222 Wart.]\0 " #endif #define TR_CFN_BG_MUSIC "Muz. tła " "Muz. tła ||" @@ -225,11 +225,11 @@ #if defined(GVARS) #define TR_ADJUST_GVAR "Ustaw \0 " #else - #define TR_ADJUST_GVAR "[UstawZG]\0" + #define TR_ADJUST_GVAR "[UstawZG]\0 " #endif #ifdef DEBUG - #define TR_CFN_TEST "Test\0 " + #define TR_CFN_TEST "Test\0 " #else #define TR_CFN_TEST #endif From 3c8fd3a51d50b6f18670869265d33fd4804cd8ac Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Thu, 27 Feb 2014 21:19:33 +0100 Subject: [PATCH 4/5] Delta character now requires en.h to go through translate.py --- radio/src/Makefile | 7 ++++++- radio/src/translations/{en.h => en.h.txt} | 0 radio/util/translate.py | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) rename radio/src/translations/{en.h => en.h.txt} (100%) diff --git a/radio/src/Makefile b/radio/src/Makefile index 8380a747e..e373abd7c 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -1086,7 +1086,7 @@ else build: stamp_header tra lbm allsrc.cpp elf remallsrc bin endif -tra: translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h +tra: translations/en.h translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h lbm: fonts bitmaps/sticks.lbm elf: $(TARGET).elf @@ -1140,6 +1140,11 @@ taranis-stamp: @echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-taranis.txt @cat stamp-opentx-taranis.txt +translations/en.h: translations/en.h.txt + @echo + @echo "Create English language specific header files" + $(TRANSLATE) translations/en.h.txt translations/en.h en + translations/cz.h: translations/cz.h.txt @echo @echo "Create Czech language specific header files" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h.txt similarity index 100% rename from radio/src/translations/en.h rename to radio/src/translations/en.h.txt diff --git a/radio/util/translate.py b/radio/util/translate.py index 6fb0f26e5..99f9468b8 100644 --- a/radio/util/translate.py +++ b/radio/util/translate.py @@ -106,8 +106,10 @@ translations = {'cz': [('\\200', u'á'), ('\\203', u'Å'), ('\\204', u'Ä'), ('\\205', u'Ö')], + + 'en': [], - 'all': [('\\306', u'Δ')], + 'all': [('\\306', u'Δ')], } From a12e615a30f7770e62edd6911eac7a4e5b37b804 Mon Sep 17 00:00:00 2001 From: mhotar Date: Thu, 27 Feb 2014 23:13:39 +0100 Subject: [PATCH 5/5] CMakeLists for en.h --- companion/src/CMakeLists.txt | 9 +++++++++ radio/src/translations/.gitignore | 1 + 2 files changed, 10 insertions(+) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 1db9309bf..73d21daff 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -83,6 +83,13 @@ add_custom_command( WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} ) +add_custom_command( + OUTPUT ${RADIO_SRC_DIRECTORY}/translations/en.h + COMMAND make tra + DEPENDS ${RADIO_SRC_DIRECTORY}/translations/en.h.txt + WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} +) + include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/../.. @@ -122,6 +129,7 @@ set(companion_SRCS firmwares/ersky9x/ersky9xeeprom.cpp firmwares/ersky9x/ersky9xinterface.cpp ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm + ${RADIO_SRC_DIRECTORY}/translations/en.h appdata.cpp helpers.cpp mdichild.cpp @@ -313,6 +321,7 @@ set(simu_SRCS firmwares/ersky9x/ersky9xinterface.cpp ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm + ${RADIO_SRC_DIRECTORY}/translations/en.h file.cpp # TODO not needed modeledit/node.cpp modeledit/edge.cpp # TODO not needed diff --git a/radio/src/translations/.gitignore b/radio/src/translations/.gitignore index c87e4f22e..f1029c186 100644 --- a/radio/src/translations/.gitignore +++ b/radio/src/translations/.gitignore @@ -1,3 +1,4 @@ +/en.h /cz.h /de.h /es.h