diff --git a/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py b/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py
index d0b78168b4..98bbcf5120 100644
--- a/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py
+++ b/plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py
@@ -118,24 +118,23 @@ class VersionUpgrade27to30(VersionUpgrade):
         if not parser.has_section("general"):
             parser.add_section("general")
 
-        # Need to exclude the following names:
-        # - ultimaker2_plus
-        # - ultimaker2_go
-        # - ultimaker2_extended
-        # - ultimaker2_extended_plus
-        exclude_prefix_list = ["ultimaker2_plus_",
-                               "ultimaker2_go_",
-                               "ultimaker2_extended_",
-                               "ultimaker2_extended_plus_"]
+        # The ultimaker 2 family
+        ultimaker2_prefix_list = ["ultimaker2_extended_",
+                                  "ultimaker2_go_",
+                                  "ultimaker2_"]
+        # ultimaker 2+ is a different family, so don't do anything with those
+        exclude_prefix_list = ["ultimaker2_extended_plus_",
+                               "ultimaker2_plus_"]
+
+        # set machine definition to "ultimaker2" for the custom quality profiles that can be for the ultimaker 2 family
         file_base_name = os.path.basename(filename)
-        if file_base_name.startswith("ultimaker2_"):
-            skip_this = False
-            for exclude_prefix in exclude_prefix_list:
-                if file_base_name.startswith(exclude_prefix):
-                    skip_this = True
-                    break
-            if not skip_this:
-                parser["general"]["definition"] = "ultimaker2"
+        is_ultimaker2_family = not any(file_base_name.startswith(ep) for ep in exclude_prefix_list)
+        if not is_ultimaker2_family:
+            is_ultimaker2_family = any(file_base_name.startswith(ep) for ep in ultimaker2_prefix_list)
+
+        # ultimaker2 family quality profiles used to set as "fdmprinter" profiles
+        if is_ultimaker2_family and parser["general"]["definition"] == "fdmprinter":
+            parser["general"]["definition"] = "ultimaker2"
 
         # Update version numbers
         parser["general"]["version"] = "2"
diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot
index 9135cfc381..fb4b9ed0d6 100644
--- a/resources/i18n/cura.pot
+++ b/resources/i18n/cura.pot
@@ -63,6 +63,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr ""
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr ""
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr ""
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr ""
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po
index a18361802b..6bb71a5ae0 100644
--- a/resources/i18n/de_DE/cura.po
+++ b/resources/i18n/de_DE/cura.po
@@ -61,6 +61,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Druck vollendet"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Plugins"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Plugins durchsuchen..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Installierte plugins..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po
index fe88603c5e..f8f379d3d9 100644
--- a/resources/i18n/es_ES/cura.po
+++ b/resources/i18n/es_ES/cura.po
@@ -61,6 +61,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Impresión terminada"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Complementos"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Examinar complementos..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Complementos instalados..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po
index 6c4dc4fdc8..ae60ff98c6 100644
--- a/resources/i18n/fi_FI/cura.po
+++ b/resources/i18n/fi_FI/cura.po
@@ -61,6 +61,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Tulosta valmis"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Lisäosat"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Selaa lisäosia..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Asennetut lisäoset..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po
index 5724cb3192..76ad2ae4a6 100644
--- a/resources/i18n/fr_FR/cura.po
+++ b/resources/i18n/fr_FR/cura.po
@@ -61,6 +61,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Impression terminée"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Plug-ins"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Parcourir les plug-ins..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Plug-ins installés..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po
index ec85f0c2c8..7354379afa 100644
--- a/resources/i18n/it_IT/cura.po
+++ b/resources/i18n/it_IT/cura.po
@@ -61,6 +61,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Stampa finita"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Plugin"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Sfoglia plugin..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Plugin installati..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po
index c43d557c71..680106d321 100644
--- a/resources/i18n/nl_NL/cura.po
+++ b/resources/i18n/nl_NL/cura.po
@@ -61,6 +61,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Print klaar"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Plugins"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Door invoegtoepassingen bladeren..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Geïnstalleerde plugins..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po
index 9021cbcdde..fd840d9fc2 100644
--- a/resources/i18n/pl_PL/cura.po
+++ b/resources/i18n/pl_PL/cura.po
@@ -63,6 +63,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Drukowanie zakończone"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "W&tyczki"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Przeglądaj wtyczki..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Zainstalowane wtyczki..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po
index 868fe5e552..db4aa72f0b 100644
--- a/resources/i18n/pt_BR/cura.po
+++ b/resources/i18n/pt_BR/cura.po
@@ -62,6 +62,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Impressão Concluída"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Complementos"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Navegar complementos..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Complementos instalados..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po
index 7fe9e17073..34f7262a1f 100755
--- a/resources/i18n/ru_RU/cura.po
+++ b/resources/i18n/ru_RU/cura.po
@@ -63,6 +63,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Печать завершена"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "Плагины"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Просмотр плагинов..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Установленные плагины..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po
index dca9e1ce86..129c2bbe6b 100644
--- a/resources/i18n/tr_TR/cura.po
+++ b/resources/i18n/tr_TR/cura.po
@@ -61,6 +61,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "Baskı tamamlandı"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "&Eklentiler"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "Eklentilere göz at..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "Yüklü eklentiler..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"
diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po
index 98357b94dc..092ce5120b 100644
--- a/resources/i18n/zh_CN/cura.po
+++ b/resources/i18n/zh_CN/cura.po
@@ -63,6 +63,21 @@ msgctxt "@info:status"
 msgid "Print finished"
 msgstr "打印完成"
 
+#: Manually added for resources/Cura/Cura.qml
+msgctxt "@title:menu menubar:toplevel"
+msgid "P&lugins"
+msgstr "插件"
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Browse plugins..."
+msgstr "浏览插件..."
+
+#: Manually added for resources/Cura/Actions.qml
+msgctxt "@action:menu"
+msgid "Installed plugins..."
+msgstr "已安装插件..."
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"