hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into kruland-integration

Browse Source 
Conflicts:
	core/resources/l10n/messages_fr.properties
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
This commit is contained in:
kruland2607 2013-04-16 14:28:42 -05:00
commit 701b8966a2
5 changed files with 3497 additions and 1923 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages_fr.properties
View File

@ -1,4 +1,3 @@
#
# French base translation file # French base translation file
# Translated by Tripoli France # Translated by Tripoli France
# Should you need to add new logical keys here is the proposed method # Should you need to add new logical keys here is the proposed method

1576
core/resources/l10n/messages_pt.properties Normal file
View File

File diff suppressed because it is too large Load Diff

3
core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
View File

@ -129,7 +129,7 @@ public class PreferencesDialog extends JDialog {
} }
List<Named<Locale>> locales = new ArrayList<Named<Locale>>(); List<Named<Locale>> locales = new ArrayList<Named<Locale>>();
for (Locale l : SwingPreferences.getSupportedLocales()) { for (Locale l : SwingPreferences.getSupportedLocales()) {
locales.add(new Named<Locale>(l, l.getDisplayLanguage())); locales.add(new Named<Locale>(l, l.getDisplayLanguage(l) + "/" + l.getDisplayLanguage()));
} }
Collections.sort(locales); Collections.sort(locales);
locales.add(0, new Named<Locale>(null, trans.get("languages.default"))); locales.add(0, new Named<Locale>(null, trans.get("languages.default")));
@ -302,7 +302,6 @@ public class PreferencesDialog extends JDialog {
}); });
panel.add(button, "right, wrap"); panel.add(button, "right, wrap");
final JCheckBox autoOpenDesignFile = new JCheckBox(trans.get("pref.dlg.but.openlast")); final JCheckBox autoOpenDesignFile = new JCheckBox(trans.get("pref.dlg.but.openlast"));
autoOpenDesignFile.setSelected(preferences.isAutoOpenLastDesignOnStartupEnabled()); autoOpenDesignFile.setSelected(preferences.isAutoOpenLastDesignOnStartupEnabled());
autoOpenDesignFile.addActionListener(new ActionListener() { autoOpenDesignFile.addActionListener(new ActionListener() {

2
core/src/net/sf/openrocket/gui/util/SwingPreferences.java
View File

@ -38,7 +38,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
private static final List<Locale> SUPPORTED_LOCALES; private static final List<Locale> SUPPORTED_LOCALES;
static { static {
List<Locale> list = new ArrayList<Locale>(); List<Locale> list = new ArrayList<Locale>();
for (String lang : new String[] { "en", "de", "es", "fr", "it", "ru", "cs", "pl" }) { for (String lang : new String[] { "en", "de", "es", "fr", "it", "ru", "cs", "pl", "ja", "pt" }) {
list.add(new Locale(lang)); list.add(new Locale(lang));
} }
SUPPORTED_LOCALES = Collections.unmodifiableList(list); SUPPORTED_LOCALES = Collections.unmodifiableList(list);