Index: trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(revision 11707)
+++ trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(revision 11708)
@@ -4,9 +4,14 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.util.List;
 
 import javax.swing.AbstractAction;
+import javax.swing.JCheckBoxMenuItem;
 
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -16,5 +21,5 @@
  * of the layer specified in the constructor.
  */
-public class ToggleUploadDiscouragedLayerAction extends AbstractAction {
+public class ToggleUploadDiscouragedLayerAction extends AbstractAction implements LayerAction {
 
     private final transient OsmDataLayer layer;
@@ -25,5 +30,5 @@
      */
     public ToggleUploadDiscouragedLayerAction(OsmDataLayer layer) {
-        super(tr("Encourage/discourage upload"), ImageProvider.get("no_upload"));
+        super(tr("Discourage upload"), ImageProvider.get("no_upload"));
         this.layer = layer;
     }
@@ -34,3 +39,15 @@
         LayerListDialog.getInstance().repaint();
     }
+
+    @Override
+    public Component createMenuComponent() {
+        JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+        item.setSelected(layer.isUploadDiscouraged());
+        return item;
+    }
+
+    @Override
+    public boolean supportLayers(List<Layer> layers) {
+        return layers.size() == 1 && layers.get(0) instanceof OsmDataLayer;
+    }
 }