merge with dev

2018-02-12 08:53:49 +01:00
parent 51512a271d 9f89ff2d68
commit ae4c1d4a54
5 changed files with 53 additions and 56 deletions
--- a/rtgui/multilangmgr.cc
+++ b/rtgui/multilangmgr.cc
@@ -43,7 +43,11 @@ struct LocaleToLang : private std::map<std::pair<Glib::ustring, Glib::ustring>,
        emplace (key ("cs", "CZ"), "Czech");
        emplace (key ("da", "DK"), "Dansk");
        emplace (key ("de", "DE"), "Deutsch");
+#ifdef __APPLE__
+        emplace (key ("en", "UK"), "English (UK)");
+#else
        emplace (key ("en", "GB"), "English (UK)");
+#endif
        emplace (key ("en", "US"), "English (US)");
        emplace (key ("es", "ES"), "Espanol");
        emplace (key ("eu", "ES"), "Euskara");