diff --git a/aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po
index 1591ff916d44dbf650bfce59aff9fb8bd263cf56..f5147a1b0662869adc90e826b3db9b080f31db6e 100644
--- a/aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/apps/untis/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-08 16:49+0200\n"
+"POT-Creation-Date: 2022-01-13 21:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,9 +33,6 @@ msgstr ""
 #: aleksis/apps/untis/model_extensions.py:57
 #: aleksis/apps/untis/model_extensions.py:60
 #: aleksis/apps/untis/model_extensions.py:63
-#: aleksis/apps/untis/model_extensions.py:66
-#: aleksis/apps/untis/model_extensions.py:69
-#: aleksis/apps/untis/model_extensions.py:72
 msgid "Untis import reference"
 msgstr ""
 
@@ -60,7 +57,13 @@ msgstr ""
 msgid "Number of lesson element in Untis"
 msgstr ""
 
-#: aleksis/apps/untis/models.py:4221
+#: aleksis/apps/untis/model_extensions.py:66
+#: aleksis/apps/untis/model_extensions.py:69
+#: aleksis/apps/untis/model_extensions.py:72
+msgid "UNTIS import reference"
+msgstr ""
+
+#: aleksis/apps/untis/models.py:4249
 msgid "Can assign subjects to groups"
 msgstr ""
 
@@ -88,23 +91,27 @@ msgstr ""
 msgid "Update name of existing groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:55
+#: aleksis/apps/untis/preferences.py:56
+msgid "Disambiguate name of new groups"
+msgstr ""
+
+#: aleksis/apps/untis/preferences.py:63
 msgid "Overwrite group owners"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:64
+#: aleksis/apps/untis/preferences.py:72
 msgid "Update name of existing rooms"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:72
+#: aleksis/apps/untis/preferences.py:80
 msgid "Update existing supervision areas"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:80
+#: aleksis/apps/untis/preferences.py:88
 msgid "Use course groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:82
+#: aleksis/apps/untis/preferences.py:90
 msgid "Build or search course groups for every course instead of setting classes as groups."
 msgstr ""
 
@@ -116,10 +123,10 @@ msgstr ""
 msgid "  Skip because missing times"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:105
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:111
 msgid "    Skip because missing subject"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:266
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:280
 msgid "Deleted by Untis import"
 msgstr ""
diff --git a/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po
index dc53c1f50a48e01c4ecd4b296d4bfedf862e55ed..787536021e538c78159a603eaed012582d4ebcda 100644
--- a/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/untis/locale/de_DE/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-08 16:49+0200\n"
+"POT-Creation-Date: 2022-01-13 21:43+0100\n"
 "PO-Revision-Date: 2020-12-05 20:52+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-app-untis/de/>\n"
@@ -33,9 +33,6 @@ msgstr "Fächer mit Gruppen verknüpfen (für Untis-MySQL-Import)"
 #: aleksis/apps/untis/model_extensions.py:57
 #: aleksis/apps/untis/model_extensions.py:60
 #: aleksis/apps/untis/model_extensions.py:63
-#: aleksis/apps/untis/model_extensions.py:66
-#: aleksis/apps/untis/model_extensions.py:69
-#: aleksis/apps/untis/model_extensions.py:72
 msgid "Untis import reference"
 msgstr "Untis-Importreferenz"
 
@@ -60,7 +57,15 @@ msgstr "Unterrichtsnummer in Untis"
 msgid "Number of lesson element in Untis"
 msgstr "Nummer des Unterrichtselement in Untis"
 
-#: aleksis/apps/untis/models.py:4221
+#: aleksis/apps/untis/model_extensions.py:66
+#: aleksis/apps/untis/model_extensions.py:69
+#: aleksis/apps/untis/model_extensions.py:72
+#, fuzzy
+#| msgid "Untis import reference"
+msgid "UNTIS import reference"
+msgstr "Untis-Importreferenz"
+
+#: aleksis/apps/untis/models.py:4249
 msgid "Can assign subjects to groups"
 msgstr "Kann Fächer zu Gruppen zuzuordnen"
 
@@ -88,23 +93,29 @@ msgstr "Kurznamen von existierenden Gruppen aktualisieren"
 msgid "Update name of existing groups"
 msgstr "Namen von existierenden Gruppen aktualisieren"
 
-#: aleksis/apps/untis/preferences.py:55
+#: aleksis/apps/untis/preferences.py:56
+#, fuzzy
+#| msgid "Update name of existing groups"
+msgid "Disambiguate name of new groups"
+msgstr "Namen von existierenden Gruppen aktualisieren"
+
+#: aleksis/apps/untis/preferences.py:63
 msgid "Overwrite group owners"
 msgstr "Gruppenbesitzer überschreiben"
 
-#: aleksis/apps/untis/preferences.py:64
+#: aleksis/apps/untis/preferences.py:72
 msgid "Update name of existing rooms"
 msgstr "Namen von existierenden Räumen aktualisieren"
 
-#: aleksis/apps/untis/preferences.py:72
+#: aleksis/apps/untis/preferences.py:80
 msgid "Update existing supervision areas"
 msgstr "Bereits existierende Aufsichtsgebiete aktualisieren"
 
-#: aleksis/apps/untis/preferences.py:80
+#: aleksis/apps/untis/preferences.py:88
 msgid "Use course groups"
 msgstr "Kursgruppen nutzen"
 
-#: aleksis/apps/untis/preferences.py:82
+#: aleksis/apps/untis/preferences.py:90
 msgid "Build or search course groups for every course instead of setting classes as groups."
 msgstr "Baut oder findet Kursgruppen für jeden Kurs anstatt die Klassengruppen zu setzen."
 
@@ -116,11 +127,11 @@ msgstr "Importiere Stunde {}"
 msgid "  Skip because missing times"
 msgstr "  Wird wegen fehlender Zeiten übersprungen"
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:105
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:111
 msgid "    Skip because missing subject"
 msgstr "    Wird wegen fehlendem Fach übersprungen"
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:266
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:280
 msgid "Deleted by Untis import"
 msgstr "Gelöscht durch Untis-Import"
 
diff --git a/aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po
index c0682dc866c439a3cf99561f09498cede9e6fa19..557dec883c29edc53528fb375f353a1f230fdcbf 100644
--- a/aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/apps/untis/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-08 16:49+0200\n"
+"POT-Creation-Date: 2022-01-13 21:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,39 +33,42 @@ msgstr ""
 #: aleksis/apps/untis/model_extensions.py:57
 #: aleksis/apps/untis/model_extensions.py:60
 #: aleksis/apps/untis/model_extensions.py:63
-#: aleksis/apps/untis/model_extensions.py:66
-#: aleksis/apps/untis/model_extensions.py:69
-#: aleksis/apps/untis/model_extensions.py:72
 msgid "Untis import reference"
 msgstr ""
 
 #: aleksis/apps/untis/model_extensions.py:23
-msgid "UNTIS school year ID"
+msgid "Untis school year ID"
 msgstr ""
 
 #: aleksis/apps/untis/model_extensions.py:26
-msgid "UNTIS school id"
+msgid "Untis school id"
 msgstr ""
 
 #: aleksis/apps/untis/model_extensions.py:29
-msgid "UNTIS version id"
+msgid "Untis version id"
 msgstr ""
 
 #: aleksis/apps/untis/model_extensions.py:41
-msgid "Lesson id in UNTIS"
+msgid "Lesson id in Untis"
 msgstr ""
 
 #: aleksis/apps/untis/model_extensions.py:45
 #: aleksis/apps/untis/model_extensions.py:50
-msgid "Number of lesson element in UNTIS"
+msgid "Number of lesson element in Untis"
+msgstr ""
+
+#: aleksis/apps/untis/model_extensions.py:66
+#: aleksis/apps/untis/model_extensions.py:69
+#: aleksis/apps/untis/model_extensions.py:72
+msgid "UNTIS import reference"
 msgstr ""
 
-#: aleksis/apps/untis/models.py:4221
+#: aleksis/apps/untis/models.py:4249
 msgid "Can assign subjects to groups"
 msgstr ""
 
 #: aleksis/apps/untis/preferences.py:8
-msgid "UNTIS: MySQL"
+msgid "Untis: MySQL"
 msgstr ""
 
 #: aleksis/apps/untis/preferences.py:16
@@ -88,23 +91,27 @@ msgstr ""
 msgid "Update name of existing groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:55
+#: aleksis/apps/untis/preferences.py:56
+msgid "Disambiguate name of new groups"
+msgstr ""
+
+#: aleksis/apps/untis/preferences.py:63
 msgid "Overwrite group owners"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:64
+#: aleksis/apps/untis/preferences.py:72
 msgid "Update name of existing rooms"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:72
+#: aleksis/apps/untis/preferences.py:80
 msgid "Update existing supervision areas"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:80
+#: aleksis/apps/untis/preferences.py:88
 msgid "Use course groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:82
+#: aleksis/apps/untis/preferences.py:90
 msgid "Build or search course groups for every course instead of setting classes as groups."
 msgstr ""
 
@@ -116,10 +123,10 @@ msgstr ""
 msgid "  Skip because missing times"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:105
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:111
 msgid "    Skip because missing subject"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:266
-msgid "Deleted by UNTIS import"
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:280
+msgid "Deleted by Untis import"
 msgstr ""
diff --git a/aleksis/apps/untis/locale/la/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/la/LC_MESSAGES/django.po
index 80dbaafd2154a9124edabdf7347e0bf0950ffb87..9eb774b7ab4827bef5b8d42f066f7a7d643df4c2 100644
--- a/aleksis/apps/untis/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/apps/untis/locale/la/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-08 16:49+0200\n"
+"POT-Creation-Date: 2022-01-13 21:43+0100\n"
 "PO-Revision-Date: 2020-08-25 17:42+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-untis/la/>\n"
@@ -33,9 +33,6 @@ msgstr ""
 #: aleksis/apps/untis/model_extensions.py:57
 #: aleksis/apps/untis/model_extensions.py:60
 #: aleksis/apps/untis/model_extensions.py:63
-#: aleksis/apps/untis/model_extensions.py:66
-#: aleksis/apps/untis/model_extensions.py:69
-#: aleksis/apps/untis/model_extensions.py:72
 msgid "Untis import reference"
 msgstr ""
 
@@ -60,7 +57,13 @@ msgstr ""
 msgid "Number of lesson element in Untis"
 msgstr ""
 
-#: aleksis/apps/untis/models.py:4221
+#: aleksis/apps/untis/model_extensions.py:66
+#: aleksis/apps/untis/model_extensions.py:69
+#: aleksis/apps/untis/model_extensions.py:72
+msgid "UNTIS import reference"
+msgstr ""
+
+#: aleksis/apps/untis/models.py:4249
 msgid "Can assign subjects to groups"
 msgstr ""
 
@@ -88,23 +91,27 @@ msgstr ""
 msgid "Update name of existing groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:55
+#: aleksis/apps/untis/preferences.py:56
+msgid "Disambiguate name of new groups"
+msgstr ""
+
+#: aleksis/apps/untis/preferences.py:63
 msgid "Overwrite group owners"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:64
+#: aleksis/apps/untis/preferences.py:72
 msgid "Update name of existing rooms"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:72
+#: aleksis/apps/untis/preferences.py:80
 msgid "Update existing supervision areas"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:80
+#: aleksis/apps/untis/preferences.py:88
 msgid "Use course groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:82
+#: aleksis/apps/untis/preferences.py:90
 msgid "Build or search course groups for every course instead of setting classes as groups."
 msgstr ""
 
@@ -116,11 +123,11 @@ msgstr ""
 msgid "  Skip because missing times"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:105
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:111
 msgid "    Skip because missing subject"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:266
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:280
 msgid "Deleted by Untis import"
 msgstr ""
 
diff --git a/aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po
index 0b3c6babd2fbffc71ad99c31c29452f37ddcdb2f..cb504e0fae29f21401dd1503888a5a4e2538719a 100644
--- a/aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/apps/untis/locale/nb_NO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-08 16:49+0200\n"
+"POT-Creation-Date: 2022-01-13 21:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,9 +32,6 @@ msgstr ""
 #: aleksis/apps/untis/model_extensions.py:57
 #: aleksis/apps/untis/model_extensions.py:60
 #: aleksis/apps/untis/model_extensions.py:63
-#: aleksis/apps/untis/model_extensions.py:66
-#: aleksis/apps/untis/model_extensions.py:69
-#: aleksis/apps/untis/model_extensions.py:72
 msgid "Untis import reference"
 msgstr ""
 
@@ -59,7 +56,13 @@ msgstr ""
 msgid "Number of lesson element in Untis"
 msgstr ""
 
-#: aleksis/apps/untis/models.py:4221
+#: aleksis/apps/untis/model_extensions.py:66
+#: aleksis/apps/untis/model_extensions.py:69
+#: aleksis/apps/untis/model_extensions.py:72
+msgid "UNTIS import reference"
+msgstr ""
+
+#: aleksis/apps/untis/models.py:4249
 msgid "Can assign subjects to groups"
 msgstr ""
 
@@ -87,23 +90,27 @@ msgstr ""
 msgid "Update name of existing groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:55
+#: aleksis/apps/untis/preferences.py:56
+msgid "Disambiguate name of new groups"
+msgstr ""
+
+#: aleksis/apps/untis/preferences.py:63
 msgid "Overwrite group owners"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:64
+#: aleksis/apps/untis/preferences.py:72
 msgid "Update name of existing rooms"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:72
+#: aleksis/apps/untis/preferences.py:80
 msgid "Update existing supervision areas"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:80
+#: aleksis/apps/untis/preferences.py:88
 msgid "Use course groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:82
+#: aleksis/apps/untis/preferences.py:90
 msgid "Build or search course groups for every course instead of setting classes as groups."
 msgstr ""
 
@@ -115,10 +122,10 @@ msgstr ""
 msgid "  Skip because missing times"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:105
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:111
 msgid "    Skip because missing subject"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:266
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:280
 msgid "Deleted by Untis import"
 msgstr ""
diff --git a/aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po
index 0b3c6babd2fbffc71ad99c31c29452f37ddcdb2f..cb504e0fae29f21401dd1503888a5a4e2538719a 100644
--- a/aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/apps/untis/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-08 16:49+0200\n"
+"POT-Creation-Date: 2022-01-13 21:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,9 +32,6 @@ msgstr ""
 #: aleksis/apps/untis/model_extensions.py:57
 #: aleksis/apps/untis/model_extensions.py:60
 #: aleksis/apps/untis/model_extensions.py:63
-#: aleksis/apps/untis/model_extensions.py:66
-#: aleksis/apps/untis/model_extensions.py:69
-#: aleksis/apps/untis/model_extensions.py:72
 msgid "Untis import reference"
 msgstr ""
 
@@ -59,7 +56,13 @@ msgstr ""
 msgid "Number of lesson element in Untis"
 msgstr ""
 
-#: aleksis/apps/untis/models.py:4221
+#: aleksis/apps/untis/model_extensions.py:66
+#: aleksis/apps/untis/model_extensions.py:69
+#: aleksis/apps/untis/model_extensions.py:72
+msgid "UNTIS import reference"
+msgstr ""
+
+#: aleksis/apps/untis/models.py:4249
 msgid "Can assign subjects to groups"
 msgstr ""
 
@@ -87,23 +90,27 @@ msgstr ""
 msgid "Update name of existing groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:55
+#: aleksis/apps/untis/preferences.py:56
+msgid "Disambiguate name of new groups"
+msgstr ""
+
+#: aleksis/apps/untis/preferences.py:63
 msgid "Overwrite group owners"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:64
+#: aleksis/apps/untis/preferences.py:72
 msgid "Update name of existing rooms"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:72
+#: aleksis/apps/untis/preferences.py:80
 msgid "Update existing supervision areas"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:80
+#: aleksis/apps/untis/preferences.py:88
 msgid "Use course groups"
 msgstr ""
 
-#: aleksis/apps/untis/preferences.py:82
+#: aleksis/apps/untis/preferences.py:90
 msgid "Build or search course groups for every course instead of setting classes as groups."
 msgstr ""
 
@@ -115,10 +122,10 @@ msgstr ""
 msgid "  Skip because missing times"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:105
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:111
 msgid "    Skip because missing subject"
 msgstr ""
 
-#: aleksis/apps/untis/util/mysql/importers/lessons.py:266
+#: aleksis/apps/untis/util/mysql/importers/lessons.py:280
 msgid "Deleted by Untis import"
 msgstr ""