Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 14879)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 14880)
@@ -263,5 +263,4 @@
     class CancelAction extends AbstractAction {
         CancelAction() {
-            putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading"));
             putValue(Action.NAME, tr("Cancel"));
             new ImageProvider("cancel").getResource().attachImageIcon(this);
@@ -279,7 +278,6 @@
     class ContinueAction extends AbstractAction implements ListSelectionListener {
         ContinueAction() {
-            putValue(Action.SHORT_DESCRIPTION, tr("Continue uploading"));
             putValue(Action.NAME, tr("Continue"));
-            new ImageProvider("upload").getResource().attachImageIcon(this);
+            new ImageProvider("ok").getResource().attachImageIcon(this);
             updateEnabledState();
         }