Changeset 2849 in josm for trunk


Ignore:
Timestamp:
2010-01-13T20:14:22+01:00 (14 years ago)
Author:
mjulius
Message:

fix messages for gui/preferences

Location:
trunk/src/org/openstreetmap/josm/gui/preferences
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r2745 r2849  
    102102        // drawRawGpsMaxLineLengthLocal
    103103        drawRawGpsMaxLineLengthLocal.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.max-line-length.local", -1)));
    104         drawRawGpsMaxLineLengthLocal.setToolTipText(tr("Maximum length (in meters) to draw lines for local files. Set to '-1' to draw all lines."));
     104        drawRawGpsMaxLineLengthLocal.setToolTipText(tr("Maximum length (in meters) to draw lines for local files. Set to ''-1'' to draw all lines."));
    105105        drawRawGpsMaxLineLengthLocal.setEnabled(!drawRawGpsLinesNone.isSelected());
    106106        panel.add(new JLabel(tr("Maximum length for local files (meters)")), GBC.std().insets(40,0,0,0));
    … …  
    109109        // drawRawGpsMaxLineLength
    110110        drawRawGpsMaxLineLength.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.max-line-length", 200)));
    111         drawRawGpsMaxLineLength.setToolTipText(tr("Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."));
     111        drawRawGpsMaxLineLength.setToolTipText(tr("Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."));
    112112        drawRawGpsMaxLineLength.setEnabled(!drawRawGpsLinesNone.isSelected());
    113113        panel.add(new JLabel(tr("Maximum length (meters)")), GBC.std().insets(40,0,0,0));
    … …  
    139139
    140140        // drawGpsArrowsMinDist
    141         drawGpsArrowsMinDist.setToolTipText(tr("Don't draw arrows if they are not at least this distance away from the last one."));
     141        drawGpsArrowsMinDist.setToolTipText(tr("Do not draw arrows if they are not at least this distance away from the last one."));
    142142        drawGpsArrowsMinDist.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.min-arrow-distance", 0)));
    143143        drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());

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

    r2789 r2849  
    181181                      +"conflict. If all alternatives would result in shortcuts that are already taken, it will assign a random shortcut "
    182182                      +"instead.</p>")+
    183                     tr("<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered.</p>")
     183                    tr("<p>The pseudo-modifier ''disabled'' will disable the shortcut when encountered.</p>")
    184184                );
    185185                editor.setCaretPosition(0); // scroll up

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

    r2801 r2849  
    5959                parent,
    6060                tr("<html>"
    61                         + "''{0}'' isn't a valid OSM API URL.<br>"
     61                        + "''{0}'' is not a valid OSM API URL.<br>"
    6262                        + "Please check the spelling and validate again."
    63                         +"</html>",
     63                        + "</html>",
    6464                        url
    6565                ),
    … …  
    123123                parent,
    124124                tr("<html>"
    125                         + "The OSM API server at ''{0}'' didn''t return a valid response.<br>"
    126                         + "It is likely that ''{0}'' isn''t an OSM API server.<br>"
     125                        + "The OSM API server at ''{0}'' did not return a valid response.<br>"
     126                        + "It is likely that ''{0}'' is not an OSM API server.<br>"
    127127                        + "Please check the spelling of ''{0}'' and validate again."
    128128                        + "</html>",

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

    r2804 r2849  
    184184            gc.weightx = 1.0;
    185185            JLabel lbl;
    186             add(lbl = new JMultilineLabel(tr("You don't have an Access Token yet to access the OSM server using OAuth. Please authorise first.")), gc);
     186            add(lbl = new JMultilineLabel(tr("You do not have an Access Token yet to access the OSM server using OAuth. Please authorise first.")), gc);
    187187            lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
    188188

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java

    r2801 r2849  
    237237            }
    238238            if (!isValid()) {
    239                 feedbackInvalid(tr("The current value isn't a valid URL"));
     239                feedbackInvalid(tr("The current value is not a valid URL"));
    240240            } else {
    241241                feedbackValid(tr("Please enter the OSM API URL."));

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java

    r2801 r2849  
    2424            feedbackValid(tr("Please enter your OSM user name"));
    2525        } else {
    26             feedbackInvalid(tr("The user name can't be empty. Please enter your OSM user name"));
     26            feedbackInvalid(tr("The user name cannot be empty. Please enter your OSM user name"));
    2727        }
    2828    }
Note: See TracChangeset for help on using the changeset viewer.