From 49fd8b38a1decc709389c74944029330ff82de99 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 20 Jan 2022 17:05:04 +0100
Subject: [PATCH] Layout and text improvements
---
calculators/locale/bg/LC_MESSAGES/django.po | 61 +++++++-------
calculators/locale/bs/LC_MESSAGES/django.po | 61 +++++++-------
calculators/locale/de/LC_MESSAGES/django.po | 60 ++++++-------
calculators/locale/fi/LC_MESSAGES/django.po | 61 +++++++-------
calculators/locale/nb/LC_MESSAGES/django.mo | Bin 2567 -> 2429 bytes
calculators/locale/nb/LC_MESSAGES/django.po | 79 +++++++++---------
calculators/locale/vi/LC_MESSAGES/django.po | 61 +++++++-------
.../locale/zh_CN/LC_MESSAGES/django.mo | Bin 2476 -> 2377 bytes
.../locale/zh_CN/LC_MESSAGES/django.po | 11 ++-
.../locale/zh_Hans/LC_MESSAGES/django.mo | Bin 2478 -> 2379 bytes
.../locale/zh_Hans/LC_MESSAGES/django.po | 63 +++++++-------
calculators/static/calculators/js/eil.js | 4 +-
calculators/templates/calculators/eil.html | 9 +-
13 files changed, 219 insertions(+), 251 deletions(-)
diff --git a/calculators/locale/bg/LC_MESSAGES/django.po b/calculators/locale/bg/LC_MESSAGES/django.po
index 63b5ee28..6cf0b3de 100644
--- a/calculators/locale/bg/LC_MESSAGES/django.po
+++ b/calculators/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+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"
@@ -17,114 +17,109 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/bs/LC_MESSAGES/django.po b/calculators/locale/bs/LC_MESSAGES/django.po
index 807a4463..e6dbe56b 100644
--- a/calculators/locale/bs/LC_MESSAGES/django.po
+++ b/calculators/locale/bs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+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"
@@ -18,114 +18,109 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/de/LC_MESSAGES/django.po b/calculators/locale/de/LC_MESSAGES/django.po
index 8c3f7b89..6cf0b3de 100755
--- a/calculators/locale/de/LC_MESSAGES/django.po
+++ b/calculators/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+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"
@@ -18,114 +18,108 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/fi/LC_MESSAGES/django.po b/calculators/locale/fi/LC_MESSAGES/django.po
index 63b5ee28..6cf0b3de 100644
--- a/calculators/locale/fi/LC_MESSAGES/django.po
+++ b/calculators/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+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"
@@ -17,114 +17,109 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/nb/LC_MESSAGES/django.mo b/calculators/locale/nb/LC_MESSAGES/django.mo
index f8017712ceda8160b682b9b26e5f94f87b213eac..033c6aa767f47a2af48a1e014b5711cb4547b6fe 100755
GIT binary patch
delta 751
zcmZn{`72a^Pl#nI0|NttGy?;J3<Cqh7X}6fRR#uzGmIcn28IMC1_nL`28Ki?1_o{h
z28IGA1_mAm28J3Y1_l8J28K?k{46NFl8J$VgMooz2NMH>H3I{~K_&(UIR*xXzf24a
ziXc0f85lGf7#QrB!TfrL3}yxfT?Ph*E@lP>HIPPT1_o9J28R305R0BNGcZUoFfe>#
zW?&FzU|`^7VPIfqU|>*WVPN27U|`T>fmmqF!oc9dz`$U`!oXn1z`)SR!oZNgz`$^T
z1!BG;D+2>R0|SFUD+7Z9BLhP`E6DtM28ISU5QBlCmknaUEH(xPAqED9b!-d_Tp%An
z=`(B$3~USx4A<Eh7|a<M81At#FeorEFo>};FsL&yFqpGLJP^+g5pQE>U@&1|U|0^7
zzrzl3I12|Pw0Srf7$oZ%7#K7-7#PGD7#N&5AQnb)Kpd39!N9=Fz`#(*!NB0hz`#(?
z!N8!wz`$^hgMlHCfq~&W2Lpo=0|SF6CnPFzI2jnAu?C4dXtYYec@T9VF34k`P)=lF
zU|<jhi7+rQFfl+}D9FITz{~&%UQm#Mf*%z0B2aapPyjg$6iOh6gM>k81e89+86eRC
zN+Td~$<4V;F^rqvG4EoWyq#6c#mK<ONY}tn*T_J@(9FuzP}{)Jz<|pqvA9Gxq$n}3
zI47|rzsO2~%O^1}y)-dBRW~FxF&Bw%rI432Ie@KAJVMt!H7~UYqC6l!H6^n|!AQ?|
f@>Mn$?xNJhoYcIG)Di~Y%|`6}jGNOq7BT_=;tN%%
delta 865
zcmew>)GktgPl#nI0|Ntt3>5!iU|>*XU|_hz2ohyrC}3h>;A3E5C}d(_;AUW8XkcPs
z;9+23=wV`D5MW?nm<g3%1*LZ~F)(m2Ffg28VqmalU|_h&#K0iOz`(%E%)p??z`&rx
z%)p?@z`)=K;ny=%Ff%adGB7aAVrF1a0cm7rU{GUVV0g>Sz`)ADz#zf`u~3SIfkBFa
zfkB;xfkBvofx(G|fq|WYfgy~Afq|2Ofgz3sVsQow1A`05!7L06b_@&*+gKPF5*Qd5
zzOq2<31eko;Adc9XklewaAK@yV3@)RvEVuzgnq&XvEU;c1A`C)0|P5N1A`y~1A_#V
z)?#O1U}IoluwiFlFlS(3aAs#<P+(wSsAgwiP-kFZn8Ob7z!9kUYjy?(69xtb9u9~H
z9XTNC(l{6x*y|Y>82UIE7^E2(7^ZPBFi0{mFl^#rU=U+qU^v6Uz`(`8!0?y@;;?rd
z3=F&s3=F?H7#RE*7#KJ?85lGe7#Jcr85jZ?7#JEk85oop7#J>dLZapyCj$dC7Qt}|
ziegX*g6sebFfcIGgM0?!fGh$9Hwy#Aa*!Ak10;w+p}-8XkO5*a$gv^}3=E<mMGTP8
z067d4E#goyP?`ay7YPPPw1CnKND37649<x;$)!1oC8;T!vzh!DCwDVTaTes4q~?`m
zCgyD3&b)__Kfux1+tJ-sA<Q)>*wf!{axtq`ex$2okgl)4u8X6BhrgAtr*@RTpDUM7
zVsVLXNKs;5aZX}Mevy@eTd0qZf}f+WtAdTIucN1rgQJT}kZW+T9hXmHUV3R_da7<n
zYGSUHf{&x0dnm{f8y_EsoJ_s^qI85BD}~7qS=%PpvpGwa<z(ii7bg~_Cg!B(Wu%rc
fI6_2nH=kwWXPj)#E+UW!5dnLm803lD?28xyW%GLM
diff --git a/calculators/locale/nb/LC_MESSAGES/django.po b/calculators/locale/nb/LC_MESSAGES/django.po
index bc61b5a0..6f24cb45 100755
--- a/calculators/locale/nb/LC_MESSAGES/django.po
+++ b/calculators/locale/nb/LC_MESSAGES/django.po
@@ -3,48 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+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"
-"Language: \n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\n"
+"PO-Revision-Date: 2022-01-20 16:51+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.3\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "Økonomisk skadeterskelkalkulator (EIL)"
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr "Inndata"
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
"Kostnaden ved innkjøp og bruk av bekjempelsesmetode (f.eks. plantevernmiddel)"
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr "Bekjempelseskostnad"
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr "Markedsverdi i lokal valuta pr vektenhet"
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr "Markedsverdi i lokal valuta"
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
@@ -52,83 +51,81 @@ msgstr ""
"Maksimalt avlingsnivå per arealenhet. Det er vanlig å bruke historiske "
"verdier."
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr "Avlingspotensial"
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr "Andelen av skadegjører som drepes"
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr "Bekjempelseseffekt"
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr "Skade uttrykt som avlingstap per skadegjørermåleenhet"
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr "Skade per skadegjørermåleenhet"
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr "Innstillinger"
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr "Valuta"
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
-msgstr "Avlingsmasseenhet"
+msgstr "Masseenhet"
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
-msgstr "Avlingsarealenhet"
+msgstr "Arealenhet"
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr "Skadegjørermåleenhet"
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr "Antall bladlus per plante"
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr "Kjør modell"
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr "Resultater"
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr "Beregnet EIL"
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr "EIL som funksjon av avlingstap per skadegjørerenhet"
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr "EIL som funksjon av bekjempelseskostnad"
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr "EIL som funksjon av markedsverdi"
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr "EIL som funksjon av avlingspotensial"
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr "EIL som funksjon av bekjempelseseffekt"
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr "Kalkulatorer"
+
+#~ msgid "EIL as a function of yield potential"
+#~ msgstr "EIL som funksjon av avlingspotensial"
diff --git a/calculators/locale/vi/LC_MESSAGES/django.po b/calculators/locale/vi/LC_MESSAGES/django.po
index ec54a057..ca9653d2 100644
--- a/calculators/locale/vi/LC_MESSAGES/django.po
+++ b/calculators/locale/vi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+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"
@@ -17,114 +17,109 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/zh_CN/LC_MESSAGES/django.mo b/calculators/locale/zh_CN/LC_MESSAGES/django.mo
index f961147f33cccb8f91b462ed833cc11a1cf0e20b..e504835297b19e9418ee17f53e6f39639368be8e 100755
GIT binary patch
delta 629
zcmZ1@d{U_Xo)F7a1_lNOX$A%c83qQ1FANL}stgPaXBa`E3=9cO3=Dh>3=D}(3=G^1
z3=9QK3=BLB3=B0)3=9Gc3=Ex6`B_kUB@+V!2Ll7c4kiW$YX$~}gG>wzatsU%f0-B<
z6hU?{Gcaf}FfiCLgZcFg8O#g}x(o~qUCay&Y9Niw3=FIc3=H>~Ar?JlW?+zFU|{&f
z%)lVbz`(%E!oa}Jz`&r$!oa}Ez`&r%0<qATg@M6^fq}t>g@M72fq|isg@GY~fq~%w
z3&eayRt5%s1_lOyRtAP&3=9nMtRPR<GcZK4K@2KmgIL%ArF+>J7=#!Y7-m7~wQLLw
zY#;;K7#J)W7#NPTL43x@4zWOioq@rCfq}sf%CBc<V6bOkU|7ozvWS7<EjvU%CkMnH
z0S*QR>3RkR23Zb>MV1^81wK#(!BBnz2LppX0|P@k2Lpo{0|Uc!4hDu01_p+691IK+
z3=9m)oDc(TI2jnAu?C4dXtaXVzyv^124ZtDKtef@g@J)V6ePmHz`(=+30gr01_ovZ
zNT`5<3>5sJpcjFv1BC)F1H{o{P%%&%0i_Rd21s;((g;XOa&s<I4CCf^%x)~3lQ_H>
E0ZuqA{r~^~
delta 690
zcmX>pv_`o8o)F7a1_lNO87Th4z`&r&z`$^a5hTjMP{72%z{kMAP{_o<z|FwG(7?pN
zz{9}6(8I*QAi%)DFcT`j3QF%}VqoB4U|=}G#K2(9z`$^kiGe|mfq{XSnSnu(fq_AX
znSnu*fq}sf!mnqjU}j*@Wnf^K#mvB<0@BFLz@Wy!!0?utfq|8QfkA`?VxbfZ1A`O;
z1A{sX1A{OF1A`L_0|Pq)149@K0|O@m14A4O#NrGV1_l?9gIO3D>=+mrwy`iUBrq^A
zd}V>y6UNHGz|X+I(89{V@Qb0Ifnf?O1A{aJ14BO>#Gut|5DT|L=|gM`3_=VH4CkTr
zBQ^#GHjsgA3=EbG3=DtRAU-r>hgcBG&cI;6z`)Q9<!@nUV6bOkV0Z-OD{(;V3*ca2
zV5?_fV94QsSXc~|XyAZYI0vMFfq`K?RDK(jf0%=TL7#zv;S>i0gBb$@!!Hg7h7bk@
z218B;1_=fRhBi)!dGk3L7@)BTj!RG!gF;Xe%!3g1f)JX4ivbecEDQ_`Vo)(A21pQt
ze9z1P2^~<JgF;J$fq_93styzyybO?N5r>L_(hMlQfE)x$51=#yk^%)igL7g|a%oOt
zNovaGY$iX($=%FSoCWzMsd*)ti8-6MGkdU1PGD!_d9rKy%l7_fd*?jun!Wikdm1AE
DK1WCq
diff --git a/calculators/locale/zh_CN/LC_MESSAGES/django.po b/calculators/locale/zh_CN/LC_MESSAGES/django.po
index 99436f0a..b35a5363 100755
--- a/calculators/locale/zh_CN/LC_MESSAGES/django.po
+++ b/calculators/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\n"
"PO-Revision-Date: 2016-06-01 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: templates/calculators/eil.html:25 templates/calculators/eil.html.py:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "经济损害水平计算器"
@@ -116,13 +116,12 @@ msgid "EIL as a function of market value"
msgstr "经济损害水平作为市场价值的参数"
#: templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr "经济损害水平作为产量潜力的参数"
-
-#: templates/calculators/eil.html:119
msgid "EIL as a function of insecticide efficacy"
msgstr "经济损害水平作为杀虫剂效力的参数"
#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr "计算器"
+
+#~ msgid "EIL as a function of yield potential"
+#~ msgstr "经济损害水平作为产量潜力的参数"
diff --git a/calculators/locale/zh_Hans/LC_MESSAGES/django.mo b/calculators/locale/zh_Hans/LC_MESSAGES/django.mo
index 4f1faa2afe372a4a2928caa859aa55d005accc59..eaa43689e82ee2e87c2f89f5ea388b5888f8b9a7 100644
GIT binary patch
delta 629
zcmZ1{d|Igfo)F7a1_lNOX$A%c83qQ1FANL}stgPaXBa`E3=9cO3=Dh>3=D}(3=G^1
z3=9QK3=BLB3=B0)3=9Gc3=Ex6`B_kUB@+V!2Ll7c4kiW$YX$~}gG>wzatsU%f0-B<
z6hU?{Gcaf}FfiCLgZcFg8O#g}x(o~qUCay&Y9Niw3=FIc3=H>~Ar?JlW?+zFU|{&f
z%)lVbz`(%E!oa}Jz`&r$!oa}Ez`&r%0<qATg@M6^fq}t>g@M72fq|isg@GY~fq~%w
z3&eayRt5%s1_lOyRtAPY3=9nMtRPR<Gcd%kK@6&3gIL%ErTf_!7=#!Y80J9f^=u3b
zYzzzxhu9bxEEyOWPO?FK#>@_}K#84!!GM8*Appv6WM^QoXJBAh&knMPf#E$nL_aqN
z#2z6I1_tSR1_lOs4v0n891sP5Pz9k-ei8=*gFXWTLna3UgBb$@!%Pkah7bk@h6@}F
z3=*K|;)EDz$H~9|jWtNzL8BF<1||TCG7y`K0TRlIEDQ_`q973l1_mYuNYDy0FfcGP
zKtcr+WT4;&1-%GV9Vird86b`pgNlLD2q=AsGeDvPltw^OlACjxVi-5SWA<R#oWkM7
F2mp}?E<6AL
delta 705
zcmX>tv`)DGo)F7a1_lNO87Th4z`&r&z`$^a5hTjMP{72%z{kMAP{_o<z|FwG(7?pN
zz{9}6(8I*QAi%)DFcT`j3QF%}VqoB4U|=}G#K2(9z`$^kiGe|mfq{XSnSnu(fq_AX
znSnu*fq}sf!mnqjU}j*@Wnf^K#mvB<0@BFLz@Wy!!0?utfq|8QfkA`?VxbfZ1A`O;
z1A{sX1A{OF1A`L_0|Pq)149@K0|O@m14A4O#NrGV1_l?9gIO3D>=+mrwy`iUBrq^A
zd}V>y6UNHGz|X+I(89{V@Q0zEfnf?O1A{aJ1H(i%h(T-FAQo<i(nr`B7=%DRfznUd
z7#P?X7#O~@F)&y%FfjaMgZR*b9b!Q^I|G9O0|P@Vl)sIgfx(`Ef#C_1ufhSbFNlMI
zfvui_fgz6rVqqy%qKN}y;XIH61_p+WQ28BD{!tDF27LwwhBF)t3}y@r41YKn7(y5r
z7>qd?7$g`N7&<s1<}Ku8V1ULVI4(g^3<^O>Fb_i13qoiHE(S<&voJ6)h(X1e7$89m
z@;x&HBy>P=4hk(11_lOEs5($+@G?N6MI0&yN;9DJ0&);2J%G{-ND37649<x;$)!1o
zC8;T!vzh!DCwDVTaTes4q~?`mCgyD3&g{h^{bcW)Cp&gM*|q#-d;hb&bDnn1em<+^
UX@AqRsT(FMvI}o!<nUqy0BxpG=l}o!
diff --git a/calculators/locale/zh_Hans/LC_MESSAGES/django.po b/calculators/locale/zh_Hans/LC_MESSAGES/django.po
index ceae23e9..ae6a5f0f 100755
--- a/calculators/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/calculators/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\n"
"PO-Revision-Date: 2016-06-01 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,114 +17,111 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "经济损害水平计算器"
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr "输入"
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr "购买和采取控制措施的成本(杀虫剂)"
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr "控制成本"
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr "按当地货币计算的单位产量作物的市场价"
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr "市场价值"
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr "每生产单位的最大产量。在这个表达式中，通常使用历史数据。"
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr "产量潜力"
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr "被杀死害虫的比例"
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr "控制效力"
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr "损失表现为每害虫测定单位的作物产量损失"
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr "每害虫测定单位的损害"
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr "设置"
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr "货币"
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr "作物重量单位"
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr "作物面积单位"
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr "害虫测定单位"
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr "每株植物的蚜虫数量"
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr "运行模型"
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr "结果"
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr "计算的经济损害水平"
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr "经济损害水平作为每害虫单位的产量损失的参数"
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr "经济损害水平作为控制成本的参数"
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr "经济损害水平作为市场价值的参数"
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr "经济损害水平作为产量潜力的参数"
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr "经济损害水平作为杀虫剂效力的参数"
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr "计算器"
+
+#~ msgid "EIL as a function of yield potential"
+#~ msgstr "经济损害水平作为产量潜力的参数"
diff --git a/calculators/static/calculators/js/eil.js b/calculators/static/calculators/js/eil.js
index e8395adc..e2a830bf 100755
--- a/calculators/static/calculators/js/eil.js
+++ b/calculators/static/calculators/js/eil.js
@@ -41,7 +41,7 @@ function calculateEIL(C,V,K,D)
function renderResult(formId)
{
var theForm = document.getElementById(formId);
- var resultParameters = " = " + theForm["C"].value + " / (" + theForm["V"].value + " * (" + theForm["K"].value + "/100) * " + theForm["D"].value + ")";
+ var resultParameters = ": " + theForm["C"].value + " / (" + theForm["V"].value + " * (" + theForm["K"].value + "/100) * " + theForm["D"].value + ")";
var resultValue = calculateEIL(
theForm["C"].value,
theForm["V"].value,
@@ -50,7 +50,7 @@ function renderResult(formId)
);
document.getElementById("resultParameters").innerHTML = resultParameters;
- document.getElementById("resultValue").innerHTML = resultValue;
+ document.getElementById("resultValue").innerHTML = resultValue.toFixed(3);
}
diff --git a/calculators/templates/calculators/eil.html b/calculators/templates/calculators/eil.html
index 37af3578..be0a5010 100755
--- a/calculators/templates/calculators/eil.html
+++ b/calculators/templates/calculators/eil.html
@@ -3,7 +3,7 @@
{% comment %}
#
-# Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
+# Copyright (c) 2022 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
@@ -89,13 +89,14 @@
</div>
<div class="col-md-9">
<h1>{% trans "Results" %}</h1>
- <div id="result" style="font-weight: bold;">
- {% trans "Calculated EIL" %} = C / (V * D * (K/100))<span id="resultParameters"></span>: <span id="resultValue"></span>
+ <div id="result" style="font-weight: bold; background-color: white; padding: 15px;">
+ <h2>{% trans "Calculated EIL" %}</h2>
+ <p><strong>C / (V * D * (K/100))</strong><span id="resultParameters"></span> = <span id="resultValue" style="text-decoration: underline; font-weight: bold;"></span>
</div>
<div id="EILvC" style="width:50%; height:300px;float: right;"></div>
<div id="EILvV" style="width:50%; height:300px; "></div>
- <div id="EILvK" style="width:50%; height:300px;"></div>
+ <div id="EILvK" style="width:100%; height:300px;"></div>
<div id="EILvD" style="width:100%; height:300px;"></div>
</div>
--
GitLab