Index: org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- org/openstreetmap/josm/actions/UploadAction.java (revision 2094)
+++ org/openstreetmap/josm/actions/UploadAction.java (working copy)
@@ -131,7 +131,7 @@
JOptionPane.showMessageDialog(
Main.parent,
tr("There are unresolved conflicts in layer ''{0}''.
"
- + "You have to resolve them first.", layer.getName()),
+ + "You have to resolve them first.", layer.getName()),
tr("Warning"),
JOptionPane.WARNING_MESSAGE
);
Index: org/openstreetmap/josm/gui/history/VersionInfoPanel.java
===================================================================
--- org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 2094)
+++ org/openstreetmap/josm/gui/history/VersionInfoPanel.java (working copy)
@@ -47,7 +47,7 @@
return "";
String url = AbstractInfoAction.getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId();
String text = tr(
- "Version {0} created on {1} by {2} in changeset {3}",
+ "Version {0} created on {1} by {2} in changeset {3}",
Long.toString(primitive.getVersion()),
new SimpleDateFormat().format(primitive.getTimestamp()),
primitive.getUser(),
Index: org/openstreetmap/josm/gui/io/SaveLayersDialog.java
===================================================================
--- org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 2094)
+++ org/openstreetmap/josm/gui/io/SaveLayersDialog.java (working copy)
@@ -203,7 +203,7 @@
JOptionPane.showConfirmDialog(
Main.parent,
new LayerListWarningMessagePanel(msg, infos),
- tr("Unsafed data and conflicts"),
+ tr("Unsaved data and conflicts"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.WARNING_MESSAGE
);
@@ -221,7 +221,7 @@
JOptionPane.showConfirmDialog(
Main.parent,
new LayerListWarningMessagePanel(msg, infos),
- tr("Unsafed data and missing associated file"),
+ tr("Unsaved data and missing associated file"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.WARNING_MESSAGE
);
@@ -241,7 +241,7 @@
JOptionPane.showConfirmDialog(
Main.parent,
new LayerListWarningMessagePanel(msg, infos),
- tr("Unsafed data non-writable files"),
+ tr("Unsaved data non-writable files"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.WARNING_MESSAGE
);
Index: org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- org/openstreetmap/josm/gui/layer/RawGpsLayer.java (revision 2094)
+++ org/openstreetmap/josm/gui/layer/RawGpsLayer.java (working copy)
@@ -60,7 +60,7 @@
}
public void actionPerformed(ActionEvent e) {
JPanel msg = new JPanel(new GridBagLayout());
- msg.add(new JLabel(tr("Upload of unprocessed GPS data as map data is considered harmful.
If you want to upload traces, look here:")), GBC.eol());
+ msg.add(new JLabel(tr("Upload of unprocessed GPS data as map data is considered harmful.
If you want to upload traces, look here:")), GBC.eol());
msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());
if (!ConditionalOptionPaneUtil.showConfirmationDialog(
"convert_to_data",