diff --git a/aqt/browser.py b/aqt/browser.py
index ffa5a9fb5..0cbb072a6 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -846,7 +846,7 @@ where id in %s""" % ids2str(
 select count(distinct mid) from notes
 where id in %s""" % ids2str(sf))
         if mods > 1:
-            showInfo(_("Please select cards from only one model."))
+            showInfo(_("Please select cards from only one note type."))
             return
         return sf
 
diff --git a/aqt/errors.py b/aqt/errors.py
index 64fe801b9..e3461e47c 100644
--- a/aqt/errors.py
+++ b/aqt/errors.py
@@ -60,8 +60,7 @@ or your deck may have a problem.
 <p>If that doesn't fix the problem, please copy the following<br>
 into a bug report:""")
         pluginText = _("""\
-An error occurred in a plugin. Please contact the plugin author.<br>
-Please do not file a bug report with Anki.<br>""")
+An error occurred in an add-on. Please contact the add-on author.<br>""")
         if "addon" in error:
             txt = pluginText
         else:
diff --git a/aqt/modelchooser.py b/aqt/modelchooser.py
index c32ee26df..0f199e5e7 100644
--- a/aqt/modelchooser.py
+++ b/aqt/modelchooser.py
@@ -43,7 +43,7 @@ class ModelChooser(QHBoxLayout):
             self.edit.setFixedWidth(32)
         self.edit.setIcon(QIcon(":/icons/gears.png"))
         self.edit.setShortcut(_("Shift+Alt+e"))
-        self.edit.setToolTip(_("Customize Models"))
+        self.edit.setToolTip(_("Customize Note Types"))
         self.edit.setAutoDefault(False)
         self.addWidget(self.edit)
         self.connect(self.edit, SIGNAL("clicked()"), self.onEdit)
diff --git a/aqt/models.py b/aqt/models.py
index de8efa04b..b43c3f7fb 100644
--- a/aqt/models.py
+++ b/aqt/models.py
@@ -14,7 +14,7 @@ class Models(QDialog):
         QDialog.__init__(self, self.parent, Qt.Window)
         self.col = mw.col
         self.mm = self.col.models
-        self.mw.checkpoint(_("Models"))
+        self.mw.checkpoint(_("Note Types"))
         self.form = aqt.forms.models.Ui_Dialog()
         self.form.setupUi(self)
         self.connect(self.form.buttonBox, SIGNAL("helpRequested()"),
@@ -82,11 +82,11 @@ class Models(QDialog):
 
     def onDelete(self):
         if len(self.models) < 2:
-            showInfo(_("Please add another model first."),
+            showInfo(_("Please add another note type first."),
                      parent=self)
             return
         if not askUser(
-            _("Delete this model and all its cards?"),
+            _("Delete this note type and all its cards?"),
             parent=self):
             return
         self.mm.rem(self.model)
diff --git a/aqt/upgrade.py b/aqt/upgrade.py
index 8faec3598..9f1ea8d04 100644
--- a/aqt/upgrade.py
+++ b/aqt/upgrade.py
@@ -75,7 +75,7 @@ to import your decks from previous Anki versions."""))
         w.addPage(self._readyPage())
         w.addPage(self._upgradePage())
         w.addPage(self._finishedPage())
-        w.setWindowTitle("Upgrade Wizard")
+        w.setWindowTitle(_("Upgrade Wizard"))
         w.setWizardStyle(QWizard.ModernStyle)
         w.setOptions(QWizard.NoCancelButton)
         w.exec_()
diff --git a/designer/main.ui b/designer/main.ui
index 17dc1cd5d..cc2ce83ba 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -190,7 +190,7 @@
     <string>Browse &amp;&amp; Install...</string>
    </property>
    <property name="statusTip">
-    <string>Download a plugin to add new features or change Anki's behaviour</string>
+    <string></string>
    </property>
   </action>
   <action name="actionFullDatabaseCheck">