Changeset 13842 in josm for trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
- Timestamp:
- 2018-05-26T17:11:30+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
r12636 r13842 132 132 new ButtonSpec( 133 133 lbl, 134 ImageProvider.get("updatedata"), 135 null, 136 null 137 ), 134 new ImageProvider("updatedata"), 135 null, null), 138 136 new ButtonSpec( 139 137 tr("Synchronize entire dataset"), 140 ImageProvider.get("updatedata"), 141 null, 142 null 143 ), 138 new ImageProvider("updatedata"), 139 null, null), 144 140 new ButtonSpec( 145 141 tr("Cancel"), 146 ImageProvider.get("cancel"), 147 null, 148 null 149 ) 142 new ImageProvider("cancel"), 143 null, null) 150 144 }; 151 145 String msg = tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>" … … 186 180 new ButtonSpec( 187 181 tr("Synchronize entire dataset"), 188 ImageProvider.get("updatedata"), 189 null, 190 null 191 ), 182 new ImageProvider("updatedata"), 183 null, null), 192 184 new ButtonSpec( 193 185 tr("Cancel"), 194 ImageProvider.get("cancel"), 195 null, 196 null 197 ) 186 new ImageProvider("cancel"), 187 null, null) 198 188 }; 199 189 String msg = tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>" … … 249 239 new ButtonSpec( 250 240 tr("Prepare conflict resolution"), 251 ImageProvider.get("ok"),241 new ImageProvider("ok"), 252 242 tr("Click to download all referring objects for {0}", conflict.a), 253 243 null /* no specific help context */ … … 255 245 new ButtonSpec( 256 246 tr("Cancel"), 257 ImageProvider.get("cancel"),247 new ImageProvider("cancel"), 258 248 tr("Click to cancel and to resume editing the map"), 259 249 null /* no specific help context */
Note:
See TracChangeset
for help on using the changeset viewer.