Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 3276)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 3277)
@@ -4,4 +4,5 @@
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.EventQueue;
@@ -158,18 +159,22 @@
};
- String message = tr("" + "There are {0} primitives in your local dataset which
"
- + "might be deleted on the server. If you later try to delete or
"
- + "update them the server is likely to report a
" + "conflict.
" + "
"
- + "Click {1} to check the state of these primitives
" + "on the server.
"
- + "Click {2} to ignore.
" + "",
- potentiallyDeleted.size(),
- options[0].text,
- options[1].text
- );
+ String message = ""
+ + trn("There is {0} object in your local dataset which "
+ + "might be deleted on the server. If you later try to delete or "
+ + "update this the server is likely to report a conflict.",
+ "There are {0} objects in your local dataset which "
+ + "might be deleted on the server. If you later try to delete or "
+ + "update them the server is likely to report a conflict.", potentiallyDeleted.size(), potentiallyDeleted.size())
+ + "
"
+ + trn("Click {0} to check the state of this object on the server.",
+ "Click {0} to check the state of these objects on the server.",
+ potentiallyDeleted.size(),
+ options[0].text) + "
"
+ + tr("Click {0} to ignore." + "", options[1].text);
int ret = HelpAwareOptionPane.showOptionDialog(
Main.parent,
message,
- tr("Deleted or moved primitives"),
+ tr("Deleted or moved objects"),
JOptionPane.WARNING_MESSAGE,
null,