add tooltip, merge->overwrite

ankiqt/ui/main.py

@@ -1999,6 +1999,7 @@ it to your friends.
             if interactive:
                 self.onDeckProperties()
                 self.deckProperties.dialog.qtabwidget.setCurrentIndex(1)
+                self.showToolTip(_("Enable syncing, choose a name, then sync again."))
             return
         if self.deck is None and self.deckPath is None:
             # qt on linux incorrectly accepts shortcuts for disabled actions

ankiqt/ui/sync.py

@@ -214,7 +214,7 @@ class DeckChooser(QDialog):
         for name in decks:
             name = os.path.splitext(name)[0]
             if self.create:
-                msg = _("Merge with '%s' on server") % name
+                msg = _("Overwrite '%s' on server") % name
             else:
                 msg = name
             item = QListWidgetItem(msg)