Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 16438)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 16439)
@@ -117,4 +117,5 @@
         languages.put("et", PluralMode.MODE_NOTONE);
         //languages.put("eu", PluralMode.MODE_NOTONE);
+        languages.put("fa", PluralMode.MODE_NONE);
         languages.put("fi", PluralMode.MODE_NOTONE);
         languages.put("fr", PluralMode.MODE_GREATERONE);
@@ -123,9 +124,8 @@
         languages.put("hu", PluralMode.MODE_NOTONE);
         languages.put("id", PluralMode.MODE_NONE);
-        //languages.put("is", PluralMode.MODE_NOTONE);
+        languages.put("is", PluralMode.MODE_NOTONE);
         languages.put("it", PluralMode.MODE_NOTONE);
         languages.put("ja", PluralMode.MODE_NONE);
         languages.put("ko", PluralMode.MODE_NONE);
-        // fully supported only with Java 8 and later (needs CLDR)
         languages.put("km", PluralMode.MODE_NONE);
         languages.put("lt", PluralMode.MODE_LT);