Conflicts: swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java Manually resolved.