Issue 2372 – Some translations (notably Japanese) are not loaded

https://winscp.net/tracker/2372
(cherry picked from commit 0324d45a96df0bb55b9ca54a164c608bac7a659c)

Source commit: 6fa9b0acb1398e7fe6ce7fde7cc35d9710443124

source/windows/GUIConfiguration.cpp

@@ -1182,7 +1182,7 @@ TObjectList * __fastcall TGUIConfiguration::GetLocales()
     LCID InvalidLocale = static_cast<LCID>(-1);
 
     // The two-leter Windows code is not actually unique among languages.
-    // To find any duplicities and resolve them to the language, where ISO code also match.
+    // So find any duplicities and resolve them to the language, where ISO code also match.
     // Notably:
     // Georgian KAT ka-GE - Kalaallisut KAL kl-GL
     // Tamil TAI ta-IN - Tajik TAJ tj-TJ
@@ -1224,6 +1224,7 @@ TObjectList * __fastcall TGUIConfiguration::GetLocales()
         TConflicts::const_iterator DefaultLangConflict = DefaultLangConflicts.find(LangExt2);
         // Unless it is a conflicting extension with no resolution or resolved to another locale
         if ((DefaultLangConflict == DefaultLangConflicts.end()) ||
+            (DefaultLangConflict->second.first == 1) ||
             ((DefaultLangConflict->second.second != InvalidLocale) &&
              (DefaultLangConflict->second.second == Locale)))
         {