Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2095)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2096)
@@ -132,5 +132,5 @@
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: trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 2095)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 2096)
@@ -48,5 +48,5 @@
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()),
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 2095)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 2096)
@@ -204,5 +204,5 @@
Main.parent,
new LayerListWarningMessagePanel(msg, infos),
- tr("Unsafed data and conflicts"),
+ tr("Unsaved data and conflicts"),
JOptionPane.DEFAULT_OPTION,
JOptionPane.WARNING_MESSAGE
@@ -222,5 +222,5 @@
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
@@ -242,5 +242,5 @@
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: trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (revision 2095)
+++ trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (revision 2096)
@@ -61,5 +61,5 @@
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(