Index: /trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2170)
+++ /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2171)
@@ -302,5 +302,5 @@
String msg = tr("Uploading failed because you've been using
"
+ "changeset {0} which was already closed at {1}.
"
- + "Please upload again with a new or an existing open changeset.",
+ + "Please upload again with a new or an existing open changeset.",
changsetId, new SimpleDateFormat().format(d)
);
Index: /trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (revision 2170)
+++ /trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (revision 2171)
@@ -52,5 +52,5 @@
@Override public void undoCommand() {
if (! Main.map.mapView.hasLayer(getLayer())) {
- System.out.println(tr("Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for primitmive ''{1}''",
+ System.out.println(tr("Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for primitive ''{1}''",
getLayer().getName(),
conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 2170)
+++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 2171)
@@ -594,7 +594,7 @@
protected void ensureValidChangeset() throws OsmTransferException {
if (changeset == null)
- throw new OsmTransferException(tr("current changeset is null. Can't upload data."));
+ throw new OsmTransferException(tr("Current changeset is null. Can't upload data."));
if (changeset.getId() <= 0)
- throw new OsmTransferException(tr("id of current changeset > required. Current id is {0}", changeset.getId()));
+ throw new OsmTransferException(tr("id of current changeset > 0 required. Current id is {0}", changeset.getId()));
}
/**