Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 14810)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 14811)
@@ -105,4 +105,5 @@
         languages.put("el", PluralMode.MODE_NOTONE);
         languages.put("en_AU", PluralMode.MODE_NOTONE);
+        languages.put("en_CA", PluralMode.MODE_NOTONE);
         languages.put("en_GB", PluralMode.MODE_NOTONE);
         languages.put("es", PluralMode.MODE_NOTONE);
@@ -608,5 +609,5 @@
     private static int pluralEval(long n) {
         switch(pluralMode) {
-        case MODE_NOTONE: /* bg, da, de, el, en, en_GB, es, et, eu, fi, gl, is, it, iw_IL, nb, nl, sv */
+        case MODE_NOTONE: /* bg, da, de, el, en, en_AU, en_CA, en_GB, es, et, eu, fi, gl, is, it, iw_IL, nb, nl, sv */
             return (n != 1) ? 1 : 0;
         case MODE_NONE: /* id, vi, ja, km, tr, zh_CN, zh_TW */
Index: trunk/test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java	(revision 14810)
+++ trunk/test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java	(revision 14811)
@@ -27,5 +27,5 @@
     public JOSMTestRules test = new JOSMTestRules().i18n("ca@valencia");
 
-    private static final Locale EN_CA = Locale.CANADA;
+    private static final Locale EN_NZ = new Locale("en", "NZ");
     private static final Locale DE_DE = Locale.GERMANY;
     private static final Locale PT_BR = new Locale("pt", "BR");
@@ -33,5 +33,5 @@
     private static final Locale ZN_CN = Locale.SIMPLIFIED_CHINESE;
     private static final Locale ZN_TW = Locale.TRADITIONAL_CHINESE;
-    private static final Locale EN_GB = new Locale("en", "GB");
+    private static final Locale EN_GB = Locale.UK;
     private static final Locale RU = new Locale("ru");
     private static final Locale NB = new Locale("nb");
@@ -56,5 +56,5 @@
 
     private static void testGetWikiLanguagePrefixes(LanguageInfo.LocaleType type, String...expected) {
-        final List<String> actual = Stream.of(EN_CA, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW, AST, EN_GB, RU, NB)
+        final List<String> actual = Stream.of(EN_NZ, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW, AST, EN_GB, RU, NB)
                 .map(locale -> LanguageInfo.getWikiLanguagePrefix(locale, type))
                 .collect(Collectors.toList());