Index: src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 282) +++ src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 283) @@ -97,5 +97,5 @@ cmds.add(new DeleteCommand(selectedWays)); cmds.add(new ChangeCommand(oldWay, newWay)); - Main.main.editLayer().add(new SequenceCommand(tr("Combine {0} Ways", selectedWays.size()), cmds)); + Main.main.editLayer().add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds)); Main.ds.setSelected(oldWay); } Index: src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 282) +++ src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 283) @@ -38,5 +38,5 @@ public class GpxExportAction extends DiskAccessAction { - private final static String warningGpl = ""+tr("Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks.")+""; + private final static String warningGpl = ""+tr("Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks.")+""; private final Layer layer; Index: src/org/openstreetmap/josm/actions/SaveAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SaveAction.java (revision 282) +++ src/org/openstreetmap/josm/actions/SaveAction.java (revision 283) @@ -65,5 +65,5 @@ } catch (IOException e) { e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("An error occoured while saving.")+"\n"+e.getMessage()); + JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage()); } } Index: src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- src/org/openstreetmap/josm/actions/UploadAction.java (revision 282) +++ src/org/openstreetmap/josm/actions/UploadAction.java (revision 283) @@ -96,5 +96,5 @@ } - return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload this changes?"), + return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload these changes?"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION; } Index: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (revision 282) +++ src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (revision 283) @@ -47,5 +47,5 @@ actions.add(new AddNodeAction(mf,tr("Add node"), Mode.node, tr("Add a new node to the map"))); actions.add(new AddNodeAction(mf, tr("Add node into segment"), Mode.nodesegment,tr( "Add a node into an existing segment"))); - actions.add(new AddNodeAction(mf, tr("Add node and connect"), Mode.autonode,tr( "Add a node and connect it to the selected (previous added) node"))); + actions.add(new AddNodeAction(mf, tr("Add node and connect"), Mode.autonode,tr( "Add a node and connect it to the selected (previously added) node"))); setCurrent(0); } Index: src/org/openstreetmap/josm/data/ServerSidePreferences.java =================================================================== --- src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 282) +++ src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 283) @@ -89,5 +89,5 @@ } catch (MalformedURLException e) { e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("Could not load preferenced from server.")); + JOptionPane.showMessageDialog(Main.parent, tr("Could not load preferences from server.")); } this.connection = connection; Index: src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- src/org/openstreetmap/josm/gui/MainApplet.java (revision 282) +++ src/org/openstreetmap/josm/gui/MainApplet.java (revision 283) @@ -46,5 +46,5 @@ {"username", tr("string"), tr("Name of the user.")}, {"password", tr("string"), tr("OSM Password.")}, - {"geometry", tr("string"), tr("Size the applet to the given geometry (format: WIDTHxHEIGHT)")}, + {"geometry", tr("string"), tr("Resize the applet to the given geometry (format: WIDTHxHEIGHT)")}, {"download", tr("string;string;..."), tr("Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename")}, {"downloadgps", tr("string;string;..."), tr("Download each as raw gps. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a filename")}, Index: src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- src/org/openstreetmap/josm/gui/MainApplication.java (revision 282) +++ src/org/openstreetmap/josm/gui/MainApplication.java (revision 283) @@ -143,5 +143,5 @@ preConstructorInit(args); - JFrame mainFrame = new JFrame(tr("Java Open Street Map - Editor")); + JFrame mainFrame = new JFrame(tr("Java OpenStreetMap - Editor")); Main.parent = mainFrame; final Main main = new MainApplication(mainFrame); Index: src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- src/org/openstreetmap/josm/gui/MapView.java (revision 282) +++ src/org/openstreetmap/josm/gui/MapView.java (revision 283) @@ -113,5 +113,5 @@ dataLayer.listenerModified.add(new ModifiedChangedListener(){ public void modifiedChanged(boolean value, OsmDataLayer source) { - JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java Open Street Map - Editor")); + JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java OpenStreetMap - Editor")); } }); Index: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 282) +++ src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 283) @@ -87,5 +87,5 @@ } catch (FileNotFoundException x) { x.printStackTrace(); - errorMessage = tr("File Not found")+": "+x.getMessage(); + errorMessage = tr("File not found")+": "+x.getMessage(); } catch (IOException x) { x.printStackTrace(); Index: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 282) +++ src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 283) @@ -275,5 +275,5 @@ */ public PropertiesDialog(MapFrame mapFrame) { - super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P, 150); + super(tr("Properties"), "propertiesdialog", tr("Properties for selected objects."), KeyEvent.VK_P, 150); if (AnnotationPresetPreference.annotationPresets.size() > 0) { Index: src/org/openstreetmap/josm/gui/download/WorldChooser.java =================================================================== --- src/org/openstreetmap/josm/gui/download/WorldChooser.java (revision 282) +++ src/org/openstreetmap/josm/gui/download/WorldChooser.java (revision 283) @@ -97,5 +97,5 @@ temp.setLayout(new BorderLayout()); temp.add(this, BorderLayout.CENTER); - temp.add(new JLabel(tr("You can use the mouse or Ctrl+Arrow keys/./, to zoom and pan.")), BorderLayout.SOUTH); + temp.add(new JLabel(tr("You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan.")), BorderLayout.SOUTH); gui.tabpane.add(temp, "Map"); new MapMover(this, temp); Index: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (revision 282) +++ src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (revision 283) @@ -63,5 +63,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 harmfull.
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 (!DontShowAgainInfo.show("convert_to_data", msg)) Index: src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (revision 282) +++ src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (revision 283) @@ -30,5 +30,5 @@ }); drawRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines")); - drawRawGpsLines.setToolTipText(tr("If your gps device draw to few lines, select this to draw lines along your way.")); + drawRawGpsLines.setToolTipText(tr("If your gps device draw too few lines, select this to draw lines along your way.")); gui.display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0)); Index: src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 282) +++ src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 283) @@ -65,5 +65,5 @@ public void addGui(final PreferenceDialog gui) { this.gui = gui; - plugin = gui.createPreferenceTab("plugin", tr("Plugins"), tr("Configure available Plugins.")); + plugin = gui.createPreferenceTab("plugin", tr("Plugins"), tr("Configure available plugins.")); JScrollPane pluginPane = new JScrollPane(pluginPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); pluginPane.setBorder(null); Index: src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 282) +++ src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 283) @@ -37,5 +37,5 @@ // some common tabs public final JPanel display = createPreferenceTab("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program.")); - public final JPanel connection = createPreferenceTab("connection", I18n.tr("Connection Settings"), I18n.tr("Connection Settings to the OSM server.")); + public final JPanel connection = createPreferenceTab("connection", I18n.tr("Connection Settings"), I18n.tr("Connection Settings for the OSM server.")); public final JPanel map = createPreferenceTab("map", I18n.tr("Map Settings"), I18n.tr("Settings for the map projection and data interpretation.")); Index: src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 282) +++ src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 283) @@ -32,5 +32,5 @@ osmDataPassword.setText(Main.pref.get("osm-server.password")); - osmDataServer.setToolTipText(tr("The base URL to the OSM server (REST API)")); + osmDataServer.setToolTipText(tr("The base URL for the OSM server (REST API)")); osmDataUsername.setToolTipText(tr("Login name (email) to the OSM account.")); osmDataPassword.setToolTipText(tr("Login password to the OSM account. Leave blank to not store any password.")); Index: src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- src/org/openstreetmap/josm/io/OsmReader.java (revision 282) +++ src/org/openstreetmap/josm/io/OsmReader.java (revision 283) @@ -139,5 +139,5 @@ } catch (NullPointerException x) { x.printStackTrace(); // SAXException does not chain correctly - throw new SAXException(tr("NullPointerException. Possible some missing tags."), x); + throw new SAXException(tr("NullPointerException, Possibly some missing tags."), x); } } @@ -174,5 +174,5 @@ } catch (ParseException e) { e.printStackTrace(); - throw new SAXException(tr("Couldn''t read time format \"{0}\".",time)); + throw new SAXException(tr("Couldn't read time format \"{0}\".",time)); } } @@ -202,5 +202,5 @@ String s = atts.getValue(value); if (s == null) - throw new SAXException(tr("Missing required attirbute \"{0}\".",value)); + throw new SAXException(tr("Missing required attribute \"{0}\".",value)); return Long.parseLong(s); } Index: src/org/openstreetmap/josm/io/RawCsvReader.java =================================================================== --- src/org/openstreetmap/josm/io/RawCsvReader.java (revision 282) +++ src/org/openstreetmap/josm/io/RawCsvReader.java (revision 283) @@ -60,5 +60,5 @@ if (!format.contains("lat") || !format.contains("lon")) { if (Main.pref.get("csv.importstring").equals("")) - throw new SAXException(tr("Format string in data is incomplete or not found. Try setting an manual format string in Preferences.")); + throw new SAXException(tr("Format string in data is incomplete or not found. Try setting an manual format string in preferences.")); throw new SAXException(tr("Format string is incomplete. Need at least 'lat' and 'lon' specification")); } @@ -81,5 +81,5 @@ st.nextToken(); else - throw new SAXException(tr("Unknown data type: \"{0}\".",token)+(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add an format string in preferences.")) : "")); + throw new SAXException(tr("Unknown data type: \"{0}\".",token)+(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add a format string in preferences.")) : "")); } data.add(new GpsPoint(new LatLon(lat, lon), time)); Index: src/org/openstreetmap/josm/io/RawGpsReader.java =================================================================== --- src/org/openstreetmap/josm/io/RawGpsReader.java (revision 282) +++ src/org/openstreetmap/josm/io/RawGpsReader.java (revision 283) @@ -61,7 +61,7 @@ double lon = Double.parseDouble(atts.getValue("lon")); if (Math.abs(lat) > 90) - throw new SAXException(tr("Data error: lat value \"{0}\" is out of bound.", lat)); + throw new SAXException(tr("Data error: lat value \"{0}\" is out of bounds.", lat)); if (Math.abs(lon) > 180) - throw new SAXException(tr("Data error: lon value \"{0}\" is out of bound.", lon)); + throw new SAXException(tr("Data error: lon value \"{0}\" is out of bounds.", lon)); currentLatLon = new LatLon(lat, lon); } catch (NumberFormatException e) { Index: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 282) +++ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 283) @@ -45,5 +45,5 @@ PluginProxy plugin = ((PluginException)e).plugin; if (plugin != null && !plugin.misbehaving) { - JOptionPane.showMessageDialog(Main.parent, tr("The plugin {0} throwed an exception: {1}\nIt may be outdated. Please contact the plugin's autor.\nThis message will not shown again until JOSM is restarted.", plugin.info.name, e.getMessage())); + JOptionPane.showMessageDialog(Main.parent, tr("The plugin {0} threw an exception: {1}\nIt may be outdated. Please contact the plugin's author.\nThis message will not shown again until JOSM is restarted.", plugin.info.name, e.getMessage())); plugin.misbehaving = true; return; @@ -62,5 +62,5 @@ int answer = JOptionPane.showConfirmDialog( Main.parent, - tr("An unexpected exception occoured, that may come from in the ''{0}'' plugin.", pluginName)+"\n"+ + tr("An unexpected exception occurred, that may come from in the ''{0}'' plugin.", pluginName)+"\n"+ (author != null ? tr("According to the information within the plugin, the author is {0}.", author) : "")+"\n"+ tr("Should the plugin be disabled?"), @@ -87,7 +87,7 @@ Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")}; - int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occoured.\n\n" + + int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" + "This is always a coding error. If you are running the latest\n" + - "version of JOSM, please consider be kind and file a bug report."), + "version of JOSM, please consider being kind and file a bug report."), tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE, null, options, options[0]);