23 Commits

Author SHA1 Message Date
Kevin Ruland
4b4a7c74fc Merge remote-tracking branch 'upstream/master' into unstable
Conflicts:
	swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java
2016-04-02 16:49:15 -05:00
Wes Cravens
74d636bf33 Add concurrent mass info for both with and without motor configuration 2016-03-23 13:23:40 -05:00
Daniel_M_Williams
4e8838aa4c Merge branch 'master' of https://github.com/openrocket/openrocket into child_staging 2015-11-14 11:23:48 -05:00
Harry Dalton
39ec03370d Adding missing Spanish translation`
(thanks to Carlos)
2015-10-08 12:14:12 +01:00
Daniel_M_Williams
6f4cba68ae refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints 2015-06-23 13:12:48 -04:00
kruland2607
836eb92cd6 Update Spanish translation file. 2014-02-26 21:18:46 -06:00
kruland
0637be06ef Spanish translation file had all the accented characters incorrectly
specified as \ufffd.  I tried to selectively roll back to a previous
revision while keeping new strings and corrections.
2014-01-01 20:39:12 -06:00
kruland
e0f0befa86 New Spanish and Chinese translations. 2013-11-23 20:23:26 -06:00
kruland2607
41031a0936 Updated Spanish translations. 2013-04-29 12:59:29 -05:00
kruland2607
e8b38b7398 Updated es, fr & ru translations. 2013-04-29 09:56:21 -05:00
Sampo Niskanen
525869c3e7 Refactoring or rocket configuration description 2013-03-22 18:12:58 +02:00
Sampo Niskanen
b3b2303f27 Enhance flight configuration UI 2013-01-27 22:36:21 +02:00
Sampo Niskanen
31ace7b312 Material localization support 2012-08-25 20:10:58 +00:00
Boris du Reau
0ecd6110bf updated Spanish translation 2012-07-08 21:39:16 +00:00
Boris du Reau
16d4378f94 Updated translations 2012-07-03 21:21:46 +00:00
Boris du Reau
263c10baad New translations 2012-04-20 06:39:25 +00:00
Boris du Reau
bd13b85927 updated Spanish translations 2012-04-12 20:45:35 +00:00
Boris du Reau
bf0e3d978a updated translations 2012-04-10 18:33:58 +00:00
Boris du Reau
6d86baa926 Spanish translations update 2012-03-27 19:43:28 +00:00
Boris du Reau
09067de7cf Updated French and Spanish translation 2012-03-24 17:54:22 +00:00
Boris du Reau
61539df82d French and Spanish translations updates 2012-03-15 22:28:30 +00:00
Boris du Reau
1d71dcb174 Updated Spanish translations 2012-01-13 18:37:30 +00:00
Kevin Ruland
a497e6bbdb Move l10n/ in to resources/. 2012-01-11 03:26:17 +00:00