Index: trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (revision 2848) +++ trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (revision 2849) @@ -102,5 +102,5 @@ // drawRawGpsMaxLineLengthLocal drawRawGpsMaxLineLengthLocal.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.max-line-length.local", -1))); - drawRawGpsMaxLineLengthLocal.setToolTipText(tr("Maximum length (in meters) to draw lines for local files. Set to '-1' to draw all lines.")); + drawRawGpsMaxLineLengthLocal.setToolTipText(tr("Maximum length (in meters) to draw lines for local files. Set to ''-1'' to draw all lines.")); drawRawGpsMaxLineLengthLocal.setEnabled(!drawRawGpsLinesNone.isSelected()); panel.add(new JLabel(tr("Maximum length for local files (meters)")), GBC.std().insets(40,0,0,0)); @@ -109,5 +109,5 @@ // drawRawGpsMaxLineLength drawRawGpsMaxLineLength.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.max-line-length", 200))); - drawRawGpsMaxLineLength.setToolTipText(tr("Maximum length (in meters) to draw lines. Set to '-1' to draw all lines.")); + drawRawGpsMaxLineLength.setToolTipText(tr("Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines.")); drawRawGpsMaxLineLength.setEnabled(!drawRawGpsLinesNone.isSelected()); panel.add(new JLabel(tr("Maximum length (meters)")), GBC.std().insets(40,0,0,0)); @@ -139,5 +139,5 @@ // drawGpsArrowsMinDist - drawGpsArrowsMinDist.setToolTipText(tr("Don't draw arrows if they are not at least this distance away from the last one.")); + drawGpsArrowsMinDist.setToolTipText(tr("Do not draw arrows if they are not at least this distance away from the last one.")); drawGpsArrowsMinDist.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.min-arrow-distance", 0))); drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java (revision 2848) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java (revision 2849) @@ -181,5 +181,5 @@ +"conflict. If all alternatives would result in shortcuts that are already taken, it will assign a random shortcut " +"instead.

")+ - tr("

The pseudo-modifier 'disabled' will disable the shortcut when encountered.

") + tr("

The pseudo-modifier ''disabled'' will disable the shortcut when encountered.

") ); editor.setCaretPosition(0); // scroll up Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (revision 2848) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (revision 2849) @@ -59,7 +59,7 @@ parent, tr("" - + "''{0}'' isn't a valid OSM API URL.
" + + "''{0}'' is not a valid OSM API URL.
" + "Please check the spelling and validate again." - +"", + + "", url ), @@ -123,6 +123,6 @@ parent, tr("" - + "The OSM API server at ''{0}'' didn''t return a valid response.
" - + "It is likely that ''{0}'' isn''t an OSM API server.
" + + "The OSM API server at ''{0}'' did not return a valid response.
" + + "It is likely that ''{0}'' is not an OSM API server.
" + "Please check the spelling of ''{0}'' and validate again." + "", Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 2848) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 2849) @@ -184,5 +184,5 @@ gc.weightx = 1.0; JLabel lbl; - add(lbl = new JMultilineLabel(tr("You don't have an Access Token yet to access the OSM server using OAuth. Please authorise first.")), gc); + add(lbl = new JMultilineLabel(tr("You do not have an Access Token yet to access the OSM server using OAuth. Please authorise first.")), gc); lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN)); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 2848) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 2849) @@ -237,5 +237,5 @@ } if (!isValid()) { - feedbackInvalid(tr("The current value isn't a valid URL")); + feedbackInvalid(tr("The current value is not a valid URL")); } else { feedbackValid(tr("Please enter the OSM API URL.")); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java (revision 2848) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java (revision 2849) @@ -24,5 +24,5 @@ feedbackValid(tr("Please enter your OSM user name")); } else { - feedbackInvalid(tr("The user name can't be empty. Please enter your OSM user name")); + feedbackInvalid(tr("The user name cannot be empty. Please enter your OSM user name")); } }