Commit Graph
3499 Commits
Author SHA1 Message Date
Andre Bernet 62ad79538f Fix constant string, remove warning 2014-02-03 17:42:38 +01:00
Andre Bernet 28e9d0ee94 Fix UTF8 mess 2014-02-03 17:18:22 +01:00
Andre Bernet 59ad4f79fc Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/pl.h.txt
	radio/src/translations/se.h.txt
2014-02-03 17:15:08 +01:00
Andre Bernet efacc05868 Switch warnings for ID0 on 9x now display the position it should have, like on Taranis. Makes more sense than having the current position. 2014-02-03 17:07:45 +01:00
Bertrand Songis c2b18553ab Merge branch 'bsongis/Issue592_sticky_switches' of
https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/opentx.cpp
2014-02-03 15:10:27 +01:00
Bertrand Songis 075a21b53a Merge branch 'bsongis/Issue592_sticky_switches' of
https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/opentx.cpp
2014-02-03 15:07:37 +01:00
Bertrand Songis c8ae023a15 Merge branch 'bsongis/Issue592_sticky_switches' of
https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/opentx.cpp
2014-02-03 15:05:10 +01:00
Bertrand Songis e48c27d30a [all] Issue #592 - Sticky switches on all boards. Saves 62bytes on
stock!
2014-02-03 14:33:55 +01:00
Bertrand Songis b404673f58 [all] Issue #592 - Sticky switches on all boards. Saves 62bytes on
stock!
2014-02-03 14:07:42 +01:00
Dvogonen b8f3e1771d Corrected an image problem with a section being slightly "blacker" than the black surrounding it. Pushing directly to next. 2014-02-03 13:58:19 +01:00
Kjell Kernen e0fe763832 Merge pull request #647 from opentx/dvogonen/renaming_even_more_CS_to_LS
Changed CS labels in xsimulator to LS labels
2014-02-03 04:52:12 -08:00
Dvogonen 5960f25878 Changed CS labels in xsimulator to LS labels 2014-02-03 13:50:19 +01:00
Kjell Kernen 719aa2ee49 Merge pull request #646 from opentx/dvogonen/rename_another_screenful_of_CS_to_LS
Renamed the CS labels in the simulator dialog to LS
2014-02-03 03:09:13 -08:00
Dvogonen 1b071cbf47 Renamed the CS labels in the simulator dialog to LS 2014-02-03 12:07:52 +01:00
Kjell Kernen 210c03e0a1 Merge pull request #645 from opentx/dvogonen/swedish_translation_branch
Translated latest strings to Swedish and made minor improvements
2014-02-03 02:55:22 -08:00
Dvogonen 2b878af183 TRanslated latest strings and made minor improvements 2014-02-03 11:53:40 +01:00
Bertrand Songis 9730f8d190 [Taranis] Issue #592 - Sticky switches 2014-02-03 11:22:06 +01:00
Andre Bernet 7c81920431 Debug wasn't padded 2014-02-03 10:21:42 +01:00
Andre Bernet d44f3d9f3e Merge pull request #643 from opentx/driver33/PL_translation
Driver33/pl translation
2014-02-03 01:18:11 -08:00
Andre Bernet 6509a5a66e Conflict resolved the wrong way 2014-02-03 10:17:09 +01:00
Jacek Drewniak 6a9b21b6e6 fixes in both companion and opentx new string in companion helpers that need to be transfered into other translation files 2014-02-03 00:59:29 +01:00
Andre Bernet 9a81cc37b3 Remove Virtual SP2UART choice for serial port for now, sync translations (Debug) 2014-02-03 00:05:44 +01:00
Andre Bernet 352a2e023a Merge pull request #641 from opentx/driver33/sport
Driver33/sport
2014-02-02 14:57:42 -08:00
Jacek Drewniak 5916959038 Chenged SPORT to S-Port in all translation files. 2014-02-02 23:48:23 +01:00
Bertrand Songis 413c146fe0 [Taranis] 6pos multiswitch fix 2014-02-02 22:50:36 +01:00
Bertrand Songis 64a8349120 Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-02 21:52:44 +01:00
Bertrand Songis f4784e61b1 Companion didn't compile properly! 2014-02-02 21:57:12 +01:00
Bertrand Songis cb7cb4aaf8 [Taranis] 6pos multiswitch adjustments 2014-02-02 21:51:42 +01:00
Bertrand Songis e6c92d1ed9 Update DONATIONS.txt 2014-02-02 19:02:23 +01:00
Bertrand Songis 698885f645 [Taranis, Sky9x] Wav files played even in silent mode. 2014-02-02 13:51:33 +01:00
Andre Bernet e1aba1bc1c Fixes fixed 2014-02-02 12:14:30 +01:00
Bertrand Songis 3adac4c795 Update DONATIONS.txt 2014-02-02 12:02:29 +01:00
Andre Bernet 54076ebb8f Merge pull request #634 from opentx/bsongis/Taranis_UART3_modes
UART3 Debug/SPORT modes

Looks all good!
2014-02-02 02:17:27 -08:00
Bertrand Songis 0f1c14549e [all] Issue #627 fixed 2014-02-02 09:40:04 +01:00
Bertrand Songis 72022a0e32 Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-02 09:13:48 +01:00
Bertrand Songis c91759166a [all] Issue #626 fixed 2014-02-02 09:14:10 +01:00
Jacek Drewniak 2a9d5d4778 Fixes 2014-02-02 00:32:39 +01:00
Bertrand Songis c045a6214b [Taranis] Issue #626 fixed 2014-02-01 21:59:46 +01:00
Bertrand Songis 3e2e665955 [Taranis] Pull request #610 - Speaker volume hysteresis 2014-02-01 21:44:02 +01:00
Bertrand Songis 281dee18eb Merge pull request #631 from opentx/driver33/PL_translation
Driver33/pl translation
2014-02-01 11:01:57 -08:00
Bertrand Songis 53c670deee Merge remote-tracking branch 'origin/next' into
bsongis/Issue554_trims_relative_default

Conflicts:
	radio/src/gui/menu_model.cpp
2014-02-01 19:56:31 +01:00
Bertrand Songis c3417a0d88 UART3 Debug/SPORT modes 2014-02-01 19:50:49 +01:00
Andre BernetandBertrand Songis 0b77d9921d VC doesn't like binary constants 2014-02-01 19:42:57 +01:00
Jacek Drewniak b9448c6baf Add 2 lines of translation + some orto fixes 2014-02-01 19:24:10 +01:00
Jacek Drewniak c9367ba10f Merge branch 'next' into driver33/PL_translation 2014-02-01 19:09:50 +01:00
Kjell Kernen 2c9f601404 Merge pull request #633 from opentx/dvogonen/OpenTX_-build_broken_in_next_632
Dvogonen/open tx  build broken in next 632
2014-02-01 09:51:54 -08:00
Dvogonen d9373b997b Polish Translation problem fixed. 2014-02-01 18:49:50 +01:00
Dvogonen 6f8ab60e11 Czech Translation problem fixed 2014-02-01 18:31:44 +01:00
Dvogonen 3db2b2912f I think that these files have been saved as UTF8. They now builds just fine. 2014-02-01 17:37:22 +01:00
Bertrand Songis 670bb0a0c5 Avoid recursive calls to getTrimValue 2014-02-01 16:23:57 +01:00