merge with Dev

2017-10-22 13:27:59 +02:00
parent ab7b8042ec 8c328cafd1
commit 15ff66fb4c
9 changed files with 86 additions and 67 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -2390,7 +2390,7 @@ void Options::load (bool lightweight)
        }
    }

-    langMgr.load (localeTranslation, new MultiLangMgr (languageTranslation, new MultiLangMgr (defaultTranslation)));
+    langMgr.load ({localeTranslation, languageTranslation, defaultTranslation});

    rtengine::init (&options.rtSettings, argv0, rtdir, !lightweight);
 }