Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 2163) @@ -68,5 +68,5 @@ public void export(Layer layer) { if (layer == null) - throw new IllegalArgumentException(tr("paramenter ''{0}'' must not be null", "layer")); + throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); if (! (layer instanceof OsmDataLayer) && ! (layer instanceof GpxLayer)) throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName())); Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 2163) @@ -216,10 +216,10 @@ if(url.equals(langurl)) { - txt = (""+tr("Help page missing. Create it in english.", + txt = (""+tr("Help page missing. Create it in English.", url+"?action=edit")+""); } else { - txt = (""+tr("Help page missing. Create it in english or your language.", + txt = (""+tr("Help page missing. Create it in English or your language.", url+"?action=edit", langurl+"?action=edit")+""); } Index: trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (revision 2163) @@ -52,5 +52,5 @@ @Override public void undoCommand() { if (! Main.map.mapView.hasLayer(getLayer())) { - System.out.println(tr("Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for primitmive ''{1}''", + System.out.println(tr("Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for primitmive ''{1}''", getLayer().getName(), conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) Index: trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 2163) @@ -60,5 +60,5 @@ if (! Main.map.mapView.hasLayer(getLayer())) { - logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present anymore", + logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), getLayer().toString() Index: trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (revision 2163) @@ -249,5 +249,5 @@ public void undoCommand() { if (! Main.map.mapView.hasLayer(getLayer())) { - logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present anymore", + logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), getLayer().toString() Index: trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 2163) @@ -88,5 +88,5 @@ public void undoCommand() { if (! Main.map.mapView.hasLayer(layer)) { - logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present anymore", + logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), layer.toString() Index: trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (revision 2163) @@ -52,5 +52,5 @@ return new DefaultMutableTreeNode( new JLabel( - tr("Resolve conflicts in node list of of way {0}", conflict.getMy().getId()), + tr("Resolve conflicts in node list of way {0}", conflict.getMy().getId()), ImageProvider.get("data", "object"), JLabel.HORIZONTAL Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 2163) @@ -76,5 +76,5 @@ ArrayList versions = data.get(id); if (versions == null) - throw new NoSuchElementException(tr("Didn't find an primitive with id {0} in this dataset", id)); + throw new NoSuchElementException(tr("Didn't find an primitive with id {0} in this dataset", id)); for (HistoryOsmPrimitive primitive: versions) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 2163) @@ -583,5 +583,5 @@ tr("There is at least one member in this relation referring
" + "to the relation itself.
" - + "This creates circular dependencies and is dicuraged.
" + + "This creates circular dependencies and is discouraged.
" + "How do you want to proceed with circular dependencies?"), tr("Warning"), Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 2163) @@ -124,5 +124,5 @@ putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); - putValue(SHORT_DESCRIPTION, tr("Cancel closeing of changesets")); + putValue(SHORT_DESCRIPTION, tr("Cancel closing of changesets")); } Index: trunk/src/org/openstreetmap/josm/io/GpxExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 2163) @@ -53,10 +53,10 @@ public void exportData(File file, Layer layer) throws IOException { if (layer == null) - throw new IllegalArgumentException(tr("paramenter ''{0}'' must not be null", "layer")); + throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); if (!(layer instanceof OsmDataLayer) && !(layer instanceof GpxLayer)) throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer .getClass().getName())); if (file == null) - throw new IllegalArgumentException(tr("paramenter ''{0}'' must not be null", "file")); + throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "file")); String fn = file.getPath(); Index: trunk/src/org/openstreetmap/josm/io/NMEAImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 2162) +++ trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 2163) @@ -54,5 +54,5 @@ JOptionPane.INFORMATION_MESSAGE); } else { - JOptionPane.showMessageDialog(Main.parent, msg, tr("NMEA import faliure!"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(Main.parent, msg, tr("NMEA import failure!"), JOptionPane.ERROR_MESSAGE); } }