Changeset 6679 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2014-01-13T00:11:28+01:00 (11 years ago)

Author:

stoecker

Message:

see #9110 - fix singular forms, even if they are useless

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangePropertyCommand.java (modified) (2 diffs)
• TagConflictResolveCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -167 +167 @@
             Map.Entry<String, String> entry = tags.entrySet().iterator().next();
             if (entry.getValue() == null) {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Remove \"{0}\" for {1} objects", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
+                /* I18n: plural form for objects, but value < 2 not possible! */
+                text = trn("Remove \"{0}\" for {1} object", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
             } else {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Set {0}={1} for {2} objects", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
+                /* I18n: plural form for objects, but value < 2 not possible! */
+                text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
             }
         }
@@ -184 +184 @@
 
             if (allnull) {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Deleted {0} tags for {1} objects", "Deleted {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
+                /* I18n: plural form detected for objects only (but value < 2 not possible!), try to do your best for tags */ 
+                text = trn("Deleted {0} tags for {1} object", "Deleted {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
             } else {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Set {0} tags for {1} objects", "Set {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
+                /* I18n: plural form detected for objects only (but value < 2 not possible!), try to do your best for tags */
+                text = trn("Set {0} tags for {1} object", "Set {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
             }
         }

trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

@@ -60 +60 @@
             case NODE:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflicts in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
             case WAY:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflicts in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
             case RELATION:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflicts in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
         }
         return "";