From d7b2e933ec0aa57860cfd61aa24ae7f6ca60b82b Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 16 Nov 2022 16:11:42 +0100 Subject: [PATCH] #232 Payment document linkage * adds error message on intervention view if a payment has been added but no document has been uploaded yet * adds same check to quality checker, meaning no intervention can be recorded which has a payment but no document * adds trigger for sending data to egon on uploading a document in case of an already existing payment * adds translations --- intervention/forms/modals/document.py | 21 ++- .../detail/includes/documents.html | 5 + intervention/utils/quality.py | 13 ++ intervention/views/intervention.py | 3 + locale/de/LC_MESSAGES/django.mo | Bin 45578 -> 45638 bytes locale/de/LC_MESSAGES/django.po | 173 +++++++++--------- 6 files changed, 129 insertions(+), 86 deletions(-) diff --git a/intervention/forms/modals/document.py b/intervention/forms/modals/document.py index 212f3f0..17dfa56 100644 --- a/intervention/forms/modals/document.py +++ b/intervention/forms/modals/document.py @@ -10,4 +10,23 @@ from konova.forms.modals import NewDocumentModalForm class NewInterventionDocumentModalForm(NewDocumentModalForm): - document_model = InterventionDocument \ No newline at end of file + document_model = InterventionDocument + + def save(self, *args, **kwargs): + """ Extension of regular NewDocumentModalForm + + Checks whether payments exist on the intervention and sends the data to EGON + + Args: + *args (): + **kwargs (): + + Returns: + + """ + doc = super().save(*args, **kwargs) + + if self.instance.payments.exists(): + self.instance.send_data_to_egon() + + return doc diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html index 9fccc4b..5037ff8 100644 --- a/intervention/templates/intervention/detail/includes/documents.html +++ b/intervention/templates/intervention/detail/includes/documents.html @@ -20,6 +20,11 @@ + {% if has_payment_without_document %} +
+ {% trans 'You entered a payment. Please upload the legal document which defines the payment`s amount.' %} +
+ {% endif %}
diff --git a/intervention/utils/quality.py b/intervention/utils/quality.py index 6135b40..bae886e 100644 --- a/intervention/utils/quality.py +++ b/intervention/utils/quality.py @@ -21,8 +21,21 @@ class InterventionQualityChecker(AbstractQualityChecker): self._check_legal_data() self._check_compensations() self._check_geometry() + self._check_payment_documents() self.valid = len(self.messages) == 0 + def _check_payment_documents(self): + """ Checks existence of documents in case of payments + + There should be at least one legal document which defines the payment's total amount. + + Returns: + + """ + has_payment_without_document = self.obj.payments.exists() and not self.obj.get_documents()[1].exists() + if has_payment_without_document: + self._add_missing_attr_name(_("Documents")) + def _check_responsible_data(self): """ Checks data quality of related Responsibility diff --git a/intervention/views/intervention.py b/intervention/views/intervention.py index 524c2c7..1bca896 100644 --- a/intervention/views/intervention.py +++ b/intervention/views/intervention.py @@ -157,6 +157,8 @@ def detail_view(request: HttpRequest, id: str): if last_checked: last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(last_checked.get_timestamp_str_formatted(), last_checked.user) + has_payment_without_document = intervention.payments.exists() and not intervention.get_documents()[1].exists() + context = { "obj": intervention, "last_checked": last_checked, @@ -168,6 +170,7 @@ def detail_view(request: HttpRequest, id: str): "is_zb_member": in_group(_user, ZB_GROUP), "is_ets_member": in_group(_user, ETS_GROUP), "LANIS_LINK": intervention.get_LANIS_link(), + "has_payment_without_document": has_payment_without_document, TAB_TITLE_IDENTIFIER: f"{intervention.identifier} - {intervention.title}", } diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 9f50fc49e0435c72b367e57dc12b50691d6027e7..422ac7b6279015669d8aad1186b2f3fbf9e85d4e 100644 GIT binary patch delta 12653 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 VttsH;uHTk9WqI(n%yn(D{SQ2BASM6+ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 9e41e2b..96bfa07 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -43,7 +43,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-10-11 16:39+0200\n" +"POT-Creation-Date: 2022-11-16 13:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -204,7 +204,7 @@ msgstr "Geprüft" #: compensation/templates/compensation/detail/compensation/view.html:93 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 #: compensation/templates/compensation/detail/eco_account/view.html:45 -#: ema/tables.py:44 ema/templates/ema/detail/view.html:35 +#: ema/tables.py:41 ema/templates/ema/detail/view.html:35 #: intervention/tables.py:44 #: intervention/templates/intervention/detail/view.html:87 #: user/models/user_action.py:22 @@ -357,7 +357,7 @@ msgid "Show only unrecorded" msgstr "Nur unverzeichnete anzeigen" #: compensation/forms/compensation.py:30 compensation/tables/compensation.py:23 -#: compensation/tables/eco_account.py:23 ema/tables.py:29 +#: compensation/tables/eco_account.py:23 ema/tables.py:26 #: intervention/forms/intervention.py:29 intervention/tables.py:23 #: intervention/templates/intervention/detail/includes/compensations.html:30 msgid "Identifier" @@ -376,12 +376,12 @@ msgstr "Automatisch generiert" #: compensation/templates/compensation/detail/eco_account/view.html:32 #: compensation/templates/compensation/report/compensation/report.html:12 #: compensation/templates/compensation/report/eco_account/report.html:12 -#: ema/tables.py:34 ema/templates/ema/detail/includes/documents.html:28 +#: ema/tables.py:31 ema/templates/ema/detail/includes/documents.html:28 #: ema/templates/ema/detail/view.html:31 #: ema/templates/ema/report/report.html:12 #: intervention/forms/intervention.py:41 intervention/tables.py:28 #: intervention/templates/intervention/detail/includes/compensations.html:33 -#: intervention/templates/intervention/detail/includes/documents.html:28 +#: intervention/templates/intervention/detail/includes/documents.html:33 #: intervention/templates/intervention/detail/view.html:31 #: intervention/templates/intervention/report/report.html:12 #: konova/forms/modals/document_form.py:24 @@ -411,7 +411,7 @@ msgstr "Kompensation XY; Flur ABC" #: ema/templates/ema/detail/includes/documents.html:34 #: intervention/forms/intervention.py:199 #: intervention/forms/modals/revocation.py:45 -#: intervention/templates/intervention/detail/includes/documents.html:34 +#: intervention/templates/intervention/detail/includes/documents.html:39 #: intervention/templates/intervention/detail/includes/payments.html:34 #: intervention/templates/intervention/detail/includes/revocation.html:38 #: konova/forms/modals/document_form.py:59 @@ -473,13 +473,15 @@ msgstr "Neues Ökokonto" msgid "Eco-Account XY; Location ABC" msgstr "Ökokonto XY; Flur ABC" -#: compensation/forms/eco_account.py:141 +#: compensation/forms/eco_account.py:143 msgid "Edit Eco-Account" msgstr "Ökokonto bearbeiten" -#: compensation/forms/eco_account.py:224 +#: compensation/forms/eco_account.py:228 msgid "The account can not be removed, since there are still deductions." -msgstr "Das Ökokonto kann nicht entfernt werden, da hierzu noch Abbuchungen vorliegen." +msgstr "" +"Das Ökokonto kann nicht entfernt werden, da hierzu noch Abbuchungen " +"vorliegen." #: compensation/forms/mixins.py:37 #: compensation/templates/compensation/detail/eco_account/view.html:63 @@ -754,54 +756,42 @@ msgstr "" "wollen. Kontaktieren Sie die für die Abbuchungen verantwortlichen Nutzer!" #: compensation/tables/compensation.py:33 compensation/tables/eco_account.py:33 -#: ema/tables.py:39 intervention/tables.py:33 +#: ema/tables.py:36 intervention/tables.py:33 #: konova/filters/mixins/geo_reference.py:42 msgid "Parcel gmrkng" msgstr "Gemarkung" #: compensation/tables/compensation.py:50 compensation/tables/eco_account.py:54 -#: ema/tables.py:50 intervention/tables.py:50 +#: ema/tables.py:47 intervention/tables.py:50 msgid "Editable" msgstr "Freigegeben" #: compensation/tables/compensation.py:56 compensation/tables/eco_account.py:60 -#: ema/tables.py:56 intervention/tables.py:56 +#: ema/tables.py:53 intervention/tables.py:56 msgid "Last edit" msgstr "Zuletzt bearbeitet" #: compensation/tables/compensation.py:87 compensation/tables/eco_account.py:92 -#: ema/tables.py:89 intervention/tables.py:87 +#: ema/tables.py:86 intervention/tables.py:87 msgid "Open {}" msgstr "Öffne {}" -#: compensation/tables/compensation.py:163 +#: compensation/tables/compensation.py:141 #: compensation/templates/compensation/detail/compensation/view.html:96 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:58 #: compensation/templates/compensation/detail/eco_account/view.html:48 -#: ema/tables.py:130 ema/templates/ema/detail/view.html:38 -#: intervention/tables.py:161 +#: ema/tables.py:105 ema/templates/ema/detail/view.html:38 +#: intervention/tables.py:139 #: intervention/templates/intervention/detail/view.html:90 msgid "Not recorded yet" msgstr "Noch nicht verzeichnet" -#: compensation/tables/compensation.py:166 -#: compensation/tables/eco_account.py:153 ema/tables.py:133 -#: intervention/tables.py:164 +#: compensation/tables/compensation.py:144 +#: compensation/tables/eco_account.py:131 ema/tables.py:108 +#: intervention/tables.py:142 msgid "Recorded on {} by {}" msgstr "Am {} von {} verzeichnet worden" -#: compensation/tables/compensation.py:186 -#: compensation/tables/eco_account.py:175 ema/tables.py:154 -#: intervention/tables.py:185 -msgid "Full access granted" -msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden" - -#: compensation/tables/compensation.py:186 -#: compensation/tables/eco_account.py:175 ema/tables.py:154 -#: intervention/tables.py:185 -msgid "Access not granted" -msgstr "Nicht freigegeben - Datensatz nur lesbar" - #: compensation/tables/eco_account.py:38 #: compensation/templates/compensation/detail/eco_account/view.html:36 #: konova/templates/konova/widgets/progressbar.html:3 @@ -812,7 +802,7 @@ msgstr "Verfügbar" msgid "Eco Accounts" msgstr "Ökokonten" -#: compensation/tables/eco_account.py:150 +#: compensation/tables/eco_account.py:128 msgid "Not recorded yet. Can not be used for deductions, yet." msgstr "" "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden." @@ -861,7 +851,7 @@ msgstr "Menge" #: ema/templates/ema/detail/includes/states-before.html:40 #: intervention/templates/intervention/detail/includes/compensations.html:38 #: intervention/templates/intervention/detail/includes/deductions.html:39 -#: intervention/templates/intervention/detail/includes/documents.html:39 +#: intervention/templates/intervention/detail/includes/documents.html:44 #: intervention/templates/intervention/detail/includes/payments.html:39 #: intervention/templates/intervention/detail/includes/revocation.html:43 #: templates/log.html:10 user/templates/user/team/index.html:33 @@ -995,7 +985,7 @@ msgstr "Neues Dokument hinzufügen" #: compensation/templates/compensation/detail/compensation/includes/documents.html:31 #: 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 +#: intervention/templates/intervention/detail/includes/documents.html:36 #: konova/forms/modals/document_form.py:34 msgid "Created on" msgstr "Erstellt" @@ -1003,7 +993,7 @@ msgstr "Erstellt" #: compensation/templates/compensation/detail/compensation/includes/documents.html:63 #: 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 +#: intervention/templates/intervention/detail/includes/documents.html:70 #: konova/forms/modals/document_form.py:139 msgid "Edit document" msgstr "Dokument bearbeiten" @@ -1011,7 +1001,7 @@ msgstr "Dokument bearbeiten" #: compensation/templates/compensation/detail/compensation/includes/documents.html:66 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:64 #: ema/templates/ema/detail/includes/documents.html:64 -#: intervention/templates/intervention/detail/includes/documents.html:68 +#: intervention/templates/intervention/detail/includes/documents.html:73 msgid "Remove document" msgstr "Dokument löschen" @@ -1287,8 +1277,8 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation/compensation.py:185 -#: compensation/views/eco_account/eco_account.py:159 ema/views/ema.py:211 -#: intervention/views/intervention.py:225 +#: compensation/views/eco_account/eco_account.py:159 ema/views/ema.py:210 +#: intervention/views/intervention.py:228 msgid "Edit {}" msgstr "Bearbeite {}" @@ -1314,7 +1304,7 @@ msgstr "Ökokonto {} bearbeitet" msgid "Eco-account removed" msgstr "Ökokonto entfernt" -#: ema/forms.py:42 ema/views/ema.py:94 +#: ema/forms.py:42 ema/views/ema.py:93 msgid "New EMA" msgstr "Neue EMA hinzufügen" @@ -1322,11 +1312,11 @@ msgstr "Neue EMA hinzufügen" msgid "Edit EMA" msgstr "Bearbeite EMA" -#: ema/tables.py:65 templates/navbars/navbar.html:43 +#: ema/tables.py:62 templates/navbars/navbar.html:43 msgid "Payment funded compensations" msgstr "Ersatzzahlungsmaßnahmen (EMA)" -#: ema/tables.py:66 +#: ema/tables.py:63 msgid "EMA explanation" msgstr "" "EMA sind Kompensationen, die durch Ersatzzahlungen finanziert wurden. " @@ -1334,7 +1324,7 @@ msgstr "" "Maßnahmen aus Ersatzzahlungen, die nach 2015 rechtskräftig wurden, werden " "durch die Stiftung Natur und Umwelt verwaltet." -#: ema/tables.py:89 templates/navbars/navbar.html:43 +#: ema/tables.py:86 templates/navbars/navbar.html:43 msgid "EMA" msgstr "" @@ -1342,19 +1332,19 @@ msgstr "" msgid "Payment funded compensation" msgstr "Ersatzzahlungsmaßnahme" -#: ema/views/ema.py:51 +#: ema/views/ema.py:50 msgid "EMAs - Overview" msgstr "EMAs - Übersicht" -#: ema/views/ema.py:84 +#: ema/views/ema.py:83 msgid "EMA {} added" msgstr "EMA {} hinzugefügt" -#: ema/views/ema.py:201 +#: ema/views/ema.py:200 msgid "EMA {} edited" msgstr "EMA {} bearbeitet" -#: ema/views/ema.py:235 +#: ema/views/ema.py:234 msgid "EMA removed" msgstr "EMA entfernt" @@ -1564,6 +1554,13 @@ msgstr "Ökokonto gelöscht! Abbuchung ungültig!" msgid "Eco-account not recorded! Deduction invalid!" msgstr "Ökokonto nicht verzeichnet! Abbuchung ungültig!" +#: intervention/templates/intervention/detail/includes/documents.html:25 +msgid "" +"You entered a payment. Please upload the legal document which defines the " +"payment`s amount." +msgstr "" +"Sie haben Ersatzzahlungen angegeben. Laden Sie bitte den Zahlungsbescheid als Dokument hoch." + #: intervention/templates/intervention/detail/includes/payments.html:8 #: intervention/templates/intervention/report/report.html:69 msgid "Payments" @@ -1648,11 +1645,11 @@ msgstr "Eingriffe - Übersicht" msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views/intervention.py:213 +#: intervention/views/intervention.py:216 msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views/intervention.py:250 +#: intervention/views/intervention.py:253 msgid "{} removed" msgstr "{} entfernt" @@ -1686,7 +1683,7 @@ msgid "Search for file number" msgstr "Nach Aktenzeichen suchen" #: konova/filters/mixins/geo_reference.py:29 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:18 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:19 msgid "District" msgstr "Kreis" @@ -1699,7 +1696,7 @@ msgid "Search for parcel gmrkng" msgstr "Nach Gemarkung suchen" #: konova/filters/mixins/geo_reference.py:55 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:39 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:40 msgid "Parcel" msgstr "Flur" @@ -1708,7 +1705,7 @@ msgid "Search for parcel" msgstr "Nach Flur suchen" #: konova/filters/mixins/geo_reference.py:68 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:40 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:41 msgid "Parcel counter" msgstr "Flurstückzähler" @@ -1717,7 +1714,7 @@ msgid "Search for parcel counter" msgstr "Nach Flurstückzähler suchen" #: konova/filters/mixins/geo_reference.py:82 -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:41 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:42 msgid "Parcel number" msgstr "Flurstücknenner" @@ -1873,37 +1870,37 @@ msgstr "" msgid "English" msgstr "" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:5 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:6 msgid "Parcels can not be calculated, since no geometry is given." msgstr "" "Flurstücke können nicht berechnet werden, da keine Geometrie eingegeben " "wurde." -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:11 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:12 msgid "Parcels found" msgstr "Flurstücke" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:16 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:17 msgid "Municipal" msgstr "Gemeinde" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:17 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:18 msgid "Municipal key" msgstr "Gemeindeschlüssel" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:19 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:20 msgid "District key" msgstr "Kreisschlüssel" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:37 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:38 msgid "Parcel group" msgstr "Gemarkung" -#: konova/templates/konova/includes/parcels/parcel_table_frame.html:38 +#: konova/templates/konova/includes/parcels/parcel_table_frame.html:39 msgid "Parcel group key" msgstr "Gemarkungsschlüssel" -#: konova/templates/konova/includes/parcels/parcels.html:7 +#: konova/templates/konova/includes/parcels/parcels.html:9 msgid "Spatial reference" msgstr "Raumreferenz" @@ -1951,39 +1948,39 @@ msgstr "In Zwischenablage kopiert" msgid "Search" msgstr "Suchen" -#: konova/utils/mailer.py:68 konova/utils/mailer.py:137 +#: konova/utils/mailer.py:68 konova/utils/mailer.py:143 msgid "{} - Shared access removed" msgstr "{} - Zugriff entzogen" -#: konova/utils/mailer.py:91 konova/utils/mailer.py:114 +#: konova/utils/mailer.py:91 konova/utils/mailer.py:117 msgid "{} - Shared access given" msgstr "{} - Zugriff freigegeben" -#: konova/utils/mailer.py:160 konova/utils/mailer.py:302 +#: konova/utils/mailer.py:169 konova/utils/mailer.py:317 msgid "{} - Shared data unrecorded" msgstr "{} - Freigegebene Daten entzeichnet" -#: konova/utils/mailer.py:183 konova/utils/mailer.py:279 +#: konova/utils/mailer.py:195 konova/utils/mailer.py:294 msgid "{} - Shared data recorded" msgstr "{} - Freigegebene Daten verzeichnet" -#: konova/utils/mailer.py:206 konova/utils/mailer.py:348 +#: konova/utils/mailer.py:221 konova/utils/mailer.py:363 msgid "{} - Shared data checked" msgstr "{} - Freigegebene Daten geprüft" -#: konova/utils/mailer.py:233 konova/utils/mailer.py:376 +#: konova/utils/mailer.py:248 konova/utils/mailer.py:391 msgid "{} - Deduction changed" msgstr "{} - Abbuchung geändert" -#: konova/utils/mailer.py:256 konova/utils/mailer.py:325 +#: konova/utils/mailer.py:271 konova/utils/mailer.py:340 msgid "{} - Shared data deleted" msgstr "{} - Freigegebene Daten gelöscht" -#: konova/utils/mailer.py:397 templates/email/api/verify_token.html:4 +#: konova/utils/mailer.py:412 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 +#: konova/utils/mailer.py:435 msgid "Resubmission - {}" msgstr "Wiedervorlage - {}" @@ -2225,7 +2222,15 @@ msgstr "{} wurde erfolgreich vom Nutzer {} geprüft! {}" msgid "missing" msgstr "fehlend" -#: konova/views/home.py:78 templates/navbars/navbar.html:16 +#: konova/utils/tables.py:218 +msgid "Full access granted" +msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden" + +#: konova/utils/tables.py:218 +msgid "Access not granted" +msgstr "Nicht freigegeben - Datensatz nur lesbar" + +#: konova/views/home.py:79 templates/navbars/navbar.html:16 msgid "Home" msgstr "Home" @@ -2670,7 +2675,7 @@ msgstr "" msgid "User" msgstr "Nutzer" -#: templates/map/geom_form.html:9 +#: templates/map/geom_form.html:11 templates/table/gmrkng_col.html:4 msgid "No geometry added, yet." msgstr "Keine Geometrie vorhanden" @@ -2725,7 +2730,7 @@ msgstr "" "vorbei. \n" " " -#: templates/table/gmrkng_col.html:6 +#: templates/table/gmrkng_col.html:12 msgid "" "If the geometry is not empty, the parcels are currently recalculated. Please " "refresh this page in a few moments." @@ -2897,35 +2902,27 @@ msgstr "" " " #: user/templates/user/index.html:42 -msgid "Change default configuration for your KSP map" -msgstr "Karteneinstellungen ändern" - -#: user/templates/user/index.html:45 -msgid "Map settings" -msgstr "Karte" - -#: user/templates/user/index.html:50 msgid "Change notification configurations" msgstr "Benachrichtigungseinstellungen ändern" -#: user/templates/user/index.html:53 +#: user/templates/user/index.html:45 msgid "Notification settings" msgstr "Benachrichtigungen" -#: user/templates/user/index.html:58 +#: user/templates/user/index.html:50 msgid "Manage teams" msgstr "" -#: user/templates/user/index.html:61 user/templates/user/team/index.html:19 +#: user/templates/user/index.html:53 user/templates/user/team/index.html:19 #: user/views.py:171 msgid "Teams" msgstr "" -#: user/templates/user/index.html:66 +#: user/templates/user/index.html:58 msgid "See or edit your API token" msgstr "API token einsehen oder neu generieren" -#: user/templates/user/index.html:69 +#: user/templates/user/index.html:61 msgid "API" msgstr "" @@ -4508,6 +4505,12 @@ msgstr "" msgid "Unable to connect to qpid with SASL mechanism %s" msgstr "" +#~ msgid "Change default configuration for your KSP map" +#~ msgstr "Karteneinstellungen ändern" + +#~ msgid "Map settings" +#~ msgstr "Karte" + #~ msgid "There are errors on this intervention:" #~ msgstr "Es liegen Fehler in diesem Eingriff vor:"