Index: org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java =================================================================== --- org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java (revision 3731) +++ org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java (working copy) @@ -21,7 +21,6 @@ import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.io.remotecontrol.RemoteControl; import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler; -import org.openstreetmap.josm.io.remotecontrol.handler.ImageryHandler; import org.openstreetmap.josm.io.remotecontrol.handler.ImportHandler; import org.openstreetmap.josm.io.remotecontrol.handler.LoadAndZoomHandler; import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler; @@ -44,19 +43,19 @@ private JCheckBox enableRemoteControl; - private JCheckBox permissionLoadData = new JCheckBox(tr("load data from API")); - private JCheckBox permissionImportData = new JCheckBox(tr("import data from URL")); - private JCheckBox permissionLoadImagery = new JCheckBox(tr("load imagery layers")); - private JCheckBox permissionCreateObjects = new JCheckBox(tr("create new objects")); - private JCheckBox permissionChangeSelection = new JCheckBox(tr("change the selection")); - private JCheckBox permissionChangeViewport = new JCheckBox(tr("change the viewport")); - private JCheckBox permissionReadProtocolversion = new JCheckBox(tr("read protocol version")); - private JCheckBox alwaysAskUserConfirm = new JCheckBox(tr("confirm all Remote Control actions manually")); + private JCheckBox permissionLoadData = new JCheckBox(tr("Load data from API")); + private JCheckBox permissionImportData = new JCheckBox(tr("Import data from URL")); + private JCheckBox permissionLoadImagery = new JCheckBox(tr("Load imagery layers")); + private JCheckBox permissionCreateObjects = new JCheckBox(tr("Create new objects")); + private JCheckBox permissionChangeSelection = new JCheckBox(tr("Change the selection")); + private JCheckBox permissionChangeViewport = new JCheckBox(tr("Change the viewport")); + private JCheckBox permissionReadProtocolversion = new JCheckBox(tr("Read protocol version")); + private JCheckBox alwaysAskUserConfirm = new JCheckBox(tr("Confirm all Remote Control actions manually")); public void addGui(final PreferenceTabbedPane gui) { - JPanel remote = gui.createPreferenceTab("remotecontrol.gif", tr("Remote Control"), tr("Settings for the Remote Control freature.")); + JPanel remote = gui.createPreferenceTab("remotecontrol.gif", tr("Remote Control"), tr("Settings for the remote control feature.")); remote.add(enableRemoteControl = new JCheckBox(tr("Enable remote control"), RemoteControl.PROP_REMOTECONTROL_ENABLED.get()), GBC.eol()); @@ -86,8 +85,8 @@ wrapper.add(alwaysAskUserConfirm, GBC.eol().fill(GBC.HORIZONTAL)); - final JLabel portLabel = new JLabel(""+tr("JOSM will always listen on port 8111 on localhost." + - "The port is not configurable because it is referenced by external applications talking to JOSM.") + ""); + final JLabel portLabel = new JLabel(""+tr("JOSM will always listen at port 8111 on localhost." + + "This port is not configurable because it is referenced by external applications talking to JOSM.") + ""); portLabel.setFont(portLabel.getFont().deriveFont(Font.PLAIN)); wrapper.add(portLabel, GBC.eol().insets(5,5,0,10).fill(GBC.HORIZONTAL)); @@ -130,7 +129,6 @@ Main.pref.put(VersionHandler.permissionKey, permissionReadProtocolversion.isSelected()); Main.pref.put(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected()); } - // FIXME confirm return value - really no restart needed? return changed; } }