Command

* adds new command to be used with cron for periodic checkin of resubmissions
* updates translations

konova/admin.py

@@ -145,7 +145,8 @@ class ResubmissionAdmin(BaseResourceAdmin):
     ]
     fields = [
         "comment",
-        "resubmit_on"
+        "resubmit_on",
+        "resubmission_sent",
     ]
 
 

konova/management/commands/handle_resubmissions.py

@@ -0,0 +1,46 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 15.08.22
+
+"""
+import datetime
+
+from compensation.models import Compensation, EcoAccount
+from ema.models import Ema
+from intervention.models import Intervention
+from konova.management.commands.setup import BaseKonovaCommand
+from konova.models import Resubmission
+
+
+class Command(BaseKonovaCommand):
+    help = "Checks for resubmissions due now"
+
+    def handle(self, *args, **options):
+        try:
+            resubmitable_models = [
+                Intervention,
+                Compensation,
+                Ema,
+                EcoAccount,
+            ]
+            today = datetime.date.today()
+            resubmissions = Resubmission.objects.filter(
+                resubmit_on__lte=today,
+                resubmission_sent=False,
+            )
+            self._write_warning(f"Found {resubmissions.count()} resubmission. Process now...")
+            for model in resubmitable_models:
+                all_objs = model.objects.filter(
+                    resubmissions__in=resubmissions
+                )
+                self._write_warning(f"Process resubmissions for {all_objs.count()} {model.__name__} entries")
+                for obj in all_objs:
+                    obj.resubmit()
+            self._write_success("Mails have been sent.")
+            resubmissions.delete()
+            self._write_success("Resubmissions have been deleted.")
+        except KeyboardInterrupt:
+            self._break_line()
+            exit(-1)

konova/models/resubmission.py

@@ -35,7 +35,7 @@ class Resubmission(BaseResource):
         """ Sends a resubmission mail
 
         """
-        _today = today()
+        _today = today().date()
         resubmission_handled = _today.__ge__(self.resubmit_on) and self.resubmission_sent
         if resubmission_handled:
             return

locale/de/LC_MESSAGES/django.po

@@ -18,15 +18,16 @@
 #: konova/filters/mixins.py:277 konova/filters/mixins.py:323
 #: konova/filters/mixins.py:361 konova/filters/mixins.py:362
 #: konova/filters/mixins.py:393 konova/filters/mixins.py:394
-#: konova/forms.py:179 konova/forms.py:281 konova/forms.py:395
-#: konova/forms.py:439 konova/forms.py:449 konova/forms.py:462
-#: konova/forms.py:474 konova/forms.py:492 user/forms.py:42
+#: konova/forms.py:183 konova/forms.py:285 konova/forms.py:399
+#: konova/forms.py:443 konova/forms.py:453 konova/forms.py:466
+#: konova/forms.py:478 konova/forms.py:496 konova/forms.py:696
+#: konova/forms.py:711 user/forms.py:42
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-08-10 08:37+0200\n"
+"POT-Creation-Date: 2022-08-15 09:39+0200\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"
@@ -85,7 +86,7 @@ msgstr "Bericht generieren"
 msgid "Select a timespan and the desired conservation office"
 msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle"
 
-#: analysis/forms.py:71 konova/forms.py:227
+#: analysis/forms.py:71 konova/forms.py:231
 msgid "Continue"
 msgstr "Weiter"
 
@@ -241,7 +242,8 @@ msgstr ""
 #: ema/templates/ema/detail/includes/states-after.html:36
 #: ema/templates/ema/detail/includes/states-before.html:36
 #: intervention/forms/modalForms.py:364
-#: templates/email/other/deduction_changed.html:29
+#: templates/email/other/deduction_changed.html:31
+#: templates/email/other/deduction_changed_team.html:31
 msgid "Surface"
 msgstr "Fläche"
 
@@ -308,7 +310,8 @@ msgstr "Typ"
 #: intervention/forms/modalForms.py:382 intervention/tables.py:87
 #: intervention/templates/intervention/detail/view.html:19
 #: konova/templates/konova/includes/quickstart/interventions.html:4
-#: templates/email/other/deduction_changed.html:24
+#: templates/email/other/deduction_changed.html:26
+#: templates/email/other/deduction_changed_team.html:26
 #: templates/navbars/navbar.html:22
 msgid "Intervention"
 msgstr "Eingriff"
@@ -362,7 +365,7 @@ msgstr "Automatisch generiert"
 #: intervention/templates/intervention/detail/includes/documents.html:28
 #: intervention/templates/intervention/detail/view.html:31
 #: intervention/templates/intervention/report/report.html:12
-#: konova/forms.py:438
+#: konova/forms.py:442
 msgid "Title"
 msgstr "Bezeichnung"
 
@@ -389,12 +392,13 @@ msgstr "Kompensation XY; Flur ABC"
 #: intervention/templates/intervention/detail/includes/documents.html:34
 #: intervention/templates/intervention/detail/includes/payments.html:34
 #: intervention/templates/intervention/detail/includes/revocation.html:38
-#: konova/forms.py:473 konova/templates/konova/includes/comment_card.html:16
+#: konova/forms.py:477 konova/forms.py:710
+#: konova/templates/konova/includes/comment_card.html:16
 msgid "Comment"
 msgstr "Kommentar"
 
 #: compensation/forms/forms.py:59 compensation/forms/modalForms.py:471
-#: intervention/forms/forms.py:200
+#: intervention/forms/forms.py:200 konova/forms.py:712
 msgid "Additional comment"
 msgstr "Zusätzlicher Kommentar"
 
@@ -479,7 +483,7 @@ msgstr "kompensiert Eingriff"
 msgid "Select the intervention for which this compensation compensates"
 msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
 
-#: compensation/forms/forms.py:219 compensation/views/compensation.py:110
+#: compensation/forms/forms.py:219 compensation/views/compensation.py:111
 msgid "New compensation"
 msgstr "Neue Kompensation"
 
@@ -531,7 +535,7 @@ msgid "Due on which date"
 msgstr "Zahlung wird an diesem Datum erwartet"
 
 #: compensation/forms/modalForms.py:65 compensation/forms/modalForms.py:363
-#: intervention/forms/modalForms.py:177 konova/forms.py:475
+#: intervention/forms/modalForms.py:177 konova/forms.py:479
 msgid "Additional comment, maximum {} letters"
 msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
 
@@ -576,7 +580,7 @@ msgstr "Neuer Zustand"
 msgid "Insert data for the new state"
 msgstr "Geben Sie die Daten des neuen Zustandes ein"
 
-#: compensation/forms/modalForms.py:219 konova/forms.py:229
+#: compensation/forms/modalForms.py:219 konova/forms.py:233
 msgid "Object removed"
 msgstr "Objekt entfernt"
 
@@ -602,7 +606,7 @@ msgstr "Fristart wählen"
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:36
 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:36
 #: ema/templates/ema/detail/includes/deadlines.html:36
-#: intervention/forms/modalForms.py:149
+#: intervention/forms/modalForms.py:149 konova/forms.py:697
 msgid "Date"
 msgstr "Datum"
 
@@ -850,24 +854,32 @@ msgstr "In LANIS öffnen"
 msgid "Public report"
 msgstr "Öffentlicher Bericht"
 
-#: compensation/templates/compensation/detail/compensation/includes/controls.html:17
-#: compensation/templates/compensation/detail/eco_account/includes/controls.html:31
-#: ema/templates/ema/detail/includes/controls.html:31
-#: intervention/templates/intervention/detail/includes/controls.html:36
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:15
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:15
+#: ema/templates/ema/detail/includes/controls.html:15
+#: intervention/templates/intervention/detail/includes/controls.html:15
+#: konova/forms.py:724 templates/email/resubmission/resubmission.html:4
+msgid "Resubmission"
+msgstr "Wiedervorlage"
+
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:20
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:34
+#: ema/templates/ema/detail/includes/controls.html:34
+#: intervention/templates/intervention/detail/includes/controls.html:39
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: compensation/templates/compensation/detail/compensation/includes/controls.html:21
-#: compensation/templates/compensation/detail/eco_account/includes/controls.html:35
-#: ema/templates/ema/detail/includes/controls.html:35
-#: intervention/templates/intervention/detail/includes/controls.html:40
-msgid "Show log"
-msgstr "Log anzeigen"
-
 #: compensation/templates/compensation/detail/compensation/includes/controls.html:24
 #: compensation/templates/compensation/detail/eco_account/includes/controls.html:38
 #: ema/templates/ema/detail/includes/controls.html:38
 #: intervention/templates/intervention/detail/includes/controls.html:43
+msgid "Show log"
+msgstr "Log anzeigen"
+
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:27
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:41
+#: ema/templates/ema/detail/includes/controls.html:41
+#: intervention/templates/intervention/detail/includes/controls.html:46
 #: venv/lib/python3.7/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Löschen"
@@ -907,7 +919,7 @@ msgstr "Dokumente"
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:14
 #: ema/templates/ema/detail/includes/documents.html:14
 #: intervention/templates/intervention/detail/includes/documents.html:14
-#: konova/forms.py:491
+#: konova/forms.py:495
 msgid "Add new document"
 msgstr "Neues Dokument hinzufügen"
 
@@ -915,7 +927,7 @@ msgstr "Neues Dokument hinzufügen"
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:31
 #: ema/templates/ema/detail/includes/documents.html:31
 #: intervention/templates/intervention/detail/includes/documents.html:31
-#: konova/forms.py:448
+#: konova/forms.py:452
 msgid "Created on"
 msgstr "Erstellt"
 
@@ -923,7 +935,7 @@ msgstr "Erstellt"
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:61
 #: ema/templates/ema/detail/includes/documents.html:61
 #: intervention/templates/intervention/detail/includes/documents.html:65
-#: konova/forms.py:553
+#: konova/forms.py:557
 msgid "Edit document"
 msgstr "Dokument bearbeiten"
 
@@ -1093,22 +1105,22 @@ msgstr ""
 msgid "other users"
 msgstr "weitere Nutzer"
 
-#: compensation/templates/compensation/detail/eco_account/includes/controls.html:15
-#: ema/templates/ema/detail/includes/controls.html:15
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:18
+#: ema/templates/ema/detail/includes/controls.html:18
 #: intervention/forms/modalForms.py:71
-#: intervention/templates/intervention/detail/includes/controls.html:15
+#: intervention/templates/intervention/detail/includes/controls.html:18
 msgid "Share"
 msgstr "Freigabe"
 
-#: compensation/templates/compensation/detail/eco_account/includes/controls.html:20
-#: ema/templates/ema/detail/includes/controls.html:20
-#: intervention/templates/intervention/detail/includes/controls.html:25
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:23
+#: ema/templates/ema/detail/includes/controls.html:23
+#: intervention/templates/intervention/detail/includes/controls.html:28
 msgid "Unrecord"
 msgstr "Entzeichnen"
 
-#: compensation/templates/compensation/detail/eco_account/includes/controls.html:24
-#: ema/templates/ema/detail/includes/controls.html:24
-#: intervention/templates/intervention/detail/includes/controls.html:29
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:27
+#: ema/templates/ema/detail/includes/controls.html:27
+#: intervention/templates/intervention/detail/includes/controls.html:32
 msgid "Record"
 msgstr "Verzeichnen"
 
@@ -1215,29 +1227,34 @@ msgstr ""
 msgid "Responsible data"
 msgstr "Daten zu den verantwortlichen Stellen"
 
-#: compensation/views/compensation.py:53
+#: compensation/views/compensation.py:54
 msgid "Compensations - Overview"
 msgstr "Kompensationen - Übersicht"
 
-#: compensation/views/compensation.py:172 konova/utils/message_templates.py:36
+#: compensation/views/compensation.py:173 konova/utils/message_templates.py:36
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"
 
-#: compensation/views/compensation.py:182 compensation/views/eco_account.py:173
+#: compensation/views/compensation.py:183 compensation/views/eco_account.py:173
 #: ema/views.py:241 intervention/views.py:338
 msgid "Edit {}"
 msgstr "Bearbeite {}"
 
-#: compensation/views/compensation.py:269 compensation/views/eco_account.py:360
-#: ema/views.py:195 intervention/views.py:542
+#: compensation/views/compensation.py:270 compensation/views/eco_account.py:360
+#: ema/views.py:195 intervention/views.py:565
 msgid "Log"
 msgstr "Log"
 
-#: compensation/views/compensation.py:613 compensation/views/eco_account.py:728
-#: ema/views.py:559 intervention/views.py:688
+#: compensation/views/compensation.py:614 compensation/views/eco_account.py:728
+#: ema/views.py:559 intervention/views.py:711
 msgid "Report {}"
 msgstr "Bericht {}"
 
+#: compensation/views/compensation.py:680 compensation/views/eco_account.py:862
+#: ema/views.py:734 intervention/views.py:496
+msgid "Resubmission set"
+msgstr "Wiedervorlage gesetzt"
+
 #: compensation/views/eco_account.py:65
 msgid "Eco-account - Overview"
 msgstr "Ökokonten - Übersicht"
@@ -1255,12 +1272,12 @@ msgid "Eco-account removed"
 msgstr "Ökokonto entfernt"
 
 #: compensation/views/eco_account.py:381 ema/views.py:283
-#: intervention/views.py:641
+#: intervention/views.py:664
 msgid "{} unrecorded"
 msgstr "{} entzeichnet"
 
 #: compensation/views/eco_account.py:381 ema/views.py:283
-#: intervention/views.py:641
+#: intervention/views.py:664
 msgid "{} recorded"
 msgstr "{} verzeichnet"
 
@@ -1462,11 +1479,11 @@ msgid "Checked compensations data and payments"
 msgstr "Kompensationen und Zahlungen geprüft"
 
 #: intervention/forms/modalForms.py:263
-#: intervention/templates/intervention/detail/includes/controls.html:19
+#: intervention/templates/intervention/detail/includes/controls.html:22
 msgid "Run check"
 msgstr "Prüfung vornehmen"
 
-#: intervention/forms/modalForms.py:264 konova/forms.py:594
+#: intervention/forms/modalForms.py:264 konova/forms.py:598
 msgid ""
 "I, {} {}, confirm that all necessary control steps have been performed by "
 "myself."
@@ -1622,11 +1639,11 @@ msgstr "Eingriff {} bearbeitet"
 msgid "{} removed"
 msgstr "{} entfernt"
 
-#: intervention/views.py:495
+#: intervention/views.py:518
 msgid "Check performed"
 msgstr "Prüfung durchgeführt"
 
-#: intervention/views.py:646
+#: intervention/views.py:669
 msgid "There are errors on this intervention:"
 msgstr "Es liegen Fehler in diesem Eingriff vor:"
 
@@ -1711,78 +1728,90 @@ msgstr "Nach Zulassungsbehörde suchen"
 msgid "Search for conservation office"
 msgstr "Nch Eintragungsstelle suchen"
 
-#: konova/forms.py:41 templates/form/collapsable/form.html:62
+#: konova/forms.py:44 templates/form/collapsable/form.html:62
 msgid "Save"
 msgstr "Speichern"
 
-#: konova/forms.py:75
+#: konova/forms.py:78
 msgid "Not editable"
 msgstr "Nicht editierbar"
 
-#: konova/forms.py:178 konova/forms.py:394
+#: konova/forms.py:182 konova/forms.py:398
 msgid "Confirm"
 msgstr "Bestätige"
 
-#: konova/forms.py:190 konova/forms.py:403
+#: konova/forms.py:194 konova/forms.py:407
 msgid "Remove"
 msgstr "Löschen"
 
-#: konova/forms.py:192
+#: konova/forms.py:196
 msgid "You are about to remove {} {}"
 msgstr "Sie sind dabei {} {} zu löschen"
 
-#: konova/forms.py:280 konova/utils/quality.py:44 konova/utils/quality.py:46
+#: konova/forms.py:284 konova/utils/quality.py:44 konova/utils/quality.py:46
 #: templates/form/collapsable/form.html:45
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: konova/forms.py:331
+#: konova/forms.py:335
 msgid "Only surfaces allowed. Points or lines must be buffered."
 msgstr ""
 "Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
 
-#: konova/forms.py:404
+#: konova/forms.py:408
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: konova/forms.py:450
+#: konova/forms.py:454
 msgid "When has this file been created? Important for photos."
 msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
 
-#: konova/forms.py:461
+#: konova/forms.py:465
 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231
 msgid "File"
 msgstr "Datei"
 
-#: konova/forms.py:463
+#: konova/forms.py:467
 msgid "Allowed formats: pdf, jpg, png. Max size 15 MB."
 msgstr "Formate: pdf, jpg, png. Maximal 15 MB."
 
-#: konova/forms.py:528
+#: konova/forms.py:532
 msgid "Added document"
 msgstr "Dokument hinzugefügt"
 
-#: konova/forms.py:585
+#: konova/forms.py:589
 msgid "Confirm record"
 msgstr "Verzeichnen bestätigen"
 
-#: konova/forms.py:593
+#: konova/forms.py:597
 msgid "Record data"
 msgstr "Daten verzeichnen"
 
-#: konova/forms.py:600
+#: konova/forms.py:604
 msgid "Confirm unrecord"
 msgstr "Entzeichnen bestätigen"
 
-#: konova/forms.py:601
+#: konova/forms.py:605
 msgid "Unrecord data"
 msgstr "Daten entzeichnen"
 
-#: konova/forms.py:602
+#: konova/forms.py:606
 msgid "I, {} {}, confirm that this data must be unrecorded."
 msgstr ""
 "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen."
 
+#: konova/forms.py:698
+msgid "When do you want to be reminded?"
+msgstr "Wann wollen Sie erinnert werden?"
+
+#: konova/forms.py:725
+msgid "Set your resubmission for this entry."
+msgstr "Setzen Sie eine Wiedervorlage für diesen Eintrag."
+
+#: konova/forms.py:746
+msgid "The date should be in the future"
+msgstr "Das Datum sollte in der Zukunft liegen"
+
 #: konova/management/commands/setup_data.py:26
 msgid "On shared access gained"
 msgstr "Wenn mir eine Freigabe zu Daten erteilt wird"
@@ -1929,7 +1958,7 @@ msgstr "{} - Freigegebene Daten verzeichnet"
 msgid "{} - Shared data checked"
 msgstr "{} - Freigegebene Daten geprüft"
 
-#: konova/utils/mailer.py:233 konova/utils/mailer.py:372
+#: konova/utils/mailer.py:233 konova/utils/mailer.py:376
 msgid "{} - Deduction changed"
 msgstr "{} - Abbuchung geändert"
 
@@ -1937,10 +1966,14 @@ msgstr "{} - Abbuchung geändert"
 msgid "{} - Shared data deleted"
 msgstr "{} - Freigegebene Daten gelöscht"
 
-#: konova/utils/mailer.py:393 templates/email/api/verify_token.html:4
+#: konova/utils/mailer.py:397 templates/email/api/verify_token.html:4
 msgid "Request for new API token"
 msgstr "Anfrage für neuen API Token"
 
+#: konova/utils/mailer.py:420
+msgid "Resubmission - {}"
+msgstr "Wiedervorlage - {}"
+
 #: konova/utils/message_templates.py:10
 msgid "no further details"
 msgstr "keine weitere Angabe"
@@ -2223,11 +2256,11 @@ msgstr "Irgendetwas ist passiert. Wir arbeiten daran!"
 msgid "Hello support"
 msgstr "Hallo Support"
 
-#: templates/email/api/verify_token.html:9
+#: templates/email/api/verify_token.html:10
 msgid "you need to verify the API token for user"
 msgstr "Sie müssen einen API Token für folgenden Nutzer freischalten"
 
-#: templates/email/api/verify_token.html:15
+#: templates/email/api/verify_token.html:16
 msgid ""
 "If unsure, please contact the user. The API token can not be used until you "
 "activated it in the admin backend."
@@ -2236,20 +2269,22 @@ msgstr ""
 "Token kann so lange nicht verwendet werden, wie er noch nicht von Ihnen im "
 "Admin Backend aktiviert worden ist."
 
-#: templates/email/api/verify_token.html:18
-#: templates/email/checking/shared_data_checked.html:19
-#: templates/email/checking/shared_data_checked_team.html:19
-#: templates/email/deleting/shared_data_deleted.html:19
-#: templates/email/deleting/shared_data_deleted_team.html:19
-#: templates/email/other/deduction_changed.html:38
-#: templates/email/recording/shared_data_recorded.html:19
-#: templates/email/recording/shared_data_recorded_team.html:19
-#: templates/email/recording/shared_data_unrecorded.html:19
-#: templates/email/recording/shared_data_unrecorded_team.html:19
-#: templates/email/sharing/shared_access_given.html:20
-#: templates/email/sharing/shared_access_given_team.html:20
-#: templates/email/sharing/shared_access_removed.html:20
-#: templates/email/sharing/shared_access_removed_team.html:20
+#: templates/email/api/verify_token.html:19
+#: templates/email/checking/shared_data_checked.html:20
+#: templates/email/checking/shared_data_checked_team.html:20
+#: templates/email/deleting/shared_data_deleted.html:20
+#: templates/email/deleting/shared_data_deleted_team.html:20
+#: templates/email/other/deduction_changed.html:41
+#: templates/email/other/deduction_changed_team.html:41
+#: templates/email/recording/shared_data_recorded.html:20
+#: templates/email/recording/shared_data_recorded_team.html:20
+#: templates/email/recording/shared_data_unrecorded.html:20
+#: templates/email/recording/shared_data_unrecorded_team.html:20
+#: templates/email/resubmission/resubmission.html:21
+#: templates/email/sharing/shared_access_given.html:21
+#: templates/email/sharing/shared_access_given_team.html:21
+#: templates/email/sharing/shared_access_removed.html:21
+#: templates/email/sharing/shared_access_removed_team.html:21
 msgid "Best regards"
 msgstr "Beste Grüße"
 
@@ -2263,18 +2298,19 @@ msgstr "Freigegebene Daten geprüft"
 #: templates/email/other/deduction_changed.html:8
 #: templates/email/recording/shared_data_recorded.html:8
 #: templates/email/recording/shared_data_unrecorded.html:8
+#: templates/email/resubmission/resubmission.html:8
 #: templates/email/sharing/shared_access_given.html:8
 #: templates/email/sharing/shared_access_removed.html:8
 msgid "Hello "
 msgstr "Hallo "
 
-#: templates/email/checking/shared_data_checked.html:10
-#: templates/email/checking/shared_data_checked_team.html:10
+#: templates/email/checking/shared_data_checked.html:11
+#: templates/email/checking/shared_data_checked_team.html:11
 msgid "the following dataset has just been checked"
 msgstr "der folgende Datensatz wurde soeben geprüft "
 
-#: templates/email/checking/shared_data_checked.html:16
-#: templates/email/checking/shared_data_checked_team.html:16
+#: templates/email/checking/shared_data_checked.html:17
+#: templates/email/checking/shared_data_checked_team.html:17
 msgid ""
 "This means, the responsible registration office just confirmed the "
 "correctness of this dataset."
@@ -2284,6 +2320,7 @@ msgstr ""
 
 #: templates/email/checking/shared_data_checked_team.html:8
 #: templates/email/deleting/shared_data_deleted_team.html:8
+#: templates/email/other/deduction_changed_team.html:8
 #: templates/email/recording/shared_data_recorded_team.html:8
 #: templates/email/recording/shared_data_unrecorded_team.html:8
 #: templates/email/sharing/shared_access_given_team.html:8
@@ -2296,14 +2333,15 @@ msgstr "Hallo Team"
 msgid "Shared data deleted"
 msgstr "Freigegebene Daten gelöscht"
 
-#: templates/email/deleting/shared_data_deleted.html:10
-#: templates/email/deleting/shared_data_deleted_team.html:10
+#: templates/email/deleting/shared_data_deleted.html:11
+#: templates/email/deleting/shared_data_deleted_team.html:11
 msgid "the following dataset has just been deleted"
 msgstr "der folgende Datensatz wurde soeben gelöscht "
 
-#: templates/email/deleting/shared_data_deleted.html:16
-#: templates/email/deleting/shared_data_deleted_team.html:16
-#: templates/email/other/deduction_changed.html:35
+#: templates/email/deleting/shared_data_deleted.html:17
+#: templates/email/deleting/shared_data_deleted_team.html:17
+#: templates/email/other/deduction_changed.html:38
+#: templates/email/other/deduction_changed_team.html:38
 msgid ""
 "If this should not have been happened, please contact us. See the signature "
 "for details."
@@ -2312,27 +2350,33 @@ msgstr ""
 "mail Signatur finden Sie weitere Kontaktinformationen."
 
 #: templates/email/other/deduction_changed.html:4
+#: templates/email/other/deduction_changed_team.html:4
 msgid "Deduction changed"
 msgstr "Abbuchung geändert"
 
-#: templates/email/other/deduction_changed.html:10
+#: templates/email/other/deduction_changed.html:11
+#: templates/email/other/deduction_changed_team.html:11
 msgid "a deduction of this eco account has changed:"
 msgstr "eine Abbuchung des Ökokontos hat sich geändert:"
 
-#: templates/email/other/deduction_changed.html:14
+#: templates/email/other/deduction_changed.html:16
+#: templates/email/other/deduction_changed_team.html:16
 msgid "Attribute"
 msgstr "Attribute"
 
-#: templates/email/other/deduction_changed.html:15
+#: templates/email/other/deduction_changed.html:17
+#: templates/email/other/deduction_changed_team.html:17
 msgid "Old"
 msgstr "Alt"
 
-#: templates/email/other/deduction_changed.html:16
+#: templates/email/other/deduction_changed.html:18
+#: templates/email/other/deduction_changed_team.html:18
 #: templates/generic_index.html:43 user/templates/user/team/index.html:22
 msgid "New"
 msgstr "Neu"
 
-#: templates/email/other/deduction_changed.html:19
+#: templates/email/other/deduction_changed.html:21
+#: templates/email/other/deduction_changed_team.html:21
 msgid "EcoAccount"
 msgstr "Ökokonto"
 
@@ -2341,19 +2385,19 @@ msgstr "Ökokonto"
 msgid "Shared data recorded"
 msgstr "Freigegebene Daten verzeichnet"
 
-#: templates/email/recording/shared_data_recorded.html:10
-#: templates/email/recording/shared_data_recorded_team.html:10
+#: templates/email/recording/shared_data_recorded.html:11
+#: templates/email/recording/shared_data_recorded_team.html:11
 msgid "the following dataset has just been recorded"
 msgstr "der folgende Datensatz wurde soeben verzeichnet "
 
-#: templates/email/recording/shared_data_recorded.html:16
-#: templates/email/recording/shared_data_recorded_team.html:16
+#: templates/email/recording/shared_data_recorded.html:17
+#: templates/email/recording/shared_data_recorded_team.html:17
 msgid "This means the data is now publicly available, e.g. in LANIS"
 msgstr ""
 "Das bedeutet, dass die Daten nun öffentlich verfügbar sind, z.B. im LANIS."
 
-#: templates/email/recording/shared_data_recorded.html:26
-#: templates/email/recording/shared_data_recorded_team.html:26
+#: templates/email/recording/shared_data_recorded.html:27
+#: templates/email/recording/shared_data_recorded_team.html:27
 msgid ""
 "Please note: Recorded intervention means the compensations are recorded as "
 "well."
@@ -2366,18 +2410,18 @@ msgstr ""
 msgid "Shared data unrecorded"
 msgstr "Freigegebene Daten entzeichnet"
 
-#: templates/email/recording/shared_data_unrecorded.html:10
-#: templates/email/recording/shared_data_unrecorded_team.html:10
+#: templates/email/recording/shared_data_unrecorded.html:11
+#: templates/email/recording/shared_data_unrecorded_team.html:11
 msgid "the following dataset has just been unrecorded"
 msgstr "der folgende Datensatz wurde soeben entzeichnet "
 
-#: templates/email/recording/shared_data_unrecorded.html:16
-#: templates/email/recording/shared_data_unrecorded_team.html:16
+#: templates/email/recording/shared_data_unrecorded.html:17
+#: templates/email/recording/shared_data_unrecorded_team.html:17
 msgid "This means the data is no longer publicly available."
 msgstr "Das bedeutet, dass die Daten nicht länger öffentlich verfügbar sind."
 
-#: templates/email/recording/shared_data_unrecorded.html:26
-#: templates/email/recording/shared_data_unrecorded_team.html:26
+#: templates/email/recording/shared_data_unrecorded.html:27
+#: templates/email/recording/shared_data_unrecorded_team.html:27
 msgid ""
 "Please note: Unrecorded intervention means the compensations are unrecorded "
 "as well."
@@ -2385,22 +2429,30 @@ msgstr ""
 "Bitte beachten Sie: Entzeichnete Eingriffe bedeuten, dass auch die "
 "zugehörigen Kompensationen automatisch entzeichnet worden sind."
 
+#: templates/email/resubmission/resubmission.html:11
+msgid "you wanted to be reminded on this entry."
+msgstr "Sie wollten an diesen Eintrag erinnert werden."
+
+#: templates/email/resubmission/resubmission.html:15
+msgid "Your personal comment:"
+msgstr "Ihr Kommentar:"
+
 #: templates/email/sharing/shared_access_given.html:4
 #: templates/email/sharing/shared_access_given_team.html:4
 msgid "Access shared"
 msgstr "Zugriff freigegeben"
 
-#: templates/email/sharing/shared_access_given.html:10
+#: templates/email/sharing/shared_access_given.html:11
 msgid "the following dataset has just been shared with you"
 msgstr "der folgende Datensatz wurde soeben für Sie freigegeben "
 
-#: templates/email/sharing/shared_access_given.html:16
-#: templates/email/sharing/shared_access_given_team.html:16
+#: templates/email/sharing/shared_access_given.html:17
+#: templates/email/sharing/shared_access_given_team.html:17
 msgid "This means you can now edit this dataset."
 msgstr "Das bedeutet, dass Sie diesen Datensatz nun auch bearbeiten können."
 
-#: templates/email/sharing/shared_access_given.html:17
-#: templates/email/sharing/shared_access_given_team.html:17
+#: templates/email/sharing/shared_access_given.html:18
+#: templates/email/sharing/shared_access_given_team.html:18
 msgid ""
 "The shared dataset appears now by default on your overview for this dataset "
 "type."
@@ -2408,8 +2460,8 @@ msgstr ""
 "Der freigegebene Datensatz ist nun standardmäßig in Ihrer Übersicht für den "
 "Datensatztyp im KSP gelistet."
 
-#: templates/email/sharing/shared_access_given.html:27
-#: templates/email/sharing/shared_access_given_team.html:27
+#: templates/email/sharing/shared_access_given.html:28
+#: templates/email/sharing/shared_access_given_team.html:28
 msgid ""
 "Please note: Shared access on an intervention means you automatically have "
 "editing access to related compensations."
@@ -2418,7 +2470,7 @@ msgstr ""
 "Sie automatisch auch Zugriff auf die zugehörigen Kompensationen erhalten "
 "haben."
 
-#: templates/email/sharing/shared_access_given_team.html:10
+#: templates/email/sharing/shared_access_given_team.html:11
 msgid "the following dataset has just been shared with your team"
 msgstr "der folgende Datensatz wurde soeben für Ihr Team freigegeben "
 
@@ -2427,20 +2479,20 @@ msgstr "der folgende Datensatz wurde soeben für Ihr Team freigegeben "
 msgid "Shared access removed"
 msgstr "Freigegebener Zugriff entzogen"
 
-#: templates/email/sharing/shared_access_removed.html:10
+#: templates/email/sharing/shared_access_removed.html:11
 msgid ""
 "your shared access, including editing, has been revoked for the dataset "
 msgstr ""
 "Ihnen wurde soeben der bearbeitende Zugriff auf den folgenden Datensatz "
 "entzogen: "
 
-#: templates/email/sharing/shared_access_removed.html:16
-#: templates/email/sharing/shared_access_removed_team.html:16
+#: templates/email/sharing/shared_access_removed.html:17
+#: templates/email/sharing/shared_access_removed_team.html:17
 msgid "However, you are still able to view the dataset content."
 msgstr "Sie können den Datensatz aber immer noch im KSP einsehen."
 
-#: templates/email/sharing/shared_access_removed.html:17
-#: templates/email/sharing/shared_access_removed_team.html:17
+#: templates/email/sharing/shared_access_removed.html:18
+#: templates/email/sharing/shared_access_removed_team.html:18
 msgid ""
 "Please use the provided search filter on the dataset`s overview pages to "
 "find them."
@@ -2448,7 +2500,7 @@ msgstr ""
 "Nutzen Sie hierzu einfach die entsprechenden Suchfilter auf den "
 "Übersichtsseiten"
 
-#: templates/email/sharing/shared_access_removed_team.html:10
+#: templates/email/sharing/shared_access_removed_team.html:11
 msgid ""
 "your teams shared access, including editing, has been revoked for the "
 "dataset "