Merge in l10n changes.
Display language names in the preference drop down in both the localized
and unlocalized form.  This makes switching for non-native speakers
easier.
Merge remote-tracking branch 'upstream/master' into kruland-integration

Conflicts:
	core/resources/l10n/messages_fr.properties
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java