Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 7303)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 7304)
@@ -211,5 +211,5 @@
         int conflictsCount = conflicts.size();
         if (conflictsCount > 0) {
-            setTitle(tr("Conflicts: {0} unresolved", conflicts.size()) +
+            setTitle(trn("Conflict: {0} unresolved", "Conflicts: {0} unresolved", conflictsCount, conflictsCount) +
                     " ("+tr("Rel.:{0} / Ways:{1} / Nodes:{2}",
                             conflicts.getRelationConflicts().size(),