Changeset 283 in josm for src


Ignore:
Timestamp:
2007-07-08T00:44:20+02:00 (17 years ago)
Author:
imi
Message:
  • fixed lots of typos (thanks Bruce)
Location:
src/org/openstreetmap/josm
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • src/org/openstreetmap/josm/actions/CombineWayAction.java

    r271 r283  
    9797                cmds.add(new DeleteCommand(selectedWays));
    9898                cmds.add(new ChangeCommand(oldWay, newWay));
    99                 Main.main.editLayer().add(new SequenceCommand(tr("Combine {0} Ways", selectedWays.size()), cmds));
     99                Main.main.editLayer().add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds));
    100100                Main.ds.setSelected(oldWay);
    101101        }

  • src/org/openstreetmap/josm/actions/GpxExportAction.java

    r143 r283  
    3838public class GpxExportAction extends DiskAccessAction {
    3939
    40         private final static String warningGpl = "<html><font color='red' size='-2'>"+tr("Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks.")+"</html>";
     40        private final static String warningGpl = "<html><font color='red' size='-2'>"+tr("Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks.")+"</html>";
    4141
    4242        private final Layer layer;

  • src/org/openstreetmap/josm/actions/SaveAction.java

    r143 r283  
    6565                } catch (IOException e) {
    6666                        e.printStackTrace();
    67                         JOptionPane.showMessageDialog(Main.parent, tr("An error occoured while saving.")+"\n"+e.getMessage());
     67                        JOptionPane.showMessageDialog(Main.parent, tr("An error occurred while saving.")+"\n"+e.getMessage());
    6868                }
    6969    }

  • src/org/openstreetmap/josm/actions/UploadAction.java

    r258 r283  
    9696                                }
    9797
    98                                 return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload this changes?"),
     98                                return JOptionPane.showConfirmDialog(Main.parent, p, tr("Upload these changes?"),
    9999                                                JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
    100100                        }

  • src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

    r198 r283  
    4747                        actions.add(new AddNodeAction(mf,tr("Add node"), Mode.node, tr("Add a new node to the map")));
    4848                        actions.add(new AddNodeAction(mf, tr("Add node into segment"), Mode.nodesegment,tr( "Add a node into an existing segment")));
    49                         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")));
     49                        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")));
    5050                        setCurrent(0);
    5151                }

  • src/org/openstreetmap/josm/data/ServerSidePreferences.java

    r199 r283  
    8989                } catch (MalformedURLException e) {
    9090                        e.printStackTrace();
    91                         JOptionPane.showMessageDialog(Main.parent, tr("Could not load preferenced from server."));
     91                        JOptionPane.showMessageDialog(Main.parent, tr("Could not load preferences from server."));
    9292                }
    9393                this.connection = connection;

  • src/org/openstreetmap/josm/gui/MainApplet.java

    r199 r283  
    4646                {"username", tr("string"), tr("Name of the user.")},
    4747                {"password", tr("string"), tr("OSM Password.")},
    48                 {"geometry", tr("string"), tr("Size the applet to the given geometry (format: WIDTHxHEIGHT)")},
     48                {"geometry", tr("string"), tr("Resize the applet to the given geometry (format: WIDTHxHEIGHT)")},
    4949                {"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")},
    5050                {"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")},

  • src/org/openstreetmap/josm/gui/MainApplication.java

    r243 r283  
    143143
    144144                preConstructorInit(args);
    145                 JFrame mainFrame = new JFrame(tr("Java Open Street Map - Editor"));
     145                JFrame mainFrame = new JFrame(tr("Java OpenStreetMap - Editor"));
    146146                Main.parent = mainFrame;
    147147                final Main main = new MainApplication(mainFrame);

  • src/org/openstreetmap/josm/gui/MapView.java

    r276 r283  
    113113                        dataLayer.listenerModified.add(new ModifiedChangedListener(){
    114114                                public void modifiedChanged(boolean value, OsmDataLayer source) {
    115                                         JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java Open Street Map - Editor"));
     115                                        JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java OpenStreetMap - Editor"));
    116116                                }
    117117                        });

  • src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

    r206 r283  
    8787                } catch (FileNotFoundException x) {
    8888                        x.printStackTrace();
    89                         errorMessage = tr("File Not found")+": "+x.getMessage();
     89                        errorMessage = tr("File not found")+": "+x.getMessage();
    9090                } catch (IOException x) {
    9191                        x.printStackTrace();

  • src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

    r273 r283  
    275275         */
    276276        public PropertiesDialog(MapFrame mapFrame) {
    277                 super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P, 150);
     277                super(tr("Properties"), "propertiesdialog", tr("Properties for selected objects."), KeyEvent.VK_P, 150);
    278278
    279279                if (AnnotationPresetPreference.annotationPresets.size() > 0) {

  • src/org/openstreetmap/josm/gui/download/WorldChooser.java

    r242 r283  
    9797                temp.setLayout(new BorderLayout());
    9898                temp.add(this, BorderLayout.CENTER);
    99                 temp.add(new JLabel(tr("You can use the mouse or Ctrl+Arrow keys/./, to zoom and pan.")), BorderLayout.SOUTH);
     99                temp.add(new JLabel(tr("You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan.")), BorderLayout.SOUTH);
    100100                gui.tabpane.add(temp, "Map");
    101101                new MapMover(this, temp);               

  • src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

    r198 r283  
    6363                public void actionPerformed(ActionEvent e) {
    6464                        JPanel msg = new JPanel(new GridBagLayout());
    65                         msg.add(new JLabel(tr("<html>Upload of unprocessed GPS data as map data is considered harmfull.<br>If you want to upload traces, look here:")), GBC.eol());
     65                        msg.add(new JLabel(tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:")), GBC.eol());
    6666                        msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());
    6767                        if (!DontShowAgainInfo.show("convert_to_data", msg))

  • src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

    r266 r283  
    3030                });
    3131                drawRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines"));
    32                 drawRawGpsLines.setToolTipText(tr("If your gps device draw to few lines, select this to draw lines along your way."));
     32                drawRawGpsLines.setToolTipText(tr("If your gps device draw too few lines, select this to draw lines along your way."));
    3333                gui.display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
    3434

  • src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

    r282 r283  
    6565        public void addGui(final PreferenceDialog gui) {
    6666                this.gui = gui;
    67                 plugin = gui.createPreferenceTab("plugin", tr("Plugins"), tr("Configure available Plugins."));
     67                plugin = gui.createPreferenceTab("plugin", tr("Plugins"), tr("Configure available plugins."));
    6868                JScrollPane pluginPane = new JScrollPane(pluginPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
    6969                pluginPane.setBorder(null);

  • src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

    r186 r283  
    3737        // some common tabs
    3838        public final JPanel display = createPreferenceTab("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."));
    39         public final JPanel connection = createPreferenceTab("connection", I18n.tr("Connection Settings"), I18n.tr("Connection Settings to the OSM server."));
     39        public final JPanel connection = createPreferenceTab("connection", I18n.tr("Connection Settings"), I18n.tr("Connection Settings for the OSM server."));
    4040        public final JPanel map = createPreferenceTab("map", I18n.tr("Map Settings"), I18n.tr("Settings for the map projection and data interpretation."));
    4141

  • src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java

    r168 r283  
    3232                osmDataPassword.setText(Main.pref.get("osm-server.password"));
    3333
    34                 osmDataServer.setToolTipText(tr("The base URL to the OSM server (REST API)"));
     34                osmDataServer.setToolTipText(tr("The base URL for the OSM server (REST API)"));
    3535                osmDataUsername.setToolTipText(tr("Login name (email) to the OSM account."));
    3636                osmDataPassword.setToolTipText(tr("Login password to the OSM account. Leave blank to not store any password."));

  • src/org/openstreetmap/josm/io/OsmReader.java

    r276 r283  
    139139                        } catch (NullPointerException x) {
    140140                                x.printStackTrace(); // SAXException does not chain correctly
    141                                 throw new SAXException(tr("NullPointerException. Possible some missing tags."), x);
     141                                throw new SAXException(tr("NullPointerException, Possibly some missing tags."), x);
    142142                        }
    143143                }
    … …  
    174174                        } catch (ParseException e) {
    175175                                e.printStackTrace();
    176                                 throw new SAXException(tr("Couldn''t read time format \"{0}\".",time));
     176                                throw new SAXException(tr("Couldn't read time format \"{0}\".",time));
    177177                        }
    178178                }
    … …  
    202202                String s = atts.getValue(value);
    203203                if (s == null)
    204                         throw new SAXException(tr("Missing required attirbute \"{0}\".",value));
     204                        throw new SAXException(tr("Missing required attribute \"{0}\".",value));
    205205                return Long.parseLong(s);
    206206        }

  • src/org/openstreetmap/josm/io/RawCsvReader.java

    r212 r283  
    6060                if (!format.contains("lat") || !format.contains("lon")) {
    6161                        if (Main.pref.get("csv.importstring").equals(""))
    62                                 throw new SAXException(tr("Format string in data is incomplete or not found. Try setting an manual format string in Preferences."));
     62                                throw new SAXException(tr("Format string in data is incomplete or not found. Try setting an manual format string in preferences."));
    6363                        throw new SAXException(tr("Format string is incomplete. Need at least 'lat' and 'lon' specification"));
    6464                }
    … …  
    8181                                                st.nextToken();
    8282                                        else
    83                                                 throw new SAXException(tr("Unknown data type: \"{0}\".",token)+(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add an format string in preferences.")) : ""));
     83                                                throw new SAXException(tr("Unknown data type: \"{0}\".",token)+(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add a format string in preferences.")) : ""));
    8484                                }
    8585                                data.add(new GpsPoint(new LatLon(lat, lon), time));

  • src/org/openstreetmap/josm/io/RawGpsReader.java

    r215 r283  
    6161                                        double lon = Double.parseDouble(atts.getValue("lon"));
    6262                                        if (Math.abs(lat) > 90)
    63                                                 throw new SAXException(tr("Data error: lat value \"{0}\" is out of bound.", lat));
     63                                                throw new SAXException(tr("Data error: lat value \"{0}\" is out of bounds.", lat));
    6464                                        if (Math.abs(lon) > 180)
    65                                                 throw new SAXException(tr("Data error: lon value \"{0}\" is out of bound.", lon));
     65                                                throw new SAXException(tr("Data error: lon value \"{0}\" is out of bounds.", lon));
    6666                                        currentLatLon = new LatLon(lat, lon);
    6767                                } catch (NumberFormatException e) {

  • src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r267 r283  
    4545                                PluginProxy plugin = ((PluginException)e).plugin;
    4646                                if (plugin != null && !plugin.misbehaving) {
    47                                         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()));
     47                                        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()));
    4848                                        plugin.misbehaving = true;
    4949                                        return;
    … …  
    6262                                        int answer = JOptionPane.showConfirmDialog(
    6363                                                        Main.parent,
    64                                                         tr("An unexpected exception occoured, that may come from in the ''{0}'' plugin.", pluginName)+"\n"+
     64                                                        tr("An unexpected exception occurred, that may come from in the ''{0}'' plugin.", pluginName)+"\n"+
    6565                                                                (author != null ? tr("According to the information within the plugin, the author is {0}.", author) : "")+"\n"+
    6666                                                                tr("Should the plugin be disabled?"),
    … …  
    8787
    8888                        Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
    89                         int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occoured.\n\n" +
     89                        int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
    9090                                        "This is always a coding error. If you are running the latest\n" +
    91                         "version of JOSM, please consider be kind and file a bug report."),
     91                        "version of JOSM, please consider being kind and file a bug report."),
    9292                        tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
    9393                        null, options, options[0]);
Note: See TracChangeset for help on using the changeset viewer.