Commit Graph
199 Commits
Author SHA1 Message Date
Kjell Kernen 23a61cc60e Merge branch 'origin/next'
Conflicts:
	companion/src/translations/companion_pl.ts
2014-02-07 17:10:40 +01:00
Andre Bernet b12f76bc39 Merge pull request #621 from opentx/bsongis/Issue554_trims_relative_default
All good!
2014-02-07 11:35:58 +01:00
Kjell Kernen 2d241ea9d9 Preference dialog split into two dialogs.
Both the two new dialogs and the old one are active and working at the same time. The old one will be removed when everything is in place.
New preference icons are added for classical theme.
Placeholder icons added for all monochrome themes.
The only thing not moved is the splash screen functionality. It does not really fit in either dialog and there are allready another special dialog for customizing splash screens. Perhaps make a combined dialog for all splash screen work? Will think about it tomorrow.
2014-02-06 00:00:22 +01:00
Jacek Drewniak 71b28cff87 adding new things from changes 2014-02-05 22:08:55 +01:00
mhotar 9744eb966c pointer and ":" fix 2014-02-04 20:25:35 +01:00
mhotar 0a45a71ea0 merge ate PL,FR,ES translations files 2014-02-04 14:43:16 +01:00
mhotar 40edf9f88a Merge remote-tracking branch 'origin/next' into mhotar/layout_alignments_Issue #584
Conflicts:
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/pl.h.txt
Manually resolved.
2014-02-04 13:41:39 +01:00
mhotar 49bcb3b0fc Centered strings #584 2014-02-04 13:01:59 +01:00
Kjell Kernen 71ef6d5457 Changed names for Master/Slave in Swedsih translation 2014-02-03 23:17:55 +01:00
Dvogonen 2b878af183 TRanslated latest strings and made minor improvements 2014-02-03 11:53:40 +01:00
Andre Bernet 7c81920431 Debug wasn't padded 2014-02-03 10:21:42 +01: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
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 cb7cb4aaf8 [Taranis] 6pos multiswitch adjustments 2014-02-02 21:51:42 +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
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 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 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
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
Andre Bernet 7d5e37d5fa Reset pot type to Pot if max no of steps exceeded to avoid stray switch entry 2014-02-01 10:13:18 +01:00
Andre Bernet a3b7852467 Overflow in S2 type selection 2014-02-01 09:52:27 +01:00
Bertrand Songis 582b14e919 Merge remote-tracking branch 'origin/next' into
bsongis/Issue554_trims_relative_default

Conflicts:
	companion/src/eeprominterface.h
	companion/src/firmwares/er9x/er9xinterface.cpp
	companion/src/firmwares/ersky9x/ersky9xinterface.cpp
2014-01-31 22:15:23 +01:00
Bertrand Songis 8ef1456fe9 EEPROM support in Companion for the 6pos pots on Taranis 2014-01-31 17:19:21 +01:00
Bertrand Songis 1cef62df48 Compilation error 2014-01-31 12:32:09 +01:00
Bertrand Songis 0446658f4b Issue #588 - S1/S2 Type added in Hardware configuration page 2014-01-31 12:13:46 +01:00
Bertrand Songis 38145a02f4 Merge remote-tracking branch 'origin/next' into
bsongis/Taranis_6Positions_Pot

Conflicts:
	radio/src/myeeprom.h
2014-01-31 11:28:34 +01:00
Andre Bernet 586b74b7f7 Little translation fixes 2014-01-31 00:36:35 +01:00
Jacek Drewniak e8744eb73c fixes + some hardcoding removed 2014-01-31 00:06:00 +01:00
Jacek Drewniak bffa086f72 More fixes to PL translation - opentx only 2014-01-30 23:12:38 +01:00
mhotar 7430620a8b EXPO_LINE_WEIGHT_POS shifted to fit into copy-box 2014-01-30 21:03:06 +01:00
Jacek Drewniak 63529d77e3 Small fixes to the translation 2014-01-30 00:58:13 +01:00
Bertrand Songis 7d88ff506e Issue #541 fixed 2014-01-28 17:51:35 +01:00
Bertrand Songis 30b8a7e14b Makefile cosmetics 2014-01-27 17:33:50 +01:00
Bertrand Songis b44fa1432e [Taranis] Issue #554 - Constant used instead of hardcoded value 2014-01-27 17:30:50 +01:00
Bertrand Songis cde59a2b22 [Taranis] Issue #554 - Automatic EEPROM conversions 2014-01-27 14:32:19 +01:00
mhotar 5c601a0bb7 Font related alignments 2014-01-27 13:10:21 +01:00