Changeset 17188 in josm


Ignore:
Timestamp:
2020-10-13T20:21:52+02:00 (8 days ago)
Author:
Klumbumbus
Message:

fix #19851 - Fix shortcut names

Location:
trunk/src/org/openstreetmap/josm
Files:
59 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/AboutAction.java

    r16904 r17188  
    6363    public AboutAction() {
    6464        super(tr("About"), "logo", tr("Display the about screen."),
    65             Shortcut.registerShortcut("system:about", tr("About"),
     65            Shortcut.registerShortcut("system:about", tr("Help: {0}", tr("About")),
    6666            KeyEvent.VK_F1, Shortcut.SHIFT), true, false);
    6767    }
  • trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

    r16509 r17188  
    3535    public AddNodeAction() {
    3636        super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude / longitude or easting / northing."),
    37                 Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")),
     37                Shortcut.registerShortcut("addnode", tr("Tools: {0}", tr("Add Node...")),
    3838                        KeyEvent.VK_D, Shortcut.SHIFT), true);
    3939        setHelpId(ht("/Action/AddNode"));
  • trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

    r17138 r17188  
    4949    public AlignInCircleAction() {
    5050        super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."),
    51                 Shortcut.registerShortcut("tools:aligncircle", tr("Tool: {0}", tr("Align Nodes in Circle")),
     51                Shortcut.registerShortcut("tools:aligncircle", tr("Tools: {0}", tr("Align Nodes in Circle")),
    5252                        KeyEvent.VK_O, Shortcut.DIRECT), true);
    5353        setHelpId(ht("/Action/AlignInCircle"));
  • trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

    r16913 r17188  
    5656    public AlignInLineAction() {
    5757        super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes in to a line."),
    58                 Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.DIRECT), true);
     58                Shortcut.registerShortcut("tools:alignline", tr("Tools: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.DIRECT), true);
    5959        setHelpId(ht("/Action/AlignInLine"));
    6060    }
  • trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java

    r16522 r17188  
    3030                tr("Toggle visibility of Changeset Manager window"),
    3131                Shortcut.registerShortcut("menu:windows:changesetdialog",
    32                         tr("Toggle visibility of Changeset Manager window"), KeyEvent.VK_C, Shortcut.ALT_CTRL),
     32                        tr("Windows: {0}", tr("Changeset Manager")), KeyEvent.VK_C, Shortcut.ALT_CTRL),
    3333                true /* register shortcut */, "dialogs/changeset/changesetmanager", false);
    3434        notifySelectedState();
  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r16732 r17188  
    6464    public CombineWayAction() {
    6565        super(tr("Combine Way"), "combineway", tr("Combine several ways into one."),
    66                 Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.DIRECT), true);
     66                Shortcut.registerShortcut("tools:combineway", tr("Tools: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.DIRECT), true);
    6767        setHelpId(ht("/Action/CombineWay"));
    6868    }
  • trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

    r17110 r17188  
    5858    public CreateCircleAction() {
    5959        super(tr("Create Circle"), "aligncircle", tr("Create a circle from three selected nodes."),
    60             Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")),
     60            Shortcut.registerShortcut("tools:createcircle", tr("Tools: {0}", tr("Create Circle")),
    6161            KeyEvent.VK_O, Shortcut.SHIFT), true, "createcircle", true);
    6262        setHelpId(ht("/Action/CreateCircle"));
  • trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

    r17033 r17188  
    8484                /* at least three lines for each shortcut or the server extractor fails */
    8585                update ? Shortcut.registerShortcut("tools:multipoly_update",
    86                             tr("Tool: {0}", getName(true)),
     86                            tr("Tools: {0}", getName(true)),
    8787                            KeyEvent.VK_B, Shortcut.CTRL_SHIFT)
    8888                       : Shortcut.registerShortcut("tools:multipoly_create",
    89                             tr("Tool: {0}", getName(false)),
     89                            tr("Tools: {0}", getName(false)),
    9090                            KeyEvent.VK_B, Shortcut.CTRL),
    9191                true, update ? "multipoly_update" : "multipoly_create", true);
  • trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java

    r17018 r17188  
    3131              new ImageProvider("dialogs/dialogs_panel"),
    3232              tr("Toggle dialogs panel, maximize mapview"),
    33               Shortcut.registerShortcut("menu:view:dialogspanel", tr("Toggle dialogs panel"), KeyEvent.VK_TAB, Shortcut.DIRECT),
     33              Shortcut.registerShortcut("menu:view:dialogspanel", tr("View: {0}", tr("Dialogs panel")), KeyEvent.VK_TAB, Shortcut.DIRECT),
    3434              true, "dialogspanel", /* register in toolbar */
    3535              false
  • trunk/src/org/openstreetmap/josm/actions/DistributeAction.java

    r16467 r17188  
    4040        super(tr("Distribute Nodes"), "distribute",
    4141              tr("Distribute the selected nodes to equal distances along a line."),
    42               Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.SHIFT),
     42              Shortcut.registerShortcut("tools:distribute", tr("Tools: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.SHIFT),
    4343              true);
    4444        setHelpId(ht("/Action/DistributeNodes"));
  • trunk/src/org/openstreetmap/josm/actions/ExitAction.java

    r16505 r17188  
    2222    public ExitAction() {
    2323        super(tr("Exit"), "exit", tr("Exit the application."),
    24                 Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.CTRL), true, false);
     24                Shortcut.registerShortcut("system:menuexit", tr("File: {0}", tr("Exit")), KeyEvent.VK_Q, Shortcut.CTRL), true, false);
    2525        setHelpId(ht("/Action/Exit"));
    2626    }
  • trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java

    r17141 r17188  
    4646                tr("Continues drawing a line that shares nodes with another line."),
    4747                Shortcut.registerShortcut("tools:followline", tr(
    48                 "Tool: {0}", tr("Follow")),
     48                "Tools: {0}", tr("Follow")),
    4949                KeyEvent.VK_F, Shortcut.DIRECT), true);
    5050    }
  • trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

    r17018 r17188  
    4141              new ImageProvider("fullscreen"),
    4242              tr("Toggle fullscreen view"),
    43               Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"), KeyEvent.VK_F11, Shortcut.DIRECT),
     43              Shortcut.registerShortcut("menu:view:fullscreen", tr("View: {0}", tr("Fullscreen view")), KeyEvent.VK_F11, Shortcut.DIRECT),
    4444              false /* register */, null, false
    4545        );
  • trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

    r16509 r17188  
    3535    public GpxExportAction() {
    3636        super(tr("Export to GPX..."), "exportgpx", tr("Export the data to GPX file."),
    37                 Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX..."), KeyEvent.VK_E, Shortcut.CTRL));
     37                Shortcut.registerShortcut("file:exportgpx", tr("File: {0}", tr("Export to GPX...")), KeyEvent.VK_E, Shortcut.CTRL));
    3838        setHelpId(ht("/Action/GpxExport"));
    3939    }
  • trunk/src/org/openstreetmap/josm/actions/HelpAction.java

    r16509 r17188  
    3434    private HelpAction(boolean shortcut) {
    3535        super(tr("Help"), "help", null,
    36                 shortcut ? Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT) : null,
     36                shortcut ? Shortcut.registerShortcut("system:help", tr("Help: {0}", tr("Help")), KeyEvent.VK_F1, Shortcut.DIRECT) : null,
    3737                true, false);
    3838        setEnabled(!NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE));
  • trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

    r16512 r17188  
    3030
    3131    /** Action shortcut, made public in order to be used from {@code GettingStarted} page. */
    32     public static final Shortcut SHORTCUT = Shortcut.registerShortcut("core:historyinfo", tr("History"), KeyEvent.VK_H, Shortcut.CTRL);
     32    public static final Shortcut SHORTCUT = Shortcut.registerShortcut("core:historyinfo", tr("View: {0}", tr("History")),
     33        KeyEvent.VK_H, Shortcut.CTRL);
    3334
    3435    /**
  • trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java

    r14397 r17188  
    2525                tr("Display history information about OSM ways, nodes, or relations in web browser."),
    2626                Shortcut.registerShortcut("core:historyinfoweb",
    27                         tr("History (web)"), KeyEvent.VK_H, Shortcut.CTRL_SHIFT),
     27                        tr("View: {0}", tr("History (web)")), KeyEvent.VK_H, Shortcut.CTRL_SHIFT),
    2828                true, "action/historyinfoweb", true);
    2929        setHelpId(ht("/Action/ObjectHistoryWeb"));
  • trunk/src/org/openstreetmap/josm/actions/InfoAction.java

    r14397 r17188  
    2727            tr("Display advanced object information about OSM nodes, ways, or relations."),
    2828            Shortcut.registerShortcut("core:info",
    29                 tr("Advanced info"), KeyEvent.VK_I, Shortcut.CTRL),
     29                tr("View: {0}", tr("Advanced info")), KeyEvent.VK_I, Shortcut.CTRL),
    3030            true, "action/info", true);
    3131        setHelpId(ht("/Action/InfoAboutElements"));
  • trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java

    r14397 r17188  
    2929                tr("Display object information about OSM nodes, ways, or relations in web browser."),
    3030                Shortcut.registerShortcut("core:infoweb",
    31                         tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.CTRL_SHIFT),
     31                        tr("View: {0}", tr("Advanced info (web)")), KeyEvent.VK_I, Shortcut.CTRL_SHIFT),
    3232                true, "action/infoweb", true);
    3333        setHelpId(ht("/Action/InfoAboutElementsWeb"));
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r17167 r17188  
    469469    public JoinAreasAction(boolean addShortcutToolbarAdapters) {
    470470        super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"), addShortcutToolbarAdapters ?
    471         Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
     471        Shortcut.registerShortcut("tools:joinareas", tr("Tools: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
    472472        : null, addShortcutToolbarAdapters, null, addShortcutToolbarAdapters);
    473473        addUndoRedo = addShortcutToolbarAdapters;
  • trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

    r17141 r17188  
    6767                tr("Join Node to Way"), /* ICON */ "joinnodeway",
    6868                tr("Include a node into the nearest way segments"),
    69                 Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join Node to Way")),
     69                Shortcut.registerShortcut("tools:joinnodeway", tr("Tools: {0}", tr("Join Node to Way")),
    7070                        KeyEvent.VK_J, Shortcut.DIRECT), true);
    7171        action.setHelpId(ht("/Action/JoinNodeWay"));
     
    8181                tr("Move Node onto Way"), /* ICON*/ "movenodeontoway",
    8282                tr("Move the node onto the nearest way segments and include it"),
    83                 Shortcut.registerShortcut("tools:movenodeontoway", tr("Tool: {0}", tr("Move Node onto Way")),
     83                Shortcut.registerShortcut("tools:movenodeontoway", tr("Tools: {0}", tr("Move Node onto Way")),
    8484                        KeyEvent.VK_N, Shortcut.DIRECT), true);
    8585        action.setHelpId(ht("/Action/MoveNodeWay"));
  • trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

    r17022 r17188  
    5454    public JumpToAction() {
    5555        super(tr("Jump to Position"), "dialogs/position", tr("Opens a dialog that allows to jump to a specific location"),
    56                 Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump to Position")),
     56                Shortcut.registerShortcut("tools:jumpto", tr("View: {0}", tr("Jump to Position")),
    5757                        KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", false);
    5858        // make this action listen to mapframe change events
  • trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

    r17003 r17188  
    4040            tr("Merge the current layer into another layer"),
    4141            Shortcut.registerShortcut("system:merge", tr("Edit: {0}",
    42             tr("Merge")), KeyEvent.VK_M, Shortcut.CTRL),
     42            tr("Merge layer")), KeyEvent.VK_M, Shortcut.CTRL),
    4343            true, "action/mergelayer", true);
    4444        setHelpId(ht("/Action/MergeLayer"));
  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r16438 r17188  
    6868    public MergeNodesAction() {
    6969        super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."),
    70                 Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.DIRECT), true);
     70                Shortcut.registerShortcut("tools:mergenodes", tr("Tools: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.DIRECT), true);
    7171        setHelpId(ht("/Action/MergeNodes"));
    7272    }
  • trunk/src/org/openstreetmap/josm/actions/MirrorAction.java

    r16438 r17188  
    3838    public MirrorAction() {
    3939        super(tr("Mirror"), "mirror", tr("Mirror selected nodes and ways."),
    40                 Shortcut.registerShortcut("tools:mirror", tr("Tool: {0}", tr("Mirror")),
     40                Shortcut.registerShortcut("tools:mirror", tr("Tools: {0}", tr("Mirror")),
    4141                        KeyEvent.VK_M, Shortcut.SHIFT), true);
    4242        setHelpId(ht("/Action/Mirror"));
  • trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java

    r15023 r17188  
    3030    public MoveNodeAction() {
    3131        super(tr("Move Node..."), "movenode", tr("Edit latitude and longitude of a node."),
    32                 Shortcut.registerShortcut("movenode", tr("Edit: {0}", tr("Move Node...")),
     32                Shortcut.registerShortcut("movenode", tr("Tools: {0}", tr("Move Node...")),
    3333                        KeyEvent.VK_M, Shortcut.NONE), true);
    3434        setHelpId(ht("/Action/MoveNode"));
  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r16438 r17188  
    6464                "ortho",
    6565                tr("Move nodes so all angles are 90 or 180 degrees"),
    66                 Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize Shape")),
     66                Shortcut.registerShortcut("tools:orthogonalize", tr("Tools: {0}", tr("Orthogonalize Shape")),
    6767                        KeyEvent.VK_Q,
    6868                        Shortcut.DIRECT), true);
     
    9999            super(tr("Orthogonalize Shape / Undo"), "ortho",
    100100                    tr("Undo orthogonalization for certain nodes"),
    101                     Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Tool: {0}", tr("Orthogonalize Shape / Undo")),
     101                    Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Orthogonalize Shape / Undo"),
    102102                            KeyEvent.VK_Q,
    103103                            Shortcut.SHIFT),
  • trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java

    r17097 r17188  
    9090    public PreferencesAction() {
    9191        super(tr("Preferences..."), "preference", tr("Open a preferences dialog for global settings."),
    92                 Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true, false);
     92                Shortcut.registerShortcut("system:preferences", tr("Edit: {0}", tr("Preferences")), KeyEvent.VK_F12, Shortcut.DIRECT),
     93                true, false);
    9394        setHelpId(ht("/Action/Preferences"));
    9495        this.tab = null;
  • trunk/src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java

    r16509 r17188  
    2424    public ReorderImageryLayersAction() {
    2525        super(tr("Reorder imagery layers"), "dialogs/reorderlayers", tr("Reorders non-overlay imagery layers."),
    26             Shortcut.registerMultiShortcuts("imagery:reorder", tr("Reorder imagery layers"),
     26            Shortcut.registerMultiShortcuts("imagery:reorder", tr("Imagery: {0}", tr("Reorder imagery layers")),
    2727                    KeyboardUtils.getCharactersForKey('E', 0), Shortcut.DIRECT));
    2828    }
  • trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java

    r16509 r17188  
    3131    public ReportBugAction(String text) {
    3232        super(tr("Report bug"), "bug", tr("Report a ticket to JOSM bugtracker"),
    33                 Shortcut.registerShortcut("reportbug", tr("Report a ticket to JOSM bugtracker"),
     33                Shortcut.registerShortcut("reportbug", tr("Help: {0}", tr("Report bug")),
    3434                        KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true, false);
    3535        this.text = text;
  • trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

    r16630 r17188  
    106106    public ReverseWayAction() {
    107107        super(tr("Reverse Ways"), "wayflip", tr("Reverse the direction of all selected ways."),
    108                 Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.DIRECT), true);
     108                Shortcut.registerShortcut("tools:reverse", tr("Tools: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.DIRECT), true);
    109109        setHelpId(ht("/Action/ReverseWays"));
    110110    }
  • trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

    r17110 r17188  
    6565    public SimplifyWayAction() {
    6666        super(tr("Simplify Way"), "simplify", tr("Delete unnecessary nodes from a way."),
    67                 Shortcut.registerShortcut("tools:simplify", tr("Tool: {0}", tr("Simplify Way")), KeyEvent.VK_Y, Shortcut.SHIFT), true);
     67                Shortcut.registerShortcut("tools:simplify", tr("Tools: {0}", tr("Simplify Way")), KeyEvent.VK_Y, Shortcut.SHIFT), true);
    6868        setHelpId(ht("/Action/SimplifyWay"));
    6969    }
  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r15943 r17188  
    5656    public SplitWayAction() {
    5757        super(tr("Split Way"), "splitway", tr("Split a way at the selected node."),
    58                 Shortcut.registerShortcut("tools:splitway", tr("Tool: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.DIRECT), true);
     58                Shortcut.registerShortcut("tools:splitway", tr("Tools: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.DIRECT), true);
    5959        setHelpId(ht("/Action/SplitWay"));
    6060    }
  • trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java

    r16509 r17188  
    2323    public TaggingPresetSearchAction() {
    2424        super(tr("Search preset..."), "dialogs/search", tr("Show preset search dialog"),
    25                 Shortcut.registerShortcut("preset:search", tr("Search presets"), KeyEvent.VK_F3, Shortcut.DIRECT), false);
     25                Shortcut.registerShortcut("preset:search", tr("Presets: {0}", tr("Search preset...")), KeyEvent.VK_F3, Shortcut.DIRECT), false);
    2626        setToolbarId("presets/search");
    2727        MainApplication.getToolbar().register(this);
  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r17187 r17188  
    6161    public UnGlueAction() {
    6262        super(tr("UnGlue Ways"), "unglueways", tr("Duplicate nodes that are used by multiple ways."),
    63                 Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.DIRECT), true);
     63                Shortcut.registerShortcut("tools:unglue", tr("Tools: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.DIRECT), true);
    6464        setHelpId(ht("/Action/UnGlue"));
    6565    }
  • trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java

    r16438 r17188  
    3939                tr("Disconnect nodes from a way they currently belong to"),
    4040                Shortcut.registerShortcut("tools:unjoinnodeway",
    41                     tr("Tool: {0}", tr("Disconnect Node from Way")), KeyEvent.VK_J, Shortcut.ALT), true);
     41                    tr("Tools: {0}", tr("Disconnect Node from Way")), KeyEvent.VK_J, Shortcut.ALT), true);
    4242        setHelpId(ht("/Action/UnJoinNodeWay"));
    4343    }
  • trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

    r16227 r17188  
    4545    public ValidateAction() {
    4646        super(tr("Validation"), "dialogs/validator", tr("Performs the data validation"),
    47                 Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")),
     47                Shortcut.registerShortcut("tools:validate", tr("Validation"),
    4848                        KeyEvent.VK_V, Shortcut.SHIFT), true);
    4949    }
  • trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java

    r16509 r17188  
    3232              "viewport-follow",
    3333              tr("Enable/disable automatic moving of the map view to last placed node"),
    34               Shortcut.registerShortcut("menu:view:viewportfollow", tr("Toggle Viewport Following"),
     34              Shortcut.registerShortcut("menu:view:viewportfollow", tr("View: {0}", tr("Viewport Following")),
    3535              KeyEvent.VK_F, Shortcut.CTRL_SHIFT),
    3636              true /* register shortcut */
  • trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java

    r17018 r17188  
    2727              "dialogs/mappaint/wireframe_small",
    2828              tr("Enable/disable rendering the map as wireframe only"),
    29               Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"), KeyEvent.VK_W, Shortcut.CTRL),
     29              Shortcut.registerShortcut("menu:view:wireframe", tr("View: {0}", tr("Wireframe View")), KeyEvent.VK_W, Shortcut.CTRL),
    3030              false /* register toolbar */
    3131        );
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r17143 r17188  
    172172
    173173        snappingShortcut = Shortcut.registerShortcut("mapmode:drawanglesnapping",
    174                 tr("Mode: Draw Angle snapping"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
     174                tr("Edit: {0}", tr("Draw Angle snapping")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
    175175        snapChangeAction = new SnapChangeAction();
    176176        snapCheckboxMenuItem = addMenuItem();
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r17184 r17188  
    232232        dualAlignCheckboxMenuItem.setState(dualAlignEnabled);
    233233        dualAlignShortcut = Shortcut.registerShortcut("mapmode:extrudedualalign",
    234                 tr("Mode: {0}", tr("Extrude Dual alignment")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
     234                tr("Edit: {0}", tr("Extrude Dual alignment")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
    235235        readPreferences(); // to show prefernces in table before entering the mode
    236236    }
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r16509 r17188  
    144144    public SearchAction() {
    145145        super(tr("Search..."), "dialogs/search", tr("Search for objects"),
    146                 Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.CTRL), true);
     146                Shortcut.registerShortcut("system:find", tr("Edit: {0}", tr("Search...")), KeyEvent.VK_F, Shortcut.CTRL), true);
    147147        setHelpId(ht("/Action/Search"));
    148148    }
  • trunk/src/org/openstreetmap/josm/gui/MainInitialization.java

    r17080 r17188  
    8080                // help shortcut
    8181                MainApplication.registerActionShortcut(MainApplication.menu.help,
    82                         Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT));
     82                        Shortcut.registerShortcut("system:help", tr("Help: {0}", tr("Help")), KeyEvent.VK_F1, Shortcut.DIRECT));
    8383            }),
    8484            new InitializationTask(tr("Initializing internal boundaries data"), () -> {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

    r17062 r17188  
    253253                "changesetdialog",
    254254                tr("Open the list of changesets in the current layer."),
    255                 Shortcut.registerShortcut("subwindow:changesets", tr("Toggle: {0}", tr("Changesets")),
     255                Shortcut.registerShortcut("subwindow:changesets", tr("Windows: {0}", tr("Changesets")),
    256256                    KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
    257257                200, /* the preferred height */
  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r16789 r17188  
    9595    public CommandStackDialog() {
    9696        super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
    97                 Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}",
     97                Shortcut.registerShortcut("subwindow:commandstack", tr("Windows: {0}",
    9898                tr("Command Stack")), KeyEvent.VK_O, Shortcut.ALT_SHIFT), 100);
    9999        undoTree.addMouseListener(new MouseEventHandler());
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r17093 r17188  
    102102    public ConflictDialog() {
    103103        super(tr("Conflict"), "conflict", tr("Resolve conflicts"),
    104                 Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
     104                Shortcut.registerShortcut("subwindow:conflict", tr("Windows: {0}", tr("Conflict")),
    105105                KeyEvent.VK_C, Shortcut.ALT_SHIFT), 100);
    106106
  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r17148 r17188  
    8181    public FilterDialog() {
    8282        super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."),
    83                 Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")),
     83                Shortcut.registerShortcut("subwindow:filter", tr("Windows: {0}", tr("Filter")),
    8484                        KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
    8585        build();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r16960 r17188  
    197197    public LayerListDialog(MainLayerManager layerManager) {
    198198        super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."),
    199                 Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L,
     199                Shortcut.registerShortcut("subwindow:layers", tr("Windows: {0}", tr("Layers")), KeyEvent.VK_L,
    200200                        Shortcut.ALT_SHIFT), 100, true);
    201201        this.layerManager = layerManager;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

    r17161 r17188  
    113113    public MapPaintDialog() {
    114114        super(tr("Map Paint Styles"), "mapstyle", tr("configure the map painting style"),
    115                 Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
     115                Shortcut.registerShortcut("subwindow:mappaint", tr("Windows: {0}", tr("Map Paint Styles")),
    116116                        KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150, false, MapPaintPreference.class);
    117117        build();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java

    r16423 r17188  
    125125        // CHECKSTYLE.OFF: LineLength
    126126        /** Action shortcut (ctrl / space by default), made public in order to be used from {@code GettingStarted} page. */
    127         public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL);
     127        public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", tr("Help: {0}", tr("Search menu items")), KeyEvent.VK_SPACE, Shortcut.CTRL);
    128128        // CHECKSTYLE.ON: LineLength
    129129
  • trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java

    r17062 r17188  
    3030    public MinimapDialog() {
    3131        super(tr("Mini map"), "minimap", tr("Displays a small map of the current edit location"),
    32                 Shortcut.registerShortcut("subwindow:minimap", tr("Toggle: {0}", tr("Mini map")),
     32                Shortcut.registerShortcut("subwindow:minimap", tr("Windows: {0}", tr("Mini map")),
    3333                KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150);
    3434    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

    r17062 r17188  
    7777    public NotesDialog() {
    7878        super(tr("Notes"), "notes/note_open", tr("List of notes"),
    79                 Shortcut.registerShortcut("subwindow:notes", tr("Toggle: {0}", tr("Notes")),
     79                Shortcut.registerShortcut("subwindow:notes", tr("Windows: {0}", tr("Notes")),
    8080                KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150);
    8181        addCommentAction = new AddCommentAction();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r17150 r17188  
    148148    public RelationListDialog() {
    149149        super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
    150                 Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")),
     150                Shortcut.registerShortcut("subwindow:relations", tr("Windows: {0}", tr("Relations")),
    151151                KeyEvent.VK_R, Shortcut.ALT_SHIFT), 150, true);
    152152
  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r16601 r17188  
    148148    public SelectionListDialog() {
    149149        super(tr("Selection"), "selectionlist", tr("Open a selection list window."),
    150                 Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}",
    151                 tr("Current Selection")), KeyEvent.VK_T, Shortcut.ALT_SHIFT),
     150                Shortcut.registerShortcut("subwindow:selection", tr("Windows: {0}",
     151                tr("Selection")), KeyEvent.VK_T, Shortcut.ALT_SHIFT),
    152152                150, // default height
    153153                true // default is "show dialog"
  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r16438 r17188  
    7272    public UserListDialog() {
    7373        super(tr("Authors"), "userlist", tr("Open a list of people working on the selected objects."),
    74                 Shortcut.registerShortcut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.ALT_SHIFT), 150);
     74                Shortcut.registerShortcut("subwindow:authors", tr("Windows: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.ALT_SHIFT), 150);
    7575        build();
    7676    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r16967 r17188  
    116116    public ValidatorDialog() {
    117117        super(tr("Validation Results"), "validator", tr("Open the validation window."),
    118                 Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation Results")),
     118                Shortcut.registerShortcut("subwindow:validator", tr("Windows: {0}", tr("Validation Results")),
    119119                        KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class);
    120120
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r17066 r17188  
    255255    public PropertiesDialog() {
    256256        super(tr("Tags/Memberships"), "propertiesdialog", tr("Tags for selected objects."),
    257                 Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,
     257                Shortcut.registerShortcut("subwindow:properties", tr("Windows: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,
    258258                        Shortcut.ALT_SHIFT), 150, true);
    259259
     
    12291229        EditAction() {
    12301230            super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"),
    1231                     Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S,
     1231                    Shortcut.registerShortcut("properties:edit", tr("Edit: {0}", tr("Edit Tags")), KeyEvent.VK_S,
    12321232                            Shortcut.ALT), false);
    12331233            updateEnabledState();
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r16800 r17188  
    100100    private ImageViewerDialog() {
    101101        super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
    102         tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
     102        tr("Windows: {0}", tr("Geotagged Images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
    103103        build();
    104104        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java

    r16320 r17188  
    3434        public Action() {
    3535            super(tr("Search for objects by preset..."), "dialogs/search", tr("Search for objects by their presets."),
    36                     Shortcut.registerShortcut("preset:search-objects", tr("Search for objects by preset"), KeyEvent.VK_F3, Shortcut.SHIFT),
    37                     false);
     36                    Shortcut.registerShortcut("preset:search-objects", tr("Presets: {0}", tr("Search for objects by preset...")),
     37                    KeyEvent.VK_F3, Shortcut.SHIFT), false);
    3838            putValue("toolbar", "presets/search-objects");
    3939            MainApplication.getToolbar().register(this);
Note: See TracChangeset for help on using the changeset viewer.