see #8281 - deprecate sport=diving, add preset and mappaint style for sport=scuba_diving

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7630 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #10647 - Shortcuts are activated while in dialogs

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7631 0c6e7542-c601-0410-84e7-c038aed88b3b
see #10647 - fix NPE

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7632 0c6e7542-c601-0410-84e7-c038aed88b3b
see #10647: completely disable Main.map.keyDetector events while not in main window 

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7633 0c6e7542-c601-0410-84e7-c038aed88b3b
allow plugins to install custom look-and-feels

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7634 0c6e7542-c601-0410-84e7-c038aed88b3b
fixes #8281 - deprecate `parking=park_and_ride` in favor of `amenity=parking park_ride=yes` (updated validator and mappaint style)

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7635 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #10646 - Remote Control v1.6: new `load_data` handler to load OSM data directly from URL (modified patch by sanderd17)

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7636 0c6e7542-c601-0410-84e7-c038aed88b3b
see #10511 - disable unit test until we fix the bug

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7637 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #10576 - display `railway=construction` (different styles for different subkeys `construction=*`); improve display of `railway=tram` on bridges and in tunnels

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7638 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #10651 - NPE in AdvancedKeyPressDetector.isFocusInMainWindow

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7639 0c6e7542-c601-0410-84e7-c038aed88b3b
update presets links

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7640 0c6e7542-c601-0410-84e7-c038aed88b3b
i18n update

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7641 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #10156 - combine ways: conflicts not shown when no conflicting values (regression from r6802)

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7642 0c6e7542-c601-0410-84e7-c038aed88b3b
avoid potential NPE

git-svn-id: https://josm.openstreetmap.de/svn/trunk@7643 0c6e7542-c601-0410-84e7-c038aed88b3b