Changeset 6507 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

Timestamp:

2013-12-22T00:38:43+01:00 (10 years ago)

Author:

simon04

Message:

fix #9110 - i18n: fix errors in usage of plural forms

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -596 +596 @@
             }
         }));
-        String msg = tr("You are about to combine {0} objects, "
+        String msg = /* for correct i18n of plural forms - see #9110 */ trn("You are about to combine {0} objects, "
+                + "but the following tags are used conflictingly:<br/>{1}"
+                + "If these objects are combined, the resulting object may have unwanted tags.<br/>"
+                + "If you want to continue, you are shown a dialog to fix the conflicting tags.<br/><br/>"
+                + "Do you want to continue?", "You are about to combine {0} objects, "
                 + "but the following tags are used conflictingly:<br/>{1}"
                 + "If these objects are combined, the resulting object may have unwanted tags.<br/>"
                 + "If you want to continue, you are shown a dialog to fix the conflicting tags.<br/><br/>"
                 + "Do you want to continue?",
-                primitives.size(), conflicts);
+                primitives.size(), primitives.size(), conflicts);
 
         if (!ConditionalOptionPaneUtil.showConfirmationDialog(