Feature #468
Globalization of user settings
Merge remote-tracking branch 'glorf/cs-windows'