Ticket #18814: CombinePrimitiveResolverDialog.patch

/trunk/src/org/openstreetmap/josm/gui/conflict/tags/

@@ -603 +603 @@
             final TagCollection normalizedTags) throws UserCancelException {
         String conflicts = normalizedTags.getKeysWithMultipleValues().stream().map(
                 key -> getKeyDescription(key, normalizedTags)).collect(StreamUtils.toHtmlList());
-        String msg = /* for correct i18n of plural forms - see #9110 */ trn("You are about to combine {0} objects, "
+        String msg = /* for correct i18n of plural forms - see #9110 */ trn(
+                "You are about to combine {0} object, "
                 + "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, "
+                + "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/>"