Changeset 4842 in josm for trunk/src/org


Ignore:
Timestamp:
2012-01-21T23:58:25+01:00 (8 years ago)
Author:
stoecker
Message:

i18n fixed and shortcut cleanups

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

Legend:

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

    r4832 r4842  
    377377        right.add(new SearchKeywordRow(hcbSearchString)
    378378                .addTitle(tr("basic examples"))
    379                 .addKeyword("Baker Street", "Baker Street", tr("''Baker'' and ''Street'' in any key"))
    380                 .addKeyword("\"Baker Street\"", "\"Baker Street\"", tr("''Baker Street'' in any key"))
     379                .addKeyword(tr("Baker Street"), tr("Baker Street"), tr("''Baker'' and ''Street'' in any key"))
     380                .addKeyword(tr("\"Baker Street\""), tr("\"Baker Street\""), tr("''Baker Street'' in any key"))
    381381                , GBC.eol());
    382382        right.add(new SearchKeywordRow(hcbSearchString)
  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r4766 r4842  
    9090
    9191    private static final KeyStroke ENABLE_FILTER_SHORTCUT
    92     = Shortcut.registerShortcut("core_multikey:enableFilter", tr("Multikey: {0}", tr("Enable filter")), 'E', Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK + KeyEvent.ALT_DOWN_MASK).getKeyStroke();
     92    = Shortcut.registerShortcut("core_multikey:enableFilter", tr("Multikey: {0}", tr("Enable filter")), KeyEvent.VK_E, Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK).getKeyStroke();
    9393
    9494    private static final KeyStroke HIDING_FILTER_SHORTCUT
    95     = Shortcut.registerShortcut("core_multikey:hidingFilter", tr("Multikey: {0}", tr("Hide filter")), 'H', Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK + KeyEvent.ALT_DOWN_MASK).getKeyStroke();
     95    = Shortcut.registerShortcut("core_multikey:hidingFilter", tr("Multikey: {0}", tr("Hide filter")), KeyEvent.VK_H, Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK).getKeyStroke();
    9696
    9797
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r4766 r4842  
    445445            putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
    446446            putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer"));
    447             putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}", tr("Show/hide layer")), 'S', Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK).getKeyStroke());
     447            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
     448            tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK).getKeyStroke());
    448449            if (init) {
    449450                updateEnabledState();
     
    632633            putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate"));
    633634            putValue(SHORT_DESCRIPTION, tr("Activate the selected layer"));
    634             putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:activateLayer",  tr("Multikey: {0}", tr("Activate layer")), 'A', Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK).getKeyStroke());
     635            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
     636            tr("Activate layer")), KeyEvent.VK_A, Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK).getKeyStroke());
    635637            putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
    636638        }
  • trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

    r4766 r4842  
    3434
    3535        public JumpToNextMarker(JumpToMarkerLayer layer) {
    36             putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")), 'J', Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK + KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
     36            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
     37            KeyEvent.VK_J, Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
    3738            putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
    3839            putValue(NAME, tr("Jump to next marker"));
     
    9091            this.layer = (Layer)layer;
    9192
    92             putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previos marker")), 'P', Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK + KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
     93            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}",
     94            tr("Previos marker")), KeyEvent.VK_P, Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
    9395            putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
    9496            putValue(NAME, tr("Jump to previous marker"));
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r4241 r4842  
    6464
    6565    private ImageViewerDialog() {
    66         super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged", tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.GROUP_EDIT), 200);
     66        super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
     67        tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.GROUP_EDIT), 200);
    6768
    6869        /* Don't show a detached dialog right from the start. */
     
    9394        btnDelete.setPreferredSize(buttonDim);
    9495        Shortcut scDelete = Shortcut.registerShortcut(
    95                 "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", DELETE_TEXT), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT);
     96                "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT);
    9697        Main.registerActionShortcut(delAction, scDelete);
    9798        btnDelete.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDelete.getKeyStroke(), DELETE_TEXT);
     
    102103        btnDeleteFromDisk.setPreferredSize(buttonDim);
    103104        Shortcut scDeleteFromDisk = Shortcut.registerShortcut(
    104                 "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete File from disk")), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT, Shortcut.GROUP_MENU + Shortcut.SHIFT_DEFAULT);
     105                "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete File from disk")), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK);
    105106        final String ADELFROMDISK = "Delete image file from disk";
    106107        Main.registerActionShortcut(delFromDiskAction, scDeleteFromDisk);
Note: See TracChangeset for help on using the changeset viewer.