Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 15474)
+++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 15475)
@@ -2,6 +2,6 @@
 package org.openstreetmap.josm.tools;
 
-import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 
@@ -179,4 +179,10 @@
      */
     public static String getDisplayName(Locale locale) {
+        String currentCountry = Locale.getDefault().getCountry();
+        String localeCountry = locale.getCountry();
+        // Don't display locale country if country has been forced to current country at JOSM startup
+        if (currentCountry.equals(localeCountry) && !I18n.hasCode(getLanguageCodes(locale).get(0))) {
+            return new Locale(locale.getLanguage(), "", locale.getVariant()).getDisplayName();
+        }
         return locale.getDisplayName();
     }
@@ -263,6 +269,6 @@
      * @since 8283
      */
-    public static Collection<String> getLanguageCodes(Locale l) {
-        Collection<String> list = new LinkedList<>();
+    public static List<String> getLanguageCodes(Locale l) {
+        List<String> list = new LinkedList<>();
         if (l == null)
             l = Locale.getDefault();