From 227cb60f42bdf3b058cdb5a63e669aedb33ef3b5 Mon Sep 17 00:00:00 2001 From: mipel Date: Thu, 19 Aug 2021 14:04:44 +0200 Subject: [PATCH] Detail view adjustments * adds EMA and eco account conservation office data to detail views * adds line break in header of detail views * adds/updates translations --- .../detail/compensation/view.html | 2 +- .../compensation/detail/eco_account/view.html | 2 +- ema/templates/ema/detail/view.html | 2 +- .../templates/intervention/detail/view.html | 2 +- locale/de/LC_MESSAGES/django.mo | Bin 18748 -> 18840 bytes locale/de/LC_MESSAGES/django.po | 198 ++++++++++++------ 6 files changed, 139 insertions(+), 67 deletions(-) diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html index 63d00aa2..6c9c8953 100644 --- a/compensation/templates/compensation/detail/compensation/view.html +++ b/compensation/templates/compensation/detail/compensation/view.html @@ -9,7 +9,7 @@
-

{% trans 'Compensation' %} {{obj.identifier}}

+

{% trans 'Compensation' %}
{{obj.identifier}}

{% include 'compensation/detail/compensation/includes/controls.html' %} diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html index cc3137ca..bd0fd48c 100644 --- a/compensation/templates/compensation/detail/eco_account/view.html +++ b/compensation/templates/compensation/detail/eco_account/view.html @@ -15,7 +15,7 @@
-

{% trans 'Eco-account' %} {{obj.identifier}}

+

{% trans 'Eco-account' %}
{{obj.identifier}}

{% include 'compensation/detail/eco_account/includes/controls.html' %} diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html index f9316720..561e2d63 100644 --- a/ema/templates/ema/detail/view.html +++ b/ema/templates/ema/detail/view.html @@ -9,7 +9,7 @@
-

{{obj.identifier}}

+

{% trans 'Payment funded compensation' %}
{{obj.identifier}}

{% include 'ema/detail/includes/controls.html' %} diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html index 55057547..4bfc27aa 100644 --- a/intervention/templates/intervention/detail/view.html +++ b/intervention/templates/intervention/detail/view.html @@ -15,7 +15,7 @@
-

{% trans 'Intervention' %} {{intervention.identifier}}

+

{% trans 'Intervention' %}
{{intervention.identifier}}

{% include 'intervention/detail/includes/controls.html' %} diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 6841eca927d6953bc99f76d2e42a536ffe34059c..7b0786e80104dbb0d6248b8b5f562e8f9f1e614e 100644 GIT binary patch delta 6106 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 ALI3~& delta 6073 zcmYk=33yId0><%^J+cr!Cs%cCx&atjWZ|d98A9rH_9>A*jwQVoQdem>& z_G-0^2{p!Lq9_D$BGK9jt5JUyLof@u&`h%D=c69H2KAx>TmRI06a#55Lv`qTjK>P} zz}mH)4o6{C-f!Y4=s`)S8&k0g_Ck%cKlc+`#AsE*D=P4RNn^_x*M zSBzTw;~0;n*a)AX2HGgf>3B*M^REYWqCq3*hw8{k)QjH1G@NAXMaZn01E`UgqZeL5 z-FF@Jf(lf}e3<737>;^gD(b#;YY!KN-Zb>VB+N%mbs6#ua|L72gFkfM#G*Q!h8k&K zxY?_lL;gL*)tc;|eIwHIni2cup%8rAV^)QrqS&Eyi)QWc=qz8LkMqw&nYPMo1Z z54eHajE_)j6ht>Yu{L^RG^!)<);6e_=!sgY0jQ-KgL?67Y=`SnFT99d@HT4ZS|>37 zUKCOjoSt<-b)XMw6J?3sDcsLv^eGE2kQLsh6OZ;7imDUbfyr&CCyg9y0s^2X8WREl!fZ>SnEXe zrS6()FPMRTG%QA4xCS+{eAI=zP#r7AmUtM|vB#)Q6~{)=4^(HQ$z-DLn~&NfOHm!# zh`Me!@-?~4w-j`PUt{NoBpKbQ4@HeA3$>PSU;yTzALgP)z6$xW%tq8t^HKE2tElVl zqGsR`rnzyhi7}g~_k7-%&-DG@qrkG5olTt)pGWol7V5@dPH!Y zmu@s_WV2Bn-elYN+4@;~{wL(O%mg>*KHhJVC}`LALcM4>>bsqW+JwtcyS@Omx%MNI zW=^A)%AVYS$*D-{; zJ3B_3Fbws35QTbS9L8V^R7W#V1DlLmn#JgW+fW@Zv=${X|G_kr*b7ThJ*z;C^jCXf zP_pyDTBxZ_M0Kbm>VdCWhoDA0(mK|*Pel!A2G+nl)O9;u6f`A!QB!#Yz1XFn=$5x;=V*%=GIBw6E;tSL-qdMS{dz{W{cj-=OX*Lv6-#%)l$y9b5A@U6+H}wC`hm+~d?;<{|~H zeLx#$DkD(4HWouM8EaxURF5-JBYxAGZC!-g6B{ucx1!d(1hqs*P|rPq>hR@CS^pm> zXo_yx6A!QT4K+dhirf$Fr>qP)m@9nz_xkeYdS2LcQk{*20Sz zqVNAc1@)|ITW8ZnV>REGjnoEeKm zElFL}j5I)P>Q<-$^+@6SSI>vgpa+aX)u*ARb`D14a@5E^Mt;W4MbrZVJ2>ZKP+w06 z`~rueI-Hd1d=2fay^&i@7V7ifkm_^|FdSoOk3n6Zit2C% zYEKMCZPrZG{ZmjgwGh?eO{kgu1T`}UT@-ZTF|3W3P*e5Lw)=H-UKE2`nikj`JEEp~ z95U->I_kcIsF9yQE!|nvNUx!m>Iv4vs7}uFTxk^4!wl4oBTzjZgL*&?Mqnw{1; zFx)y3J*dw{yM+LO8Pv!gAYZhJO?Ni!5L8EJqFy`~HDe#3H}5xFD5&QECZCewo2ELy6o6ELA`13%G z>>lw_gFSwWnjsw_T+_`dnpx;h_LAMC3g=$M*+fSX(LY`~rV-8R4x;7O(xqwr`S<7l zhdU4WJGEiNm%M4uXkTn4E66F^));?B{zSUlw%*v+mJe99)@&^^f~45CQe3FArr{NG zffSNIl0>qAJbPqPIZo=5FUh}&j!ont`GkB;MiOnZEo37}Cv(Y7QlIEpNxrKr@qRXI z<$o|#!M~A5B!}qG_q(dH#Ak&kZCRWpkI9E5lv&d;-NB5;A8c8_hVyOtx>fXd$}aO8 z3N6S9r=jwnTopef`$#;|v5kC0ekI<#@UQ5DxA5uFltMdOsmi%ylq1M~(#*DZ#$IF( z`APHt1%Seh>oKqpt9urc?j zvW5&Ht|$C?dW@n_Lk}Y#zyvamG$K*Nhv=vE4mnM9d``}gh9rx$C*j<`9Fxc*GJ~`x z-x3|M&@qitHrO\n" "Language-Team: LANGUAGE \n" @@ -82,6 +82,8 @@ msgstr "Biotoptyp wählen" #: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36 +#: ema/templates/ema/detail/includes/states-after.html:36 +#: ema/templates/ema/detail/includes/states-before.html:36 #: intervention/forms.py:474 msgid "Surface" msgstr "Fläche" @@ -102,7 +104,7 @@ msgstr "Geben Sie die Daten des neuen Zustandes ein" msgid "Added state" msgstr "Zustand hinzugefügt" -#: compensation/forms.py:140 konova/forms.py:157 +#: compensation/forms.py:140 konova/forms.py:158 msgid "Object removed" msgstr "Objekt entfernt" @@ -117,6 +119,7 @@ msgstr "Fristart wählen" #: compensation/forms.py:203 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31 +#: ema/templates/ema/detail/includes/deadlines.html:31 #: intervention/forms.py:321 msgid "Date" msgstr "Datum" @@ -132,15 +135,18 @@ msgstr "Datum wählen" #: compensation/templates/compensation/detail/eco_account/includes/actions.html:34 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:34 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:31 +#: ema/templates/ema/detail/includes/actions.html:34 +#: ema/templates/ema/detail/includes/deadlines.html:34 +#: ema/templates/ema/detail/includes/documents.html:31 #: intervention/forms.py:345 #: intervention/templates/intervention/detail/includes/documents.html:31 #: intervention/templates/intervention/detail/includes/revocation.html:35 -#: konova/forms.py:302 +#: konova/forms.py:303 msgid "Comment" msgstr "Kommentar" #: compensation/forms.py:220 compensation/forms.py:290 -#: intervention/forms.py:347 konova/forms.py:304 +#: intervention/forms.py:347 konova/forms.py:305 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -223,10 +229,12 @@ msgstr "Kennung" #: compensation/templates/compensation/detail/compensation/view.html:24 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28 #: compensation/templates/compensation/detail/eco_account/view.html:31 -#: ema/tables.py:33 intervention/forms.py:37 intervention/tables.py:28 +#: ema/tables.py:33 ema/templates/ema/detail/includes/documents.html:28 +#: ema/templates/ema/detail/view.html:24 intervention/forms.py:37 +#: intervention/tables.py:28 #: intervention/templates/intervention/detail/includes/compensations.html:33 #: intervention/templates/intervention/detail/includes/documents.html:28 -#: intervention/templates/intervention/detail/view.html:31 konova/forms.py:273 +#: intervention/templates/intervention/detail/view.html:31 konova/forms.py:274 msgid "Title" msgstr "Bezeichnung" @@ -240,7 +248,8 @@ msgstr "Geprüft" #: compensation/tables.py:40 compensation/tables.py:179 #: compensation/templates/compensation/detail/compensation/view.html:50 #: compensation/templates/compensation/detail/eco_account/view.html:43 -#: ema/tables.py:38 intervention/tables.py:39 +#: ema/tables.py:38 ema/templates/ema/detail/view.html:28 +#: intervention/tables.py:39 #: intervention/templates/intervention/detail/view.html:77 user/models.py:49 msgid "Recorded" msgstr "Verzeichnet" @@ -282,7 +291,8 @@ msgstr "Am {} von {} geprüft worden" #: compensation/tables.py:128 #: compensation/templates/compensation/detail/compensation/view.html:53 #: compensation/templates/compensation/detail/eco_account/view.html:46 -#: ema/tables.py:101 intervention/tables.py:135 +#: ema/tables.py:101 ema/templates/ema/detail/view.html:31 +#: intervention/tables.py:135 #: intervention/templates/intervention/detail/view.html:80 msgid "Not recorded yet" msgstr "Noch nicht verzeichnet" @@ -326,22 +336,26 @@ msgstr "" #: compensation/templates/compensation/detail/compensation/includes/actions.html:8 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:8 +#: ema/templates/ema/detail/includes/actions.html:8 msgctxt "Compensation" msgid "Actions" msgstr "Maßnahmen" #: compensation/templates/compensation/detail/compensation/includes/actions.html:14 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:14 +#: ema/templates/ema/detail/includes/actions.html:14 msgid "Add new action" msgstr "Neue Maßnahme hinzufügen" #: compensation/templates/compensation/detail/compensation/includes/actions.html:28 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:28 +#: ema/templates/ema/detail/includes/actions.html:28 msgid "Action type" msgstr "Maßnahmentyp" #: compensation/templates/compensation/detail/compensation/includes/actions.html:31 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:31 +#: ema/templates/ema/detail/includes/actions.html:31 msgctxt "Compensation" msgid "Amount" msgstr "Menge" @@ -357,6 +371,11 @@ msgstr "Menge" #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:39 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:39 #: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:37 +#: ema/templates/ema/detail/includes/actions.html:37 +#: ema/templates/ema/detail/includes/deadlines.html:37 +#: ema/templates/ema/detail/includes/documents.html:34 +#: ema/templates/ema/detail/includes/states-after.html:39 +#: ema/templates/ema/detail/includes/states-before.html:39 #: intervention/templates/intervention/detail/includes/compensations.html:36 #: intervention/templates/intervention/detail/includes/documents.html:34 #: intervention/templates/intervention/detail/includes/payments.html:37 @@ -368,35 +387,41 @@ msgstr "Aktionen" #: compensation/templates/compensation/detail/compensation/includes/actions.html:51 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:51 +#: ema/templates/ema/detail/includes/actions.html:51 msgid "Remove action" msgstr "Maßnahme entfernen" #: compensation/templates/compensation/detail/compensation/includes/controls.html:5 #: compensation/templates/compensation/detail/eco_account/includes/controls.html:5 +#: ema/templates/ema/detail/includes/controls.html:5 #: intervention/templates/intervention/detail/includes/controls.html:5 msgid "Open in LANIS" msgstr "In LANIS öffnen" #: compensation/templates/compensation/detail/compensation/includes/controls.html:10 #: compensation/templates/compensation/detail/eco_account/includes/controls.html:10 +#: ema/templates/ema/detail/includes/controls.html:10 #: intervention/templates/intervention/detail/includes/controls.html:10 msgid "Public report" msgstr "Öffentlicher Bericht" #: compensation/templates/compensation/detail/compensation/includes/controls.html:17 #: compensation/templates/compensation/detail/eco_account/includes/controls.html:28 +#: ema/templates/ema/detail/includes/controls.html:28 #: intervention/templates/intervention/detail/includes/controls.html:36 msgid "Edit" msgstr "Bearbeiten" #: compensation/templates/compensation/detail/compensation/includes/controls.html:21 #: compensation/templates/compensation/detail/eco_account/includes/controls.html:32 +#: ema/templates/ema/detail/includes/controls.html:32 #: 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:35 +#: ema/templates/ema/detail/includes/controls.html:35 #: intervention/templates/intervention/detail/includes/controls.html:43 #: venv/lib/python3.7/site-packages/django/forms/formsets.py:391 msgid "Delete" @@ -404,56 +429,65 @@ msgstr "Löschen" #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:8 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:8 +#: ema/templates/ema/detail/includes/deadlines.html:8 msgid "Deadlines" msgstr "Termine und Fristen" #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:14 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:14 +#: ema/templates/ema/detail/includes/deadlines.html:14 msgid "Add new deadline" msgstr "Frist/Termin hinzufügen" #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28 -#: intervention/forms.py:42 +#: ema/templates/ema/detail/includes/deadlines.html:28 intervention/forms.py:42 msgid "Type" msgstr "Typ" #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:51 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:51 +#: ema/templates/ema/detail/includes/deadlines.html:51 msgid "Remove deadline" msgstr "Frist löschen" #: compensation/templates/compensation/detail/compensation/includes/documents.html:8 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:8 +#: ema/templates/ema/detail/includes/documents.html:8 #: intervention/templates/intervention/detail/includes/documents.html:8 msgid "Documents" msgstr "Dokumente" #: compensation/templates/compensation/detail/compensation/includes/documents.html:14 #: 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:315 +#: konova/forms.py:316 msgid "Add new document" msgstr "Neues Dokument hinzufügen" #: compensation/templates/compensation/detail/compensation/includes/documents.html:49 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:49 +#: ema/templates/ema/detail/includes/documents.html:49 #: intervention/templates/intervention/detail/includes/documents.html:49 msgid "Remove document" msgstr "Dokument löschen" #: compensation/templates/compensation/detail/compensation/includes/states-after.html:8 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:8 +#: ema/templates/ema/detail/includes/states-after.html:8 msgid "States after" msgstr "Zielzustand" #: compensation/templates/compensation/detail/compensation/includes/states-after.html:14 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:14 +#: ema/templates/ema/detail/includes/states-after.html:14 msgid "Add new state after" msgstr "Neuen Zielzustand hinzufügen" #: compensation/templates/compensation/detail/compensation/includes/states-after.html:26 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:26 +#: ema/templates/ema/detail/includes/states-after.html:26 msgid "Missing surfaces according to states before: " msgstr "Fehlende Flächenmengen laut Ausgangszustand: " @@ -461,6 +495,8 @@ msgstr "Fehlende Flächenmengen laut Ausgangszustand: " #: compensation/templates/compensation/detail/compensation/includes/states-before.html:33 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:33 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:33 +#: ema/templates/ema/detail/includes/states-after.html:33 +#: ema/templates/ema/detail/includes/states-before.html:33 msgid "Biotope type" msgstr "Biotoptyp" @@ -468,21 +504,26 @@ msgstr "Biotoptyp" #: compensation/templates/compensation/detail/compensation/includes/states-before.html:52 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:52 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:52 +#: ema/templates/ema/detail/includes/states-after.html:52 +#: ema/templates/ema/detail/includes/states-before.html:52 msgid "Remove state" msgstr "Zustand entfernen" #: compensation/templates/compensation/detail/compensation/includes/states-before.html:8 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:8 +#: ema/templates/ema/detail/includes/states-before.html:8 msgid "States before" msgstr "Ausgangszustand" #: compensation/templates/compensation/detail/compensation/includes/states-before.html:14 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:14 +#: ema/templates/ema/detail/includes/states-before.html:14 msgid "Add new state before" msgstr "Neuen Ausgangszustand hinzufügen" #: compensation/templates/compensation/detail/compensation/includes/states-before.html:26 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:26 +#: ema/templates/ema/detail/includes/states-before.html:26 msgid "Missing surfaces according to states after: " msgstr "Fehlende Flächenmengen laut Zielzustand: " @@ -498,6 +539,7 @@ msgstr "Geprüft am " #: compensation/templates/compensation/detail/compensation/view.html:43 #: compensation/templates/compensation/detail/compensation/view.html:57 #: compensation/templates/compensation/detail/eco_account/view.html:50 +#: ema/templates/ema/detail/view.html:35 #: intervention/templates/intervention/detail/view.html:70 #: intervention/templates/intervention/detail/view.html:84 msgid "by" @@ -505,29 +547,33 @@ msgstr "von" #: compensation/templates/compensation/detail/compensation/view.html:57 #: compensation/templates/compensation/detail/eco_account/view.html:50 +#: ema/templates/ema/detail/view.html:35 #: intervention/templates/intervention/detail/view.html:84 msgid "Recorded on " msgstr "Verzeichnet am" #: compensation/templates/compensation/detail/compensation/view.html:64 -#: compensation/templates/compensation/detail/eco_account/view.html:57 +#: compensation/templates/compensation/detail/eco_account/view.html:69 +#: ema/templates/ema/detail/view.html:54 #: intervention/templates/intervention/detail/view.html:103 msgid "Last modified" msgstr "Zuletzt bearbeitet" #: compensation/templates/compensation/detail/compensation/view.html:72 -#: compensation/templates/compensation/detail/eco_account/view.html:65 -#: intervention/forms.py:255 +#: compensation/templates/compensation/detail/eco_account/view.html:77 +#: ema/templates/ema/detail/view.html:69 intervention/forms.py:255 #: intervention/templates/intervention/detail/view.html:111 msgid "Shared with" msgstr "Freigegeben für" #: compensation/templates/compensation/detail/eco_account/includes/controls.html:17 +#: ema/templates/ema/detail/includes/controls.html:17 #: intervention/templates/intervention/detail/includes/controls.html:25 msgid "Unrecord" msgstr "Entzeichnen" #: compensation/templates/compensation/detail/eco_account/includes/controls.html:21 +#: ema/templates/ema/detail/includes/controls.html:21 #: intervention/templates/intervention/detail/includes/controls.html:29 msgid "Record" msgstr "Verzeichnen" @@ -567,8 +613,41 @@ msgstr "Ökokonto nicht verzeichnet! Abbuchung ungültig!" msgid "Remove Withdraw" msgstr "Abbuchung entfernen" +#: compensation/templates/compensation/detail/eco_account/view.html:57 +#: ema/templates/ema/detail/view.html:42 +#: intervention/templates/intervention/detail/view.html:51 +msgid "Conservation office" +msgstr "Naturschutzbehörde" + +#: compensation/templates/compensation/detail/eco_account/view.html:60 +#: compensation/templates/compensation/detail/eco_account/view.html:64 +#: ema/templates/ema/detail/view.html:45 ema/templates/ema/detail/view.html:49 +#: intervention/templates/intervention/detail/view.html:30 +#: intervention/templates/intervention/detail/view.html:34 +#: intervention/templates/intervention/detail/view.html:38 +#: intervention/templates/intervention/detail/view.html:46 +#: intervention/templates/intervention/detail/view.html:54 +#: intervention/templates/intervention/detail/view.html:58 +#: intervention/templates/intervention/detail/view.html:90 +#: intervention/templates/intervention/detail/view.html:94 +msgid "Missing" +msgstr "Fehlt" + +#: compensation/templates/compensation/detail/eco_account/view.html:61 +#: ema/templates/ema/detail/view.html:46 +#: intervention/templates/intervention/detail/view.html:55 +msgid "Conversation office file number" +msgstr "Aktenzeichen Naturschutzbehörde" + +#: compensation/templates/compensation/detail/eco_account/view.html:65 +#: ema/templates/ema/detail/view.html:50 intervention/forms.py:54 +#: intervention/templates/intervention/detail/view.html:59 +msgid "Intervention handler" +msgstr "Eingriffsverursacher" + #: compensation/views/compensation_views.py:122 -#: compensation/views/eco_account_views.py:184 intervention/views.py:336 +#: compensation/views/eco_account_views.py:184 ema/views.py:127 +#: intervention/views.py:336 msgid "Log" msgstr "Log" @@ -577,22 +656,23 @@ msgid "Compensation removed" msgstr "Kompensation entfernt" #: compensation/views/compensation_views.py:162 -#: compensation/views/eco_account_views.py:283 intervention/views.py:93 +#: compensation/views/eco_account_views.py:283 ema/views.py:248 +#: intervention/views.py:93 msgid "Document added" msgstr "Dokument hinzugefügt" #: compensation/views/compensation_views.py:181 -#: compensation/views/eco_account_views.py:227 +#: compensation/views/eco_account_views.py:227 ema/views.py:192 msgid "State added" msgstr "Zustand hinzugefügt" #: compensation/views/compensation_views.py:200 -#: compensation/views/eco_account_views.py:246 +#: compensation/views/eco_account_views.py:246 ema/views.py:211 msgid "Action added" msgstr "Maßnahme hinzugefügt" #: compensation/views/compensation_views.py:219 -#: compensation/views/eco_account_views.py:265 +#: compensation/views/eco_account_views.py:265 ema/views.py:230 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" @@ -624,11 +704,11 @@ msgstr "{} verzeichnet" msgid "Withdraw added" msgstr "Abbuchung hinzugefügt" -#: compensation/views/payment_views.py:40 +#: compensation/views/payment_views.py:36 msgid "Payment added" msgstr "Zahlung hinzugefügt" -#: compensation/views/payment_views.py:60 +#: compensation/views/payment_views.py:56 msgid "Payment removed" msgstr "Zahlung gelöscht" @@ -648,6 +728,22 @@ msgstr "" msgid "EMA" msgstr "" +#: ema/templates/ema/detail/view.html:12 +msgid "Payment funded compensation" +msgstr "Ersatzzahlungsmaßnahme" + +#: ema/views.py:153 +#, fuzzy +#| msgid "{} removed" +msgid "EMA removed" +msgstr "{} entfernt" + +#: ema/views.py:173 +#, fuzzy +#| msgid "{} recorded" +msgid "EMA recorded" +msgstr "{} verzeichnet" + #: intervention/filters.py:25 msgid "Show unshared" msgstr "Nicht freigegebene anzeigen" @@ -681,11 +777,6 @@ msgstr "Gesetz" msgid "Based on which law" msgstr "Basiert auf welchem Recht" -#: intervention/forms.py:54 -#: intervention/templates/intervention/detail/view.html:59 -msgid "Intervention handler" -msgstr "Eingriffsverursacher" - #: intervention/forms.py:57 msgid "Who performs the intervention" msgstr "Wer führt den Eingriff durch" @@ -760,7 +851,7 @@ msgstr "Datum des Widerspruchs" msgid "Document" msgstr "Dokument" -#: intervention/forms.py:335 konova/forms.py:292 +#: intervention/forms.py:335 konova/forms.py:293 msgid "Must be smaller than 15 Mb" msgstr "Muss kleiner als 15 Mb sein" @@ -782,7 +873,7 @@ msgstr "Kompensationen und Zahlungen geprüft" msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms.py:411 konova/forms.py:363 +#: intervention/forms.py:411 konova/forms.py:364 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -906,17 +997,6 @@ msgstr "Widerspruch entfernen" msgid "Account Identifier" msgstr "Ökokonto Kennung" -#: intervention/templates/intervention/detail/view.html:30 -#: intervention/templates/intervention/detail/view.html:34 -#: intervention/templates/intervention/detail/view.html:38 -#: intervention/templates/intervention/detail/view.html:46 -#: intervention/templates/intervention/detail/view.html:54 -#: intervention/templates/intervention/detail/view.html:58 -#: intervention/templates/intervention/detail/view.html:90 -#: intervention/templates/intervention/detail/view.html:94 -msgid "Missing" -msgstr "Fehlt" - #: intervention/templates/intervention/detail/view.html:35 msgid "Process type" msgstr "Verfahrenstyp" @@ -929,14 +1009,6 @@ msgstr "Zulassungsbehörde" msgid "Registration office file number" msgstr "Aktenzeichen Zulassungsbehörde" -#: intervention/templates/intervention/detail/view.html:51 -msgid "Conservation office" -msgstr "Naturschutzbehörde" - -#: intervention/templates/intervention/detail/view.html:55 -msgid "Conversation office file number" -msgstr "Aktenzeichen Naturschutzbehörde" - #: intervention/templates/intervention/detail/view.html:91 msgid "Registration date" msgstr "Datum Zulassung bzw. Satzungsbeschluss" @@ -1032,60 +1104,60 @@ msgstr "" msgid "You need to be part of another user group." msgstr "Hierfür müssen Sie einer anderen Nutzergruppe angehören!" -#: konova/forms.py:67 +#: konova/forms.py:68 msgid "Not editable" msgstr "Nicht editierbar" -#: konova/forms.py:106 konova/forms.py:240 +#: konova/forms.py:107 konova/forms.py:241 msgid "Confirm" msgstr "Bestätige" -#: konova/forms.py:118 konova/forms.py:249 +#: konova/forms.py:119 konova/forms.py:250 msgid "Remove" msgstr "Löschen" -#: konova/forms.py:120 +#: konova/forms.py:121 msgid "You are about to remove {} {}" msgstr "Sie sind dabei {} {} zu löschen" -#: konova/forms.py:250 +#: konova/forms.py:251 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: konova/forms.py:278 +#: konova/forms.py:279 msgid "Created on" msgstr "Erstellt" -#: konova/forms.py:280 +#: konova/forms.py:281 msgid "When has this file been created? Important for photos." msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?" -#: konova/forms.py:290 +#: konova/forms.py:291 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231 msgid "File" msgstr "Datei" -#: konova/forms.py:340 +#: konova/forms.py:341 msgid "Added document" msgstr "Dokument hinzugefügt" -#: konova/forms.py:354 +#: konova/forms.py:355 msgid "Confirm record" msgstr "Verzeichnen bestätigen" -#: konova/forms.py:362 +#: konova/forms.py:363 msgid "Record data" msgstr "Daten verzeichnen" -#: konova/forms.py:367 +#: konova/forms.py:368 msgid "Confirm unrecord" msgstr "Entzeichnen bestätigen" -#: konova/forms.py:368 +#: konova/forms.py:369 msgid "Unrecord data" msgstr "Daten entzeichnen" -#: konova/forms.py:369 +#: konova/forms.py:370 msgid "I, {} {}, confirm that this data must be unrecorded." msgstr "" "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen."