Changeset 1676 in josm


Ignore:
Timestamp:
2009-06-17T09:02:25+02:00 (17 years ago)
Author:
stoecker
Message:

fix typos

Location:
trunk/src/org/openstreetmap/josm
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r1574 r1676  
    9090        JTextField authorName = new JTextField(Main.pref.get("lastAuthorName"));
    9191        p.add(authorName, GBC.eol().fill(GBC.HORIZONTAL));
    92         JLabel emailLabel = new JLabel(tr("Email"));
     92        JLabel emailLabel = new JLabel(tr("E-Mail"));
    9393        p.add(emailLabel, GBC.std().insets(10,0,5,0));
    9494        JTextField email = new JTextField(Main.pref.get("osm-server.username"));

  • trunk/src/org/openstreetmap/josm/actions/HelpAction.java

    r1520 r1676  
    205205                if(url.equals(langurl))
    206206                {
    207                     txt = ("<HTML>"+tr("Helppage missing. Create it in <A HREF=\"{0}\">english</A>.",
     207                    txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\">english</A>.",
    208208                    url+"?action=edit")+"</HTML>");
    209209                }
    210210                else
    211211                {
    212                     txt = ("<HTML>"+tr("Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF=\"{1}\">your language</A>.",
     212                    txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF=\"{1}\">your language</A>.",
    213213                    url+"?action=edit", langurl+"?action=edit")+"</HTML>");
    214214                }

  • trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

    r1653 r1676  
    248248     * Check the data set if it would be empty on save. It is empty, if it contains
    249249     * no objects (after all objects that are created and deleted without being
    250      * transfered to the server have been removed).
     250     * transferred to the server have been removed).
    251251     *
    252252     * @return <code>true</code>, if a save result in an empty data set.

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

    r1675 r1676  
    9393        if(! errors.equals("")) {
    9494            JOptionPane.showMessageDialog(Main.parent,
    95                     tr("The following errors occured during mass download:") + "\r\n" + errors,
     95                    tr("The following errors occurred during mass download:") + "\r\n" + errors,
    9696                    tr("Errors during Download"),
    9797                    JOptionPane.ERROR_MESSAGE);

  • trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java

    r1631 r1676  
    5050        return new DefaultMutableTreeNode(
    5151                new JLabel(
    52                         tr("Resolve conflicts in member list of of relation {0}", my.id),
     52                        tr("Resolve conflicts in member list of relation {0}", my.id),
    5353                        ImageProvider.get("data", "object"),
    5454                        JLabel.HORIZONTAL

  • trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java

    r1666 r1676  
    8080        gc.gridy = 0;
    8181        lblMergedVersion = new JLabel(tr("Merged version"));
    82         lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when  merge decisions are applied."));
     82        lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));
    8383        add(lblMergedVersion, gc);
    8484

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

    r1195 r1676  
    3434
    3535        osmDataServer.setToolTipText(tr("The base URL for the OSM server (REST API)"));
    36         osmDataUsername.setToolTipText(tr("Login name (email) to the OSM account."));
     36        osmDataUsername.setToolTipText(tr("Login name (e-mail) to the OSM account."));
    3737        osmDataPassword.setToolTipText(tr("Login password to the OSM account. Leave blank to not store any password."));
    3838
    3939        gui.connection.add(new JLabel(tr("Base Server URL")), GBC.std());
    4040        gui.connection.add(osmDataServer, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
    41         gui.connection.add(new JLabel(tr("OSM username (email)")), GBC.std());
     41        gui.connection.add(new JLabel(tr("OSM username (e-mail)")), GBC.std());
    4242        gui.connection.add(osmDataUsername, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
    4343        gui.connection.add(new JLabel(tr("OSM password")), GBC.std());
    … …  
    4545        JLabel warning = new JLabel(tr("<html>" +
    4646                "WARNING: The password is stored in plain text in the preferences file.<br>" +
    47                 "The password is transfered in plain text to the server, encoded in the URL.<br>" +
     47                "The password is transferred in plain text to the server, encoded in the URL.<br>" +
    4848        "<b>Do not use a valuable Password.</b></html>"));
    4949        warning.setFont(warning.getFont().deriveFont(Font.ITALIC));
Note: See TracChangeset for help on using the changeset viewer.