Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 13590) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 13591) @@ -36,5 +36,6 @@ public AddTMSLayerPanel() { - add(new JLabel(tr("1. Enter URL")), GBC.eol()); + add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol()); + add(new JLabel(tr("{0} Enter URL", "2.")), GBC.eol()); add(new JLabel("" + Utils.joinAsHtmlUnorderedList(Arrays.asList( tr("{0} is replaced by tile zoom level, also supported:
" + @@ -52,13 +53,13 @@ rawUrl.addKeyListener(keyAdapter); - add(new JLabel(tr("2. Enter maximum zoom (optional)")), GBC.eol()); + add(new JLabel(tr("{0} Enter maximum zoom (optional)", "3.")), GBC.eol()); tmsZoom.addKeyListener(keyAdapter); add(tmsZoom, GBC.eop().fill()); - add(new JLabel(tr("3. Verify generated TMS URL")), GBC.eol()); + add(new JLabel(tr("{0} Edit generated {1} URL (optional)", "4.", "TMS")), GBC.eol()); add(tmsUrl, GBC.eop().fill()); tmsUrl.setLineWrap(true); - add(new JLabel(tr("4. Enter name for this layer")), GBC.eol()); + add(new JLabel(tr("{0} Enter name for this layer", "5.")), GBC.eol()); add(name, GBC.eop().fill()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 13590) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 13591) @@ -46,11 +46,12 @@ public AddWMSLayerPanel() { - add(new JLabel(tr("1. Enter service URL")), GBC.eol()); + add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol()); + add(new JLabel(tr("{0} Enter GetCapabilities URL", "2.")), GBC.eol()); add(rawUrl, GBC.eol().fill()); rawUrl.setLineWrap(true); - JButton getLayers = new JButton(tr("Get layers")); + JButton getLayers = new JButton(tr("{0} Get layers", "3.")); add(getLayers, GBC.eop().fill()); - add(new JLabel(tr("2. Select layers")), GBC.eol()); + add(new JLabel(tr("{0} Select layers", "4.")), GBC.eol()); add(endpoint, GBC.eol().fill()); add(new JScrollPane(tree.getLayerTree()), GBC.eol().fill().weight(1, 100)); @@ -59,8 +60,8 @@ add(showBounds, GBC.eop().fill()); - add(new JLabel(tr("3. Select image format")), GBC.eol()); + add(new JLabel(tr("{0} Select image format", "5.")), GBC.eol()); add(formats, GBC.eol().fill()); - wmsInstruction = new JLabel(tr("4. Verify generated WMS URL")); + wmsInstruction = new JLabel(tr("{0} Edit generated {1} URL (optional)", "6.", "WMS")); add(wmsInstruction, GBC.eol()); wmsInstruction.setLabelFor(wmsUrl); @@ -68,5 +69,5 @@ wmsUrl.setLineWrap(true); - add(new JLabel(tr("5. Enter name for this layer")), GBC.eol()); + add(new JLabel(tr("{0} Enter name for this layer", "7.")), GBC.eol()); add(name, GBC.eop().fill()); Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java (revision 13590) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java (revision 13591) @@ -24,9 +24,10 @@ */ public AddWMTSLayerPanel() { - add(new JLabel(tr("1. Enter getCapabilities URL")), GBC.eol()); + add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol()); + add(new JLabel(tr("{0} Enter GetCapabilities URL", "2.")), GBC.eol()); add(rawUrl, GBC.eop().fill()); rawUrl.setLineWrap(true); rawUrl.setAlignmentY(TOP_ALIGNMENT); - add(new JLabel(tr("2. Enter name for this layer")), GBC.eol()); + add(new JLabel(tr("{0} Enter name for this layer", "3.")), GBC.eol()); add(name, GBC.eol().fill(GBC.HORIZONTAL)); registerValidableComponent(rawUrl);