Changeset 1054 in josm


Ignore:
Timestamp:
Oct 23, 2008 6:15:37 PM (5 years ago)
Author:
stoecker
Message:

fixed a lot of the shortcut related translations

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

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AboutAction.java

    r1051 r1054  
    6868 
    6969        public AboutAction() { 
    70                 super(tr("About"), "about", tr("Display the about screen."), ShortCut.registerShortCut("system:about", tr("About..."), KeyEvent.VK_F1, ShortCut.GROUP_DIRECT, ShortCut.SHIFT_DEFAULT), true); 
     70                super(tr("About"), "about", tr("Display the about screen."), ShortCut.registerShortCut("system:about", tr("About"), KeyEvent.VK_F1, ShortCut.GROUP_DIRECT, ShortCut.SHIFT_DEFAULT), true); 
    7171        } 
    7272 

  • trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

    r1023 r1054  
    3131        public AlignInCircleAction() { 
    3232                super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."), 
    33                 ShortCut.registerShortCut("tools:aligncircle", tr("Tool: Align in circle"), KeyEvent.VK_O, ShortCut.GROUP_EDIT), true); 
     33                ShortCut.registerShortCut("tools:aligncircle", tr("Tool: {0}", tr("Align Nodes in Circle")), KeyEvent.VK_O, ShortCut.GROUP_EDIT), true); 
    3434        } 
    3535 

  • trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

    r1023 r1054  
    3131        public AlignInLineAction() { 
    3232                super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes onto a line."), 
    33                 ShortCut.registerShortCut("tools:alignline", tr("Tool: Align in line"), KeyEvent.VK_L, ShortCut.GROUP_EDIT), true); 
     33                ShortCut.registerShortCut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, ShortCut.GROUP_EDIT), true); 
    3434        } 
    3535 

  • trunk/src/org/openstreetmap/josm/actions/AlignInRectangleAction.java

    r1023 r1054  
    4242        public AlignInRectangleAction() { 
    4343                super(tr("Align Nodes in Rectangle"), "alignrect", tr("Move the selected nodes into a rectangle."), 
    44                 ShortCut.registerShortCut("tools:alignrect", tr("Tool: Align in rectangle"), KeyEvent.VK_Q, ShortCut.GROUP_EDIT), true); 
     44                ShortCut.registerShortCut("tools:alignrect", tr("Tool: {0}", tr("Align Nodes in Rectangle")), KeyEvent.VK_Q, ShortCut.GROUP_EDIT), true); 
    4545        } 
    4646 

  • trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

    r1023 r1054  
    4747    public AutoScaleAction(String mode) { 
    4848        super(tr("Zoom to {0}", tr(mode)), "dialogs/autoscale/" + mode, tr("Zoom the view to {0}.", tr(mode)), 
    49                                 ShortCut.registerShortCut("view:zoom"+mode, tr("View: Zoom to {0}", tr(mode)), getModeShortcut(mode), ShortCut.GROUP_EDIT), true); 
     49                                ShortCut.registerShortCut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), ShortCut.GROUP_EDIT), true); 
    5050        String modeHelp = Character.toUpperCase(mode.charAt(0)) + mode.substring(1); 
    5151        putValue("help", "Action/AutoScale/" + modeHelp); 

  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r1023 r1054  
    5151        public CombineWayAction() { 
    5252                super(tr("Combine Way"), "combineway", tr("Combine several ways into one."), 
    53                 ShortCut.registerShortCut("tools:combineway", tr("Tool: Combine ways"), KeyEvent.VK_C, ShortCut.GROUP_EDIT), true); 
     53                ShortCut.registerShortCut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, ShortCut.GROUP_EDIT), true); 
    5454                DataSet.selListeners.add(this); 
    5555        } 

  • trunk/src/org/openstreetmap/josm/actions/CopyAction.java

    r1023 r1054  
    3333                super(tr("Copy"), "copy", 
    3434                                tr("Copy selected objects to paste buffer."), 
    35                                 ShortCut.registerShortCut("system:copy", tr("Edit: Copy"), KeyEvent.VK_C, ShortCut.GROUP_MENU), true); 
     35                                ShortCut.registerShortCut("system:copy", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_C, ShortCut.GROUP_MENU), true); 
    3636                setEnabled(false); 
    3737                DataSet.selListeners.add(this); 

  • trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

    r1051 r1054  
    3636        public CreateCircleAction() { 
    3737                super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."), 
    38                 ShortCut.registerShortCut("tools:createcircle", tr("Tool: Create circle"), KeyEvent.VK_O, ShortCut.GROUP_EDIT, ShortCut.SHIFT_DEFAULT), true); 
     38                ShortCut.registerShortCut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")), KeyEvent.VK_O, ShortCut.GROUP_EDIT, ShortCut.SHIFT_DEFAULT), true); 
    3939        } 
    4040 

  • trunk/src/org/openstreetmap/josm/actions/DeleteAction.java

    r1023 r1054  
    1414        public DeleteAction() { 
    1515                super(tr("Delete"), "dialogs/delete", tr("Delete selected objects."), 
    16                 ShortCut.registerShortCut("system:delete", tr("Edit: Delete"), KeyEvent.VK_DELETE, ShortCut.GROUP_DIRECT), true); 
     16                ShortCut.registerShortCut("system:delete", tr("Edit: {0}", tr("Delete")), KeyEvent.VK_DELETE, ShortCut.GROUP_DIRECT), true); 
    1717                setEnabled(true); 
    1818        } 

  • trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

    r1047 r1054  
    3232        public DownloadAction() { 
    3333                super(tr("Download from OSM ..."), "download", tr("Download map data from the OSM server."), 
    34                 ShortCut.registerShortCut("file:download", tr("File: Download"), KeyEvent.VK_D, ShortCut.GROUPS_ALT1+ShortCut.GROUP_HOTKEY), true); 
     34                ShortCut.registerShortCut("file:download", tr("File: {0}", tr("Download from OSM ...")), KeyEvent.VK_D, ShortCut.GROUPS_ALT1+ShortCut.GROUP_HOTKEY), true); 
    3535        } 
    3636 

  • trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java

    r1023 r1054  
    2020        super(tr("Duplicate"), "duplicate", 
    2121                        tr("Duplicate selection by copy and immediate paste."), 
    22                         ShortCut.registerShortCut("system:duplicate", tr("Edit: Duplicate selection"), KeyEvent.VK_D, ShortCut.GROUP_MENU), true); 
     22                        ShortCut.registerShortCut("system:duplicate", tr("Edit: {0}", tr("Duplicate")), KeyEvent.VK_D, ShortCut.GROUP_MENU), true); 
    2323        setEnabled(false); 
    2424                        DataSet.selListeners.add(this); 

  • trunk/src/org/openstreetmap/josm/actions/ExitAction.java

    r1023 r1054  
    2121        public ExitAction() { 
    2222                super(tr("Exit"), "exit", tr("Exit the application."), 
    23                 ShortCut.registerShortCut("system:menuexit", tr("Quit JOSM"), KeyEvent.VK_Q, ShortCut.GROUP_MENU), true); 
     23                ShortCut.registerShortCut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, ShortCut.GROUP_MENU), true); 
    2424        } 
    2525 

  • trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

    r1047 r1054  
    4646        public GpxExportAction(Layer layer) { 
    4747                super(tr("Export to GPX ..."), "exportgpx", tr("Export the data to GPX file."), 
    48                 ShortCut.registerShortCut("file:exportgpx", tr("Export to GPX"), KeyEvent.VK_E, ShortCut.GROUP_MENU)); 
     48                ShortCut.registerShortCut("file:exportgpx", tr("Export to GPX ..."), KeyEvent.VK_E, ShortCut.GROUP_MENU)); 
    4949                this.layer = layer; 
    5050        } 

  • trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

    r1023 r1054  
    2020        public HistoryInfoAction() { 
    2121                super(tr("OSM History Information"), "about",tr("Display history information about OSM ways or nodes."), 
    22                 ShortCut.registerShortCut("core:history", tr("Display history"), KeyEvent.VK_H, ShortCut.GROUP_HOTKEY), true); 
     22                ShortCut.registerShortCut("core:history", tr("OSM History Information"), KeyEvent.VK_H, ShortCut.GROUP_HOTKEY), true); 
    2323        } 
    2424 

  • trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

    r1023 r1054  
    2828        public JoinNodeWayAction() { 
    2929            super(tr("Join node to way"), "joinnodeway", tr("Join a node into the nearest way segments"), 
    30                         ShortCut.registerShortCut("tools:joinnodeway", tr("Tool: Join node to way"), KeyEvent.VK_J, ShortCut.GROUP_EDIT), true); 
     30                        ShortCut.registerShortCut("tools:joinnodeway", tr("Tool: {0}", tr("Join node to way")), KeyEvent.VK_J, ShortCut.GROUP_EDIT), true); 
    3131        } 
    3232 

  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r1023 r1054  
    5454        public MergeNodesAction() { 
    5555                super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."), 
    56                 ShortCut.registerShortCut("tools:mergenodes", tr("Tool: Merge nodes"), KeyEvent.VK_M, ShortCut.GROUP_EDIT), true); 
     56                ShortCut.registerShortCut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, ShortCut.GROUP_EDIT), true); 
    5757                DataSet.selListeners.add(this); 
    5858        } 

  • trunk/src/org/openstreetmap/josm/actions/NewAction.java

    r1047 r1054  
    1616        public NewAction() { 
    1717                super(tr("New"), "new", tr("Create a new map."), 
    18                 ShortCut.registerShortCut("system:new", tr("File: New"), KeyEvent.VK_N, ShortCut.GROUP_MENU), true); 
     18                ShortCut.registerShortCut("system:new", tr("File: {0}", tr("New")), KeyEvent.VK_N, ShortCut.GROUP_MENU), true); 
    1919        } 
    2020 

  • trunk/src/org/openstreetmap/josm/actions/OpenAction.java

    r1047 r1054  
    4040        public OpenAction() { 
    4141                super(tr("Open ..."), "open", tr("Open a file."), 
    42                 ShortCut.registerShortCut("system:open", tr("File: Open..."), KeyEvent.VK_O, ShortCut.GROUP_MENU)); 
     42                ShortCut.registerShortCut("system:open", tr("File: {0}", tr("Open ...")), KeyEvent.VK_O, ShortCut.GROUP_MENU)); 
    4343        } 
    4444 

  • trunk/src/org/openstreetmap/josm/actions/PasteAction.java

    r1023 r1054  
    3030    public PasteAction() { 
    3131        super(tr("Paste"), "paste", tr("Paste contents of paste buffer."), 
    32                         ShortCut.registerShortCut("system:paste", tr("Edit: Paste"), KeyEvent.VK_V, ShortCut.GROUP_MENU), true); 
     32                        ShortCut.registerShortCut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, ShortCut.GROUP_MENU), true); 
    3333                        setEnabled(false); 
    3434    } 

  • trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java

    r1051 r1054  
    2727                super(tr("Paste Tags"), "pastetags", 
    2828                        tr("Apply tags of contents of paste buffer to all selected items."), 
    29                         ShortCut.registerShortCut("system:pastestyle", tr("Edit: Paste tags"), KeyEvent.VK_V, ShortCut.GROUP_MENU, ShortCut.SHIFT_DEFAULT), true); 
     29                        ShortCut.registerShortCut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, ShortCut.GROUP_MENU, ShortCut.SHIFT_DEFAULT), true); 
    3030                DataSet.selListeners.add(this); 
    3131                copyAction.addListener(this); 

  • trunk/src/org/openstreetmap/josm/actions/RedoAction.java

    r1047 r1054  
    2222        public RedoAction() { 
    2323                super(tr("Redo"), "redo", tr("Redo the last undone action."), 
    24                 ShortCut.registerShortCut("system:redo", tr("Edit: Redo"), KeyEvent.VK_Y, ShortCut.GROUP_MENU), true); 
     24                ShortCut.registerShortCut("system:redo", tr("Edit: {0}", tr("Redo")), KeyEvent.VK_Y, ShortCut.GROUP_MENU), true); 
    2525                setEnabled(false); 
    2626        } 

  • trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

    r1047 r1054  
    3030        public ReverseWayAction() { 
    3131                super(tr("Reverse ways"), "wayflip", tr("Reverse the direction of all selected ways."), 
    32                 ShortCut.registerShortCut("tools:reverse", tr("Tool: Reverse way"), KeyEvent.VK_R, ShortCut.GROUP_EDIT), true); 
     32                ShortCut.registerShortCut("tools:reverse", tr("Tool: {0}", tr("Reverse ways")), KeyEvent.VK_R, ShortCut.GROUP_EDIT), true); 
    3333        } 
    3434 

  • trunk/src/org/openstreetmap/josm/actions/SaveAction.java

    r1047 r1054  
    2525        public SaveAction(Layer layer) { 
    2626                super(tr("Save"), "save", tr("Save the current data."), 
    27                 ShortCut.registerShortCut("system:save", tr("File: Save"), KeyEvent.VK_S, ShortCut.GROUP_MENU), layer); 
     27                ShortCut.registerShortCut("system:save", tr("File: {0}", tr("Save")), KeyEvent.VK_S, ShortCut.GROUP_MENU), layer); 
    2828        } 
    2929 

  • trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java

    r1051 r1054  
    2323        public SaveAsAction(Layer layer) { 
    2424                super(tr("Save as ..."), "save_as", tr("Save the current data to a new file."), 
    25                 ShortCut.registerShortCut("system:saveas", tr("File: Save as..."), KeyEvent.VK_S, ShortCut.GROUP_MENU, ShortCut.SHIFT_DEFAULT), layer); 
     25                ShortCut.registerShortCut("system:saveas", tr("File: {0}", tr("Save as ...")), KeyEvent.VK_S, ShortCut.GROUP_MENU, ShortCut.SHIFT_DEFAULT), layer); 
    2626        } 
    2727 

  • trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java

    r1023 r1054  
    1414        public SelectAllAction() { 
    1515                super(tr("Select All"),"selectall", tr("Select all undeleted objects in the data layer. This selects incomplete objects too."), 
    16                 ShortCut.registerShortCut("system:selectall", tr("Edit: Select all"), KeyEvent.VK_A, ShortCut.GROUP_MENU), true); 
     16                ShortCut.registerShortCut("system:selectall", tr("Edit: {0}", tr("Select All")), KeyEvent.VK_A, ShortCut.GROUP_MENU), true); 
    1717        } 
    1818 

  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r1023 r1054  
    5252        public SplitWayAction() { 
    5353                super(tr("Split Way"), "splitway", tr("Split a way at the selected node."), 
    54                 ShortCut.registerShortCut("tools:splitway", tr("Tool: Split way"), KeyEvent.VK_P, ShortCut.GROUP_EDIT), true); 
     54                ShortCut.registerShortCut("tools:splitway", tr("Tool: {0}", tr("Split Way")), KeyEvent.VK_P, ShortCut.GROUP_EDIT), true); 
    5555                DataSet.selListeners.add(this); 
    5656        } 

  • trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java

    r1030 r1054  
    1414        public ToggleGPXLinesAction() { 
    1515                super(tr("Toggle GPX Lines"), "gps-lines", tr("Toggles the global setting ''{0}''.", tr("Draw lines between raw gps points.")), 
    16                 ShortCut.registerShortCut("view:gpxlines", tr("View: Toggle GPX lines"), KeyEvent.VK_X, ShortCut.GROUP_MENU), true); 
     16                ShortCut.registerShortCut("view:gpxlines", tr("View: {0}", tr("Toggle GPX Lines")), KeyEvent.VK_X, ShortCut.GROUP_MENU), true); 
    1717        } 
    1818 

  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r1047 r1054  
    4545        public UnGlueAction() { 
    4646                super(tr("UnGlue Ways"), "unglueways", tr("Duplicate nodes that are used by multiple ways."), 
    47                 ShortCut.registerShortCut("tools:unglue", tr("Tool: Unglue"), KeyEvent.VK_G, ShortCut.GROUP_EDIT), true); 
     47                ShortCut.registerShortCut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, ShortCut.GROUP_EDIT), true); 
    4848                //DataSet.selListeners.add(this); 
    4949        } 

  • trunk/src/org/openstreetmap/josm/actions/UndoAction.java

    r1047 r1054  
    2222        public UndoAction() { 
    2323                super(tr("Undo"), "undo", tr("Undo the last action."), 
    24                 ShortCut.registerShortCut("system:undo", tr("Edit: Undo"), KeyEvent.VK_Z, ShortCut.GROUP_MENU), true); 
     24                ShortCut.registerShortCut("system:undo", tr("Edit: {0}", tr("Undo")), KeyEvent.VK_Z, ShortCut.GROUP_MENU), true); 
    2525                setEnabled(false); 
    2626        } 

  • trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java

    r1051 r1054  
    1515        public UnselectAllAction() { 
    1616                super(tr("Unselect All"), "unselectall", tr("Unselect all objects."), 
    17                 ShortCut.registerShortCut("edit:unselectall", tr("Edit: Unselect all"), KeyEvent.VK_U, ShortCut.GROUP_EDIT), true); 
     17                ShortCut.registerShortCut("edit:unselectall", tr("Edit: {0}", tr("Unselect All")), KeyEvent.VK_U, ShortCut.GROUP_EDIT), true); 
    1818                // this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put 
    1919                // the correct group in 
    … …  
    2121                // Add extra shortcut C-S-a 
    2222                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    23                 ShortCut.registerShortCut("edit:unselectall2", tr("Edit: Unselect all (2)"), 
     23                ShortCut.registerShortCut("edit:unselectallfocus", tr("Edit: {0}", tr("Unselect All (Focus)")), 
    2424                KeyEvent.VK_A, ShortCut.GROUP_MENU, ShortCut.SHIFT_DEFAULT).getKeyStroke(), 
    2525                tr("Unselect All")); 
    … …  
    3232                 */ 
    3333                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    34                 ShortCut.registerShortCut("edit:unselectall3", tr("Edit: Unselect all (3)"), KeyEvent.VK_ESCAPE, ShortCut.GROUP_DIRECT).getKeyStroke(), 
     34                ShortCut.registerShortCut("edit:unselectallescape", tr("Edit: {0}", tr("Unselect All (Escape)")), 
     35                KeyEvent.VK_ESCAPE, ShortCut.GROUP_DIRECT).getKeyStroke(), 
    3536                tr("Unselect All")); 
    3637        } 

  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r1047 r1054  
    6161        public UploadAction() { 
    6262                super(tr("Upload to OSM ..."), "upload", tr("Upload all changes to the OSM server."), 
    63                 ShortCut.registerShortCut("file:upload", tr("File: Upload"), KeyEvent.VK_U, ShortCut.GROUPS_ALT1+ShortCut.GROUP_HOTKEY), true); 
     63                ShortCut.registerShortCut("file:upload", tr("File: {0}", tr("Upload to OSM ...")), KeyEvent.VK_U, ShortCut.GROUPS_ALT1+ShortCut.GROUP_HOTKEY), true); 
    6464 
    6565                /** 

  • trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java

    r1023 r1054  
    1414        public ZoomInAction() { 
    1515                super(tr("Zoom in"), "dialogs/zoomin", tr("Zoom in"), 
    16                 ShortCut.registerShortCut("view:zoomin", tr("View: Zoom in"), KeyEvent.VK_PLUS, ShortCut.GROUP_DIRECT), true); 
     16                ShortCut.registerShortCut("view:zoomin", tr("View: {0}", tr("Zoom in")), KeyEvent.VK_PLUS, ShortCut.GROUP_DIRECT), true); 
    1717                setEnabled(true); 
    1818        } 

  • trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java

    r1023 r1054  
    1414        public ZoomOutAction() { 
    1515                super(tr("Zoom out"), "dialogs/zoomout", tr("Zoom out"), 
    16                 ShortCut.registerShortCut("view:zoomout", tr("View: Zoom out"), KeyEvent.VK_MINUS, ShortCut.GROUP_DIRECT), true); 
     16                ShortCut.registerShortCut("view:zoomout", tr("View: {0}", tr("Zoom out")), KeyEvent.VK_MINUS, ShortCut.GROUP_DIRECT), true); 
    1717                setEnabled(true); 
    1818        } 

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java

    r1023 r1054  
    1919        public AudioBackAction() { 
    2020                super(tr("Back"), "audio-back", tr("Jump back."), 
    21                 ShortCut.registerShortCut("audio:back", tr("Audio: Back"), KeyEvent.VK_F6, ShortCut.GROUP_DIRECT), true); 
     21                ShortCut.registerShortCut("audio:back", tr("Audio: {0}", tr("Back")), KeyEvent.VK_F6, ShortCut.GROUP_DIRECT), true); 
    2222                try { 
    2323                        amount = - Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0")); 

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java

    r1023 r1054  
    1111        public AudioFasterAction() { 
    1212                super(tr("Faster"), "audio-faster", tr("Faster Forward"), 
    13                 ShortCut.registerShortCut("audio:faster", tr("Audio: Faster"), KeyEvent.VK_F9, ShortCut.GROUP_DIRECT), true); 
     13                ShortCut.registerShortCut("audio:faster", tr("Audio: {0}", tr("Faster")), KeyEvent.VK_F9, ShortCut.GROUP_DIRECT), true); 
    1414        } 
    1515} 

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java

    r1023 r1054  
    1919        public AudioFwdAction() { 
    2020                super(tr("Forward"), "audio-fwd", tr("Jump forward"), 
    21                 ShortCut.registerShortCut("audio:forward", tr("Audio: Forward"), KeyEvent.VK_F7, ShortCut.GROUP_DIRECT), true); 
     21                ShortCut.registerShortCut("audio:forward", tr("Audio: {0}", tr("Forward")), KeyEvent.VK_F7, ShortCut.GROUP_DIRECT), true); 
    2222                try { 
    2323                        amount = Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0")); 

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java

    r1023 r1054  
    1515        public AudioNextAction() { 
    1616                super(tr("Next Marker"), "audio-next", tr("Play next marker."), 
    17                 ShortCut.registerShortCut("audio:next", tr("Audio: Next"), KeyEvent.VK_F8, ShortCut.GROUP_DIRECT), true); 
     17                ShortCut.registerShortCut("audio:next", tr("Audio: {0}", tr("Next Marker")), KeyEvent.VK_F8, ShortCut.GROUP_DIRECT), true); 
    1818        } 
    1919 

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

    r1023 r1054  
    1717        public AudioPlayPauseAction() { 
    1818                super(tr("Play/pause"), "audio-playpause", tr("Play/pause audio."), 
    19                 ShortCut.registerShortCut("audio:pause", tr("Audio: Play/Pause"), KeyEvent.VK_PERIOD, ShortCut.GROUP_DIRECT), true); 
     19                ShortCut.registerShortCut("audio:pause", tr("Audio: {0}", tr("Play/pause")), KeyEvent.VK_PERIOD, ShortCut.GROUP_DIRECT), true); 
    2020        } 
    2121 

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java

    r1023 r1054  
    1515        public AudioPrevAction() { 
    1616                super(tr("Previous Marker"), "audio-prev", tr("Play previous marker."), 
    17                 ShortCut.registerShortCut("audio:prev", tr("Audio: Previous"), KeyEvent.VK_F5, ShortCut.GROUP_DIRECT), true); 
     17                ShortCut.registerShortCut("audio:prev", tr("Audio: {0}", tr("Previous Marker")), KeyEvent.VK_F5, ShortCut.GROUP_DIRECT), true); 
    1818        } 
    1919 

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java

    r1050 r1054  
    1111        public AudioSlowerAction() { 
    1212                super(tr("Slower"), "audio-slower", tr("Slower Forward"), 
    13                 ShortCut.registerShortCut("audio:slower", tr("Audio: Slower"), KeyEvent.VK_F4, ShortCut.GROUP_DIRECT), true); 
     13                ShortCut.registerShortCut("audio:slower", tr("Audio: {0}", tr("Slower")), KeyEvent.VK_F4, ShortCut.GROUP_DIRECT), true); 
    1414        } 
    1515} 

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r1023 r1054  
    4444                                "delete", 
    4545                                tr("Delete nodes or ways."), 
    46                                 ShortCut.registerShortCut("mapmode:delete", tr("Delete mode"), KeyEvent.VK_D, ShortCut.GROUP_EDIT), 
     46                                ShortCut.registerShortCut("mapmode:delete", tr("Mode: Delete"), KeyEvent.VK_D, ShortCut.GROUP_EDIT), 
    4747                                mapFrame, 
    4848                                ImageProvider.getCursor("normal", "delete")); 

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r1047 r1054  
    7474        public DrawAction(MapFrame mapFrame) { 
    7575                super(tr("Draw"), "node/autonode", tr("Draw nodes"), 
    76                                 ShortCut.registerShortCut("mapmode:draw", tr("Draw mode"), KeyEvent.VK_A, ShortCut.GROUP_EDIT), 
     76                                ShortCut.registerShortCut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, ShortCut.GROUP_EDIT), 
    7777                                mapFrame, getCursor()); 
    7878 
    7979                // Add extra shortcut N 
    8080                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    81                         ShortCut.registerShortCut("mapmode:draw2", tr("Draw mode (2)"), KeyEvent.VK_N, ShortCut.GROUP_EDIT).getKeyStroke(), tr("Draw")); 
     81                        ShortCut.registerShortCut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, ShortCut.GROUP_EDIT).getKeyStroke(), tr("Draw")); 
    8282 
    8383                //putValue("help", "Action/AddNode/Autnode"); 

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r1023 r1054  
    7474        public ExtrudeAction(MapFrame mapFrame) { 
    7575                super(tr("Extrude"), "extrude/extrude", tr("Create areas"), 
    76                                 ShortCut.registerShortCut("mapmode:extrude", tr("Extrude mode"), KeyEvent.VK_X, ShortCut.GROUP_EDIT), 
     76                                ShortCut.registerShortCut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, ShortCut.GROUP_EDIT), 
    7777                        mapFrame, 
    7878                        getCursor("normal", "selection", Cursor.DEFAULT_CURSOR)); 

  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r1023 r1054  
    8686        public SelectAction(MapFrame mapFrame) { 
    8787                super(tr("Select"), "move/move", tr("Select, move and rotate objects"), 
    88                         ShortCut.registerShortCut("mapmode:select", tr("Select mode"), KeyEvent.VK_S, ShortCut.GROUP_EDIT), 
     88                        ShortCut.registerShortCut("mapmode:select", tr("Mode: {0}", tr("Select")), KeyEvent.VK_S, ShortCut.GROUP_EDIT), 
    8989                        mapFrame, 
    9090                        getCursor("normal", "selection", Cursor.DEFAULT_CURSOR)); 

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java

    r1023 r1054  
    4747        public ZoomAction(MapFrame mapFrame) { 
    4848                super(tr("Zoom"), "zoom", tr("Zoom and move map"), 
    49                 ShortCut.registerShortCut("mapmode:zoom", tr("Zoom mode"), KeyEvent.VK_Z, ShortCut.GROUP_EDIT), 
     49                ShortCut.registerShortCut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, ShortCut.GROUP_EDIT), 
    5050                mapFrame, ImageProvider.getCursor("normal", "zoom")); 
    5151                mv = mapFrame.mapView; 

  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r1030 r1054  
    157157         */ 
    158158        public void add(JMenu menu, int mnemonicKey, String shortName) { 
    159                 ShortCut.registerShortCut("menu:"+shortName, shortName+" menu", mnemonicKey, ShortCut.GROUP_MNEMONIC).setMnemonic(menu); 
     159                ShortCut.registerShortCut("menu:"+shortName, tr("Menu: {0}", menu.getText()), mnemonicKey, ShortCut.GROUP_MNEMONIC).setMnemonic(menu); 
    160160                add(menu); 
    161161        } 

  • trunk/src/org/openstreetmap/josm/gui/MapMover.java

    r1047 r1054  
    8282                if (contentPane != null) { 
    8383                        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    84                                 ShortCut.registerShortCut("system:movefocusright", tr("Map: Move right"), KeyEvent.VK_RIGHT, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
     84                                ShortCut.registerShortCut("system:movefocusright", tr("Map: {0}", tr("Move right")), KeyEvent.VK_RIGHT, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
    8585                                "MapMover.Zoomer.right"); 
    8686                        contentPane.getActionMap().put("MapMover.Zoomer.right", new ZoomerAction("right")); 
    8787 
    8888                        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    89                                 ShortCut.registerShortCut("system:movefocusleft", tr("Map: Move left"), KeyEvent.VK_LEFT, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
     89                                ShortCut.registerShortCut("system:movefocusleft", tr("Map: {0}", tr("Move left")), KeyEvent.VK_LEFT, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
    9090                                "MapMover.Zoomer.left"); 
    9191                        contentPane.getActionMap().put("MapMover.Zoomer.left", new ZoomerAction("left")); 
    9292 
    9393                        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    94                                 ShortCut.registerShortCut("system:movefocusup", tr("Map: Move up"), KeyEvent.VK_UP, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
     94                                ShortCut.registerShortCut("system:movefocusup", tr("Map: {0}", tr("Move up")), KeyEvent.VK_UP, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
    9595                                "MapMover.Zoomer.up"); 
    9696                        contentPane.getActionMap().put("MapMover.Zoomer.up", new ZoomerAction("up")); 
    9797 
    9898                        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    99                                 ShortCut.registerShortCut("system:movefocusdown", tr("Map: Move down"), KeyEvent.VK_DOWN, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
     99                                ShortCut.registerShortCut("system:movefocusdown", tr("Map: {0}", tr("Move down")), KeyEvent.VK_DOWN, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
    100100                                "MapMover.Zoomer.down"); 
    101101                        contentPane.getActionMap().put("MapMover.Zoomer.down", new ZoomerAction("down")); 
    102102 
    103103                        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    104                                 ShortCut.registerShortCut("view:zoominalternate", tr("Map: Zoom in"), KeyEvent.VK_COMMA, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
     104                                ShortCut.registerShortCut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
    105105                                "MapMover.Zoomer.in"); 
    106106                        contentPane.getActionMap().put("MapMover.Zoomer.in", new ZoomerAction(",")); 
    107107 
    108108                        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( 
    109                                 ShortCut.registerShortCut("view:zoomoutalternate", tr("Map: Zoom out"), KeyEvent.VK_PERIOD, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
     109                                ShortCut.registerShortCut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, ShortCut.GROUP_HOTKEY).getKeyStroke(), 
    110110                                "MapMover.Zoomer.out"); 
    111111                        contentPane.getActionMap().put("MapMover.Zoomer.out", new ZoomerAction(".")); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r1023 r1054  
    2929        public CommandStackDialog(final MapFrame mapFrame) { 
    3030                super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), 
    31                 ShortCut.registerShortCut("subwindow:commandstack", tr("Toggle command stack"), KeyEvent.VK_O, ShortCut.GROUP_LAYER), 100); 
     31                ShortCut.registerShortCut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, ShortCut.GROUP_LAYER), 100); 
    3232                Main.main.undoRedo.listenerCommands.add(this); 
    3333 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r1023 r1054  
    5353        public ConflictDialog() { 
    5454                super(tr("Conflict"), "conflict", tr("Merging conflicts."), 
    55                 ShortCut.registerShortCut("subwindow:conflict", tr("Toggle conflict window"), KeyEvent.VK_C, ShortCut.GROUP_LAYER), 100); 
     55                ShortCut.registerShortCut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), KeyEvent.VK_C, ShortCut.GROUP_LAYER), 100); 
    5656                displaylist.setCellRenderer(new OsmPrimitivRenderer()); 
    5757                displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

    r1052 r1054  
    8989        public HistoryDialog() { 
    9090                super(tr("History"), "history", tr("Display the history of all selected items."), 
    91                 ShortCut.registerShortCut("subwindow:history", tr("Toggle history window"), KeyEvent.VK_H, 
     91                ShortCut.registerShortCut("subwindow:history", tr("Toggle: {0}", tr("History")), KeyEvent.VK_H, 
    9292                ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150); 
    9393                historyPane.setVisible(false); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r1023 r1054  
    160160        public LayerListDialog(MapFrame mapFrame) { 
    161161                super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."), 
    162                 ShortCut.registerShortCut("subwindow:layers", tr("Toggle layer window"), KeyEvent.VK_L, ShortCut.GROUP_LAYER), 100); 
     162                ShortCut.registerShortCut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L, ShortCut.GROUP_LAYER), 100); 
    163163                instance = new JList(model); 
    164164                listScrollPane = new JScrollPane(instance); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

    r1052 r1054  
    422422        public PropertiesDialog(MapFrame mapFrame) { 
    423423                super(tr("Properties/Memberships"), "propertiesdialog", tr("Properties for selected objects."), 
    424                 ShortCut.registerShortCut("subwindow:properies", tr("Toggle properties window"), KeyEvent.VK_P, 
     424                ShortCut.registerShortCut("subwindow:properies", tr("Toggle: {0}", tr("Properties/Memberships")), KeyEvent.VK_P, 
    425425                ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150); 
    426426 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r1023 r1054  
    5757        public RelationListDialog() { 
    5858                super(tr("Relations"), "relationlist", tr("Open a list of all relations."), 
    59                 ShortCut.registerShortCut("subwindow:relations", tr("Toggle relations window"), KeyEvent.VK_R, ShortCut.GROUP_LAYER), 150); 
     59                ShortCut.registerShortCut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R, ShortCut.GROUP_LAYER), 150); 
    6060                displaylist.setCellRenderer(new OsmPrimitivRenderer()); 
    6161                displaylist.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r1052 r1054  
    7878    public SelectionListDialog() { 
    7979        super(tr("Current Selection"), "selectionlist", tr("Open a selection list window."), 
    80         ShortCut.registerShortCut("subwindow:selection", tr("Toggle selection window"), KeyEvent.VK_T, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150); 
     80        ShortCut.registerShortCut("subwindow:selection", tr("Toggle: {0}", tr("Current Selection")), KeyEvent.VK_T, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150); 
    8181 
    8282        selectionHistory = new LinkedList<Collection<? extends OsmPrimitive>>(); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r1052 r1054  
    5252        public UserListDialog() { 
    5353                super(tr("Authors"), "userlist", tr("Open a list of people working on the selected objects."), 
    54                 ShortCut.registerShortCut("subwindow:authors", tr("Toggle authors window"), KeyEvent.VK_A, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150); 
     54                ShortCut.registerShortCut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150); 
    5555 
    5656                data.setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%"}); 

  • trunk/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java

    r1053 r1054  
    3535        // Maybe move this to prefPanel? There's no need for it to be here. 
    3636        private class scListModel extends AbstractTableModel { 
    37                 private String[] columnNames = new String[]{tr("ID"),tr("Action"), tr("Group"), tr("Shortcut")}; 
     37//              private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")}; 
     38                private String[] columnNames = new String[]{tr("Action"), tr("Shortcut")}; 
    3839                private Collection<ShortCut> data; 
    3940                public scListModel() { 
    … …  
    5253                        ShortCut sc = (ShortCut)data.toArray()[row]; 
    5354                        if (col == 0) { 
    54                                 return sc.getShortText(); 
     55                                return sc.getLongText(); 
    5556                        } else if (col == 1) { 
    56                                 return sc.getLongText(); 
    57                         } else if (col == 2) { 
     57                                return sc.getKeyText(); 
     58                        } /*else if (col == 2) { 
    5859                                if (sc.getRequestedGroup() == ShortCut.GROUP_NONE) { 
    5960                                        return tr("None"); 
    … …  
    7677                                } 
    7778                        } else if (col == 3) { 
    78                                 return sc.getKeyText(); 
    79                         } else { 
     79                                return sc.getShortText(); 
     80                        } */else { 
    8081                                // This is a kind of hack that allows the actions on the editing controls 
    8182                                // to access the underlying shortcut object without introducing another 
Note: See TracChangeset for help on using the changeset viewer.