id summary reporter owner description type status priority milestone component version resolution keywords cc 23921 Resolve conflicts button to select an element leni team "==== What steps will reproduce the problem? 1. I'm resolving a node/member conflict 2. I move the mouse cursor over the 1st button to copy from my version/their version [[JOSMImage(dialogs/conflict/copystartleft)]] 3. ==== What is the expected result? text display ""Copy my selected nodes ..."" whether it's a node or member conflict ==== What happens instead? text display ""Copy my selected elements ..."" as on the other buttons ==== Please provide any additional information below. Attach a screenshot if possible. {{{ Relative:URL: ^/trunk Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b Last:Changed Date: 2024-08-28 22:00:04 +0200 (Wed, 28 Aug 2024) Revision:19207 Build-Date:2024-08-29 01:30:31 URL:https://josm.openstreetmap.de/svn/trunk Identification: JOSM/1.5 (19207 en) Windows 10 64-Bit OS Build number: Windows 10 Home 22H2 (19045) Memory Usage: 483 MB / 1970 MB (274 MB allocated, but free) Java version: 21.0.3+9-LTS, Azul Systems, Inc., OpenJDK 64-Bit Server VM Look and Feel: com.sun.java.swing.plaf.windows.WindowsLookAndFeel Screen: \Display0 1920x1080x32bpp@60Hz (scaling 1.25×1.25) Maximum Screen Size: 1920×1080 Best cursor sizes: 16×16→32×32, 32×32→32×32 System property file.encoding: UTF-8 System property sun.jnu.encoding: Cp1252 Locale info: en_FR Numbers with default locale: 1234567890 -> 1234567890 VM arguments: [-Dicedtea-web.bin.location=%UserProfile%\AppData\Local\Programs\OpenWebStart\javaws, -Djava.util.Arrays.useLegacyMergeSort=true, --add-reads=java.base=ALL-UNNAMED,java.desktop, --add-reads=java.desktop=ALL-UNNAMED,java.naming, --add-reads=java.naming=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/sun.awt=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/javax.jnlp=ALL-UNNAMED,java.desktop, --add-exports=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.action=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.provider=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.util=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.validator=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.x509=ALL-UNNAMED,java.desktop, --add-exports=java.base/jdk.internal.util.jar=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/sun.applet=ALL-UNNAMED,java.desktop,jdk.jsobject, --add-exports=java.naming/com.sun.jndi.toolkit.url=ALL-UNNAMED,java.desktop, --add-modules=java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web, --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED, --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED, --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED, --add-opens=java.base/java.lang=ALL-UNNAMED, --add-opens=java.base/java.nio=ALL-UNNAMED, --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED, --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED, --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED, --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED, --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED, -Djava.security.manager=allow] Dataset consistency test: No problems found Plugins: + DirectUpload (36282) + HouseNumberTaggingTool (36298) + ImageWayPoint (36298) + MapRoulette (40) + PicLayer (1.0.3) + apache-commons (36282) + apache-http (36273) + auto_tools (81) + buildings_tools (36226) + cadastre-fr (36298) + conflation (0.6.11) + easypresets (1623509627) + ejml (36176) + geotools (36273) + graphview (36298) + indoorhelper (1.2.3) + jackson (36273) + javafx (36282) + jaxb (36118) + jna (36273) + jts (36004) + mapwithai (829) + opendata (36327) + photo_geotagging (36298) + photoadjust (36200) + pmtiles (36219) + pt_assistant (637) + reverter (36320) + scripting (v0.3.1) + tageditor (36298) + tagging-preset-tester (36256) + terracer (36298) + todo (139) + utilsplugin2 (36298) Tagging presets: + https://github.com/Jungle-Bus/josm-presets/raw/gh-pages/jungle-stops/Preset_Jungle-Bus.zip + https://josm.openstreetmap.de/josmfile?page=Presets/ParkingLanes&zip=1 + /EasyPresets.xml + https://josm.openstreetmap.de/josmfile?page=Presets/Charlieu_Schema_for_POIs&zip=1 Map paint styles: + https://josm.openstreetmap.de/josmfile?page=Styles/MapWithAI&zip=1 + https://josm.openstreetmap.de/josmfile?page=Styles/PublicTransport&zip=1 - \plugins\indoorhelper\resources\sit.mapcss + \plugins\indoorhelper\resources\sit.mapcss Validator rules: + https://josm.openstreetmap.de/josmfile?page=Rules/FranceSpecificRules&zip=1 Last errors/warnings: - 00000.658 W: extended font config - overriding 'filename.Malgun_Gothic=malgun.ttf' with 'MALGUN.TTF' - 00000.659 W: extended font config - overriding 'filename.Myanmar_Text=mmrtext.ttf' with 'MMRTEXT.TTF' - 00000.660 W: extended font config - overriding 'filename.Mongolian_Baiti=monbaiti.ttf' with 'MONBAITI.TTF' - 00014.672 E: java.nio.file.NoSuchFileException: \EasyPresets.xml - 00014.672 E: /EasyPresets.xml - 00253.239 W: Conflicts detected - There were 3 conflicts detected. }}} " defect new normal Core template_report