merge with Dev

2018-01-08 13:31:26 +01:00
parent 3008d5d90d 1006dd1ebf
commit 48721c4da1
10 changed files with 128 additions and 55 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -2386,7 +2386,7 @@ void Options::load (bool lightweight)
        }
    }

-    langMgr.load ({localeTranslation, languageTranslation, defaultTranslation});
+    langMgr.load (options.language, {localeTranslation, languageTranslation, defaultTranslation});

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