From 33c28926d00689cc188813820226c5f125cb846b Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 31 Oct 2024 11:35:03 +0100
Subject: [PATCH] feat: Translate all phrases
---
VIPSWeb/locale/bg/LC_MESSAGES/django.po | 18 +-
VIPSWeb/locale/bs/LC_MESSAGES/django.po | 18 +-
VIPSWeb/locale/de/LC_MESSAGES/django.po | 18 +-
VIPSWeb/locale/fi/LC_MESSAGES/django.po | 18 +-
VIPSWeb/locale/nb/LC_MESSAGES/django.po | 18 +-
VIPSWeb/locale/vi/LC_MESSAGES/django.po | 18 +-
VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po | 18 +-
.../locale/bg/LC_MESSAGES/django.po | 151 +++++++---------
.../locale/bs/LC_MESSAGES/django.po | 151 +++++++---------
.../locale/de/LC_MESSAGES/django.po | 151 +++++++---------
.../locale/fi/LC_MESSAGES/django.po | 151 +++++++---------
.../locale/nb/LC_MESSAGES/django.mo | Bin 4549 -> 4245 bytes
.../locale/nb/LC_MESSAGES/django.po | 169 +++++++++---------
.../locale/vi/LC_MESSAGES/django.po | 151 +++++++---------
.../locale/zh_Hans/LC_MESSAGES/django.po | 160 ++++++++---------
.../locale/bg/LC_MESSAGES/django.po | 146 +++++++++------
.../locale/bs/LC_MESSAGES/django.po | 146 +++++++++------
.../locale/de/LC_MESSAGES/django.po | 146 +++++++++------
.../locale/fi/LC_MESSAGES/django.po | 146 +++++++++------
.../locale/nb/LC_MESSAGES/django.mo | Bin 1661 -> 2457 bytes
.../locale/nb/LC_MESSAGES/django.po | 159 ++++++++++------
.../locale/vi/LC_MESSAGES/django.po | 146 +++++++++------
.../locale/zh_Hans/LC_MESSAGES/django.po | 146 +++++++++------
cydiapomonella/static/js/cydiapomonella.js | 23 ++-
.../templates/cydiapomonella/index.html | 46 +++--
25 files changed, 1220 insertions(+), 1094 deletions(-)
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
index 2aeefa54..55c2ffd5 100755
--- a/VIPSWeb/locale/bg/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+0100\n"
"PO-Revision-Date: 2014-05-14 09:31+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,35 +30,35 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.5\n"
-#: VIPSWeb/local_settings.py:206
+#: VIPSWeb/local_settings.py:208
msgid "Risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:210
+#: VIPSWeb/local_settings.py:212
msgid "About risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:214
+#: VIPSWeb/local_settings.py:216
msgid "Naerstad Late Blight Model"
msgstr ""
-#: VIPSWeb/local_settings.py:218
+#: VIPSWeb/local_settings.py:220
msgid "Carrot rust fly temperature model"
msgstr ""
-#: VIPSWeb/local_settings.py:229
+#: VIPSWeb/local_settings.py:231
msgid "Cereals and oilseeds"
msgstr ""
-#: VIPSWeb/local_settings.py:240
+#: VIPSWeb/local_settings.py:242
msgid "Potato and vegetables"
msgstr ""
-#: VIPSWeb/local_settings.py:246
+#: VIPSWeb/local_settings.py:248
msgid "Fruits and berries"
msgstr ""
-#: VIPSWeb/local_settings.py:253
+#: VIPSWeb/local_settings.py:255
msgid "Other models and services"
msgstr ""
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
index 07410c4e..1a9bdae8 100755
--- a/VIPSWeb/locale/bs/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+0100\n"
"PO-Revision-Date: 2015-02-13 11:26+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -19,35 +19,35 @@ msgstr ""
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: VIPSWeb/local_settings.py:206
+#: VIPSWeb/local_settings.py:208
msgid "Risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:210
+#: VIPSWeb/local_settings.py:212
msgid "About risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:214
+#: VIPSWeb/local_settings.py:216
msgid "Naerstad Late Blight Model"
msgstr ""
-#: VIPSWeb/local_settings.py:218
+#: VIPSWeb/local_settings.py:220
msgid "Carrot rust fly temperature model"
msgstr ""
-#: VIPSWeb/local_settings.py:229
+#: VIPSWeb/local_settings.py:231
msgid "Cereals and oilseeds"
msgstr ""
-#: VIPSWeb/local_settings.py:240
+#: VIPSWeb/local_settings.py:242
msgid "Potato and vegetables"
msgstr ""
-#: VIPSWeb/local_settings.py:246
+#: VIPSWeb/local_settings.py:248
msgid "Fruits and berries"
msgstr ""
-#: VIPSWeb/local_settings.py:253
+#: VIPSWeb/local_settings.py:255
msgid "Other models and services"
msgstr ""
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.po b/VIPSWeb/locale/de/LC_MESSAGES/django.po
index f34bec25..276ef418 100755
--- a/VIPSWeb/locale/de/LC_MESSAGES/django.po
+++ b/VIPSWeb/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,35 +18,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: VIPSWeb/local_settings.py:206
+#: VIPSWeb/local_settings.py:208
msgid "Risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:210
+#: VIPSWeb/local_settings.py:212
msgid "About risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:214
+#: VIPSWeb/local_settings.py:216
msgid "Naerstad Late Blight Model"
msgstr ""
-#: VIPSWeb/local_settings.py:218
+#: VIPSWeb/local_settings.py:220
msgid "Carrot rust fly temperature model"
msgstr ""
-#: VIPSWeb/local_settings.py:229
+#: VIPSWeb/local_settings.py:231
msgid "Cereals and oilseeds"
msgstr ""
-#: VIPSWeb/local_settings.py:240
+#: VIPSWeb/local_settings.py:242
msgid "Potato and vegetables"
msgstr ""
-#: VIPSWeb/local_settings.py:246
+#: VIPSWeb/local_settings.py:248
msgid "Fruits and berries"
msgstr ""
-#: VIPSWeb/local_settings.py:253
+#: VIPSWeb/local_settings.py:255
msgid "Other models and services"
msgstr ""
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.po b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
index 203065e4..d07c4f4a 100755
--- a/VIPSWeb/locale/fi/LC_MESSAGES/django.po
+++ b/VIPSWeb/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,35 +18,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: VIPSWeb/local_settings.py:206
+#: VIPSWeb/local_settings.py:208
msgid "Risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:210
+#: VIPSWeb/local_settings.py:212
msgid "About risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:214
+#: VIPSWeb/local_settings.py:216
msgid "Naerstad Late Blight Model"
msgstr ""
-#: VIPSWeb/local_settings.py:218
+#: VIPSWeb/local_settings.py:220
msgid "Carrot rust fly temperature model"
msgstr ""
-#: VIPSWeb/local_settings.py:229
+#: VIPSWeb/local_settings.py:231
msgid "Cereals and oilseeds"
msgstr ""
-#: VIPSWeb/local_settings.py:240
+#: VIPSWeb/local_settings.py:242
msgid "Potato and vegetables"
msgstr ""
-#: VIPSWeb/local_settings.py:246
+#: VIPSWeb/local_settings.py:248
msgid "Fruits and berries"
msgstr ""
-#: VIPSWeb/local_settings.py:253
+#: VIPSWeb/local_settings.py:255
msgid "Other models and services"
msgstr ""
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
index ca9f0170..1af216c3 100755
--- a/VIPSWeb/locale/nb/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPSWeb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+0100\n"
"PO-Revision-Date: 2024-03-22 09:25+0100\n"
"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: \n"
@@ -30,35 +30,35 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.4.2\n"
-#: VIPSWeb/local_settings.py:206
+#: VIPSWeb/local_settings.py:208
msgid "Risk maps"
msgstr "Risikokart"
-#: VIPSWeb/local_settings.py:210
+#: VIPSWeb/local_settings.py:212
msgid "About risk maps"
msgstr "Om risikokart"
-#: VIPSWeb/local_settings.py:214
+#: VIPSWeb/local_settings.py:216
msgid "Naerstad Late Blight Model"
msgstr "Nærstads modell"
-#: VIPSWeb/local_settings.py:218
+#: VIPSWeb/local_settings.py:220
msgid "Carrot rust fly temperature model"
msgstr "Gulrotflue svermetidspunktmodell"
-#: VIPSWeb/local_settings.py:229
+#: VIPSWeb/local_settings.py:231
msgid "Cereals and oilseeds"
msgstr "Korn og oljevekster"
-#: VIPSWeb/local_settings.py:240
+#: VIPSWeb/local_settings.py:242
msgid "Potato and vegetables"
msgstr "Poteter og grønnsaker"
-#: VIPSWeb/local_settings.py:246
+#: VIPSWeb/local_settings.py:248
msgid "Fruits and berries"
msgstr "Frukt og bær"
-#: VIPSWeb/local_settings.py:253
+#: VIPSWeb/local_settings.py:255
msgid "Other models and services"
msgstr "Andre modeller og tjenester"
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.po b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
index ce2b66db..8d2555a1 100755
--- a/VIPSWeb/locale/vi/LC_MESSAGES/django.po
+++ b/VIPSWeb/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,35 +18,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: VIPSWeb/local_settings.py:206
+#: VIPSWeb/local_settings.py:208
msgid "Risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:210
+#: VIPSWeb/local_settings.py:212
msgid "About risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:214
+#: VIPSWeb/local_settings.py:216
msgid "Naerstad Late Blight Model"
msgstr ""
-#: VIPSWeb/local_settings.py:218
+#: VIPSWeb/local_settings.py:220
msgid "Carrot rust fly temperature model"
msgstr ""
-#: VIPSWeb/local_settings.py:229
+#: VIPSWeb/local_settings.py:231
msgid "Cereals and oilseeds"
msgstr ""
-#: VIPSWeb/local_settings.py:240
+#: VIPSWeb/local_settings.py:242
msgid "Potato and vegetables"
msgstr ""
-#: VIPSWeb/local_settings.py:246
+#: VIPSWeb/local_settings.py:248
msgid "Fruits and berries"
msgstr ""
-#: VIPSWeb/local_settings.py:253
+#: VIPSWeb/local_settings.py:255
msgid "Other models and services"
msgstr ""
diff --git a/VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po b/VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po
index ab5ded95..f34e9b6a 100644
--- a/VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/VIPSWeb/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+0100\n"
"PO-Revision-Date: 2019-06-24 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,35 +17,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
-#: VIPSWeb/local_settings.py:206
+#: VIPSWeb/local_settings.py:208
msgid "Risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:210
+#: VIPSWeb/local_settings.py:212
msgid "About risk maps"
msgstr ""
-#: VIPSWeb/local_settings.py:214
+#: VIPSWeb/local_settings.py:216
msgid "Naerstad Late Blight Model"
msgstr ""
-#: VIPSWeb/local_settings.py:218
+#: VIPSWeb/local_settings.py:220
msgid "Carrot rust fly temperature model"
msgstr ""
-#: VIPSWeb/local_settings.py:229
+#: VIPSWeb/local_settings.py:231
msgid "Cereals and oilseeds"
msgstr "谷物和油籽"
-#: VIPSWeb/local_settings.py:240
+#: VIPSWeb/local_settings.py:242
msgid "Potato and vegetables"
msgstr "土豆和蔬菜"
-#: VIPSWeb/local_settings.py:246
+#: VIPSWeb/local_settings.py:248
msgid "Fruits and berries"
msgstr "水果和浆果"
-#: VIPSWeb/local_settings.py:253
+#: VIPSWeb/local_settings.py:255
msgid "Other models and services"
msgstr "其他模型和服务"
diff --git a/cerealblotchmodels/locale/bg/LC_MESSAGES/django.po b/cerealblotchmodels/locale/bg/LC_MESSAGES/django.po
index 5a6767a2..e39dd10d 100644
--- a/cerealblotchmodels/locale/bg/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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"
@@ -22,98 +22,90 @@ msgstr ""
msgid "Barley net blotch"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:111
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:122
msgid "Sowing date"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
-msgid "% Infected leaves"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:158
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:175
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:165
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:182
msgid "Model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:193
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:319
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:375
msgid "Missing observation information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:328
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
msgid "Missing spraying information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:442
msgid "Temperature, daily mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:443
msgid "Rain last 28 days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:444
msgid "Rain, daily"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
msgid "Day degrees since sowing"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:362
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:429
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:513
msgid "Threshold"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:363
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:430
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:447
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:514
msgid "Disease"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:370
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:392
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:601
msgid "Time"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:378
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:399
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:462
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Warning status"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:413
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:497
msgid "No data returned"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:426
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:510
msgid "Disease value"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:433
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:517
msgid "Barley net blotch development"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:316
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:528
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:523
msgid "Select weather station"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:472
-msgid "Select crop"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:500
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:581
msgid "Select preparation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:529
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:210
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:610
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:388
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
"is not designed to work with Internet Explorer, you may experience errors "
@@ -127,12 +119,12 @@ msgid "Cereal blotch models"
msgstr ""
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:449
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:58
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:658
msgid "Septoria humidity model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:29
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:59
msgid ""
"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
@@ -141,144 +133,127 @@ msgid ""
"com/818734601' target='new'>informasjonsvideo</a>"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-msgid "Weather station"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:53
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:103
msgid "Sprayings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:55
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:105
msgid "Spraying 1"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:60
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:110
msgid "Spraying 2"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:118
msgid "Phenology"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:72
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:120
msgid "Growth stage 31"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:77
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:125
msgid "3rd upper leaf (gs 32)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:82
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:130
msgid "2nd upper leaf (gs 33)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:87
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:135
msgid "Upper leaf (gs 37-39)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:140
msgid "All kernels fully developed (gs 75)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:146
msgid "Show advanced settings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:152
msgid "Threshold values for humid hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:154
msgid "Relative humidity"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:109
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:159
msgid "Leaf wetness (min/hour)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:114
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:164
msgid "Precipitation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:169
msgid "Sliding hours past (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:174
msgid "Sliding hours ahead (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:132
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:182
msgid "Other threshold values"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:134
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:184
msgid "Number of consecutive 'humid hours'"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:189
msgid "Spraying protection days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:194
msgid "Leaf life time (days)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:570
msgid "The model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:589
msgid "Leaf wetness, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:590
msgid "Rain, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:381
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:591
msgid "Relative humidity, hourly mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:382
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:592
msgid "Humid hour (yes/no)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:593
msgid "Humid period hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:594
msgid "Humid hour sum"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:444
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:595
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:653
msgid "Humid period hour outside protection period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:649
msgid "Hours"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:445
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:654
msgid "Threshold humid period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:655
msgid "Spraying protection period"
msgstr ""
diff --git a/cerealblotchmodels/locale/bs/LC_MESSAGES/django.po b/cerealblotchmodels/locale/bs/LC_MESSAGES/django.po
index a07d0fcb..9366bb4b 100644
--- a/cerealblotchmodels/locale/bs/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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"
@@ -23,98 +23,90 @@ msgstr ""
msgid "Barley net blotch"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:111
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:122
msgid "Sowing date"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
-msgid "% Infected leaves"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:158
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:175
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:165
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:182
msgid "Model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:193
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:319
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:375
msgid "Missing observation information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:328
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
msgid "Missing spraying information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:442
msgid "Temperature, daily mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:443
msgid "Rain last 28 days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:444
msgid "Rain, daily"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
msgid "Day degrees since sowing"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:362
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:429
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:513
msgid "Threshold"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:363
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:430
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:447
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:514
msgid "Disease"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:370
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:392
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:601
msgid "Time"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:378
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:399
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:462
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Warning status"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:413
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:497
msgid "No data returned"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:426
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:510
msgid "Disease value"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:433
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:517
msgid "Barley net blotch development"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:316
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:528
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:523
msgid "Select weather station"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:472
-msgid "Select crop"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:500
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:581
msgid "Select preparation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:529
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:210
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:610
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:388
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
"is not designed to work with Internet Explorer, you may experience errors "
@@ -128,12 +120,12 @@ msgid "Cereal blotch models"
msgstr ""
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:449
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:58
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:658
msgid "Septoria humidity model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:29
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:59
msgid ""
"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
@@ -142,144 +134,127 @@ msgid ""
"com/818734601' target='new'>informasjonsvideo</a>"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-msgid "Weather station"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:53
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:103
msgid "Sprayings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:55
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:105
msgid "Spraying 1"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:60
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:110
msgid "Spraying 2"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:118
msgid "Phenology"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:72
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:120
msgid "Growth stage 31"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:77
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:125
msgid "3rd upper leaf (gs 32)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:82
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:130
msgid "2nd upper leaf (gs 33)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:87
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:135
msgid "Upper leaf (gs 37-39)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:140
msgid "All kernels fully developed (gs 75)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:146
msgid "Show advanced settings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:152
msgid "Threshold values for humid hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:154
msgid "Relative humidity"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:109
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:159
msgid "Leaf wetness (min/hour)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:114
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:164
msgid "Precipitation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:169
msgid "Sliding hours past (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:174
msgid "Sliding hours ahead (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:132
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:182
msgid "Other threshold values"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:134
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:184
msgid "Number of consecutive 'humid hours'"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:189
msgid "Spraying protection days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:194
msgid "Leaf life time (days)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:570
msgid "The model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:589
msgid "Leaf wetness, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:590
msgid "Rain, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:381
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:591
msgid "Relative humidity, hourly mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:382
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:592
msgid "Humid hour (yes/no)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:593
msgid "Humid period hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:594
msgid "Humid hour sum"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:444
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:595
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:653
msgid "Humid period hour outside protection period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:649
msgid "Hours"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:445
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:654
msgid "Threshold humid period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:655
msgid "Spraying protection period"
msgstr ""
diff --git a/cerealblotchmodels/locale/de/LC_MESSAGES/django.po b/cerealblotchmodels/locale/de/LC_MESSAGES/django.po
index 5a6767a2..e39dd10d 100755
--- a/cerealblotchmodels/locale/de/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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"
@@ -22,98 +22,90 @@ msgstr ""
msgid "Barley net blotch"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:111
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:122
msgid "Sowing date"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
-msgid "% Infected leaves"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:158
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:175
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:165
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:182
msgid "Model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:193
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:319
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:375
msgid "Missing observation information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:328
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
msgid "Missing spraying information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:442
msgid "Temperature, daily mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:443
msgid "Rain last 28 days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:444
msgid "Rain, daily"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
msgid "Day degrees since sowing"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:362
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:429
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:513
msgid "Threshold"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:363
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:430
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:447
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:514
msgid "Disease"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:370
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:392
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:601
msgid "Time"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:378
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:399
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:462
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Warning status"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:413
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:497
msgid "No data returned"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:426
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:510
msgid "Disease value"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:433
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:517
msgid "Barley net blotch development"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:316
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:528
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:523
msgid "Select weather station"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:472
-msgid "Select crop"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:500
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:581
msgid "Select preparation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:529
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:210
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:610
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:388
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
"is not designed to work with Internet Explorer, you may experience errors "
@@ -127,12 +119,12 @@ msgid "Cereal blotch models"
msgstr ""
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:449
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:58
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:658
msgid "Septoria humidity model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:29
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:59
msgid ""
"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
@@ -141,144 +133,127 @@ msgid ""
"com/818734601' target='new'>informasjonsvideo</a>"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-msgid "Weather station"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:53
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:103
msgid "Sprayings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:55
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:105
msgid "Spraying 1"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:60
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:110
msgid "Spraying 2"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:118
msgid "Phenology"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:72
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:120
msgid "Growth stage 31"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:77
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:125
msgid "3rd upper leaf (gs 32)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:82
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:130
msgid "2nd upper leaf (gs 33)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:87
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:135
msgid "Upper leaf (gs 37-39)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:140
msgid "All kernels fully developed (gs 75)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:146
msgid "Show advanced settings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:152
msgid "Threshold values for humid hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:154
msgid "Relative humidity"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:109
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:159
msgid "Leaf wetness (min/hour)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:114
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:164
msgid "Precipitation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:169
msgid "Sliding hours past (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:174
msgid "Sliding hours ahead (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:132
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:182
msgid "Other threshold values"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:134
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:184
msgid "Number of consecutive 'humid hours'"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:189
msgid "Spraying protection days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:194
msgid "Leaf life time (days)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:570
msgid "The model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:589
msgid "Leaf wetness, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:590
msgid "Rain, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:381
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:591
msgid "Relative humidity, hourly mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:382
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:592
msgid "Humid hour (yes/no)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:593
msgid "Humid period hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:594
msgid "Humid hour sum"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:444
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:595
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:653
msgid "Humid period hour outside protection period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:649
msgid "Hours"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:445
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:654
msgid "Threshold humid period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:655
msgid "Spraying protection period"
msgstr ""
diff --git a/cerealblotchmodels/locale/fi/LC_MESSAGES/django.po b/cerealblotchmodels/locale/fi/LC_MESSAGES/django.po
index 5a6767a2..e39dd10d 100644
--- a/cerealblotchmodels/locale/fi/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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"
@@ -22,98 +22,90 @@ msgstr ""
msgid "Barley net blotch"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:111
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:122
msgid "Sowing date"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
-msgid "% Infected leaves"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:158
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:175
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:165
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:182
msgid "Model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:193
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:319
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:375
msgid "Missing observation information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:328
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
msgid "Missing spraying information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:442
msgid "Temperature, daily mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:443
msgid "Rain last 28 days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:444
msgid "Rain, daily"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
msgid "Day degrees since sowing"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:362
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:429
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:513
msgid "Threshold"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:363
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:430
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:447
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:514
msgid "Disease"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:370
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:392
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:601
msgid "Time"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:378
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:399
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:462
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Warning status"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:413
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:497
msgid "No data returned"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:426
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:510
msgid "Disease value"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:433
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:517
msgid "Barley net blotch development"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:316
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:528
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:523
msgid "Select weather station"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:472
-msgid "Select crop"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:500
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:581
msgid "Select preparation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:529
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:210
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:610
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:388
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
"is not designed to work with Internet Explorer, you may experience errors "
@@ -127,12 +119,12 @@ msgid "Cereal blotch models"
msgstr ""
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:449
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:58
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:658
msgid "Septoria humidity model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:29
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:59
msgid ""
"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
@@ -141,144 +133,127 @@ msgid ""
"com/818734601' target='new'>informasjonsvideo</a>"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-msgid "Weather station"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:53
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:103
msgid "Sprayings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:55
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:105
msgid "Spraying 1"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:60
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:110
msgid "Spraying 2"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:118
msgid "Phenology"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:72
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:120
msgid "Growth stage 31"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:77
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:125
msgid "3rd upper leaf (gs 32)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:82
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:130
msgid "2nd upper leaf (gs 33)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:87
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:135
msgid "Upper leaf (gs 37-39)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:140
msgid "All kernels fully developed (gs 75)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:146
msgid "Show advanced settings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:152
msgid "Threshold values for humid hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:154
msgid "Relative humidity"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:109
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:159
msgid "Leaf wetness (min/hour)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:114
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:164
msgid "Precipitation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:169
msgid "Sliding hours past (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:174
msgid "Sliding hours ahead (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:132
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:182
msgid "Other threshold values"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:134
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:184
msgid "Number of consecutive 'humid hours'"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:189
msgid "Spraying protection days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:194
msgid "Leaf life time (days)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:570
msgid "The model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:589
msgid "Leaf wetness, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:590
msgid "Rain, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:381
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:591
msgid "Relative humidity, hourly mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:382
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:592
msgid "Humid hour (yes/no)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:593
msgid "Humid period hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:594
msgid "Humid hour sum"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:444
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:595
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:653
msgid "Humid period hour outside protection period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:649
msgid "Hours"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:445
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:654
msgid "Threshold humid period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:655
msgid "Spraying protection period"
msgstr ""
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo
index 7203e90a7a0c5e7602ce5279ad885e3f3845d90b..cb3f59175285781079f355433b6d7e3bfaa7a566 100755
GIT binary patch
delta 1278
zcmX@AJXNv&o)F7a1_lNOa|Q+m83qQ1D~t>bo(v2OJ<K3c28InR3=Con3=A8g^a&OQ
z24w~YhWjiG41x>{49u(y46+Oi45F+I3?d8+492Vs3=#|s3?8fu4D1XH42i4^47>~s
z44JG94EziX4CSm046F<c4DGB848jZy^$fkN3=Dh>3=9idAqH+>Wnj=|U|=}J%D^DX
zz`*d1m4QK=fq{XA4Pt=|8v}zp0|SF08^pnZY!C<Ju`w_RfE>;Sao}7wh{F%EF)(m4
zFfiO;gE-_78^oRuYzz$C4D}2QOzaE{JPZsBeC!YjX?6w%IR*v>U3Q2@A9e-?O9lpp
zFm?t8AqED93G5Jq7qdegwhPL?#LmDV&A`C$lAVD;ih+TFl>=k}1A_tw0|OTW1A`8f
zHs^qZkP`<3gH$~O14A?i#G*0|h=C0p3=E143=A`%;=4E?79Qb%`202p0|N^K1H*3)
zNC<(v_mP2tL5vd;k{nzN3`&d)4B}i23~USx3|8EbAa{h)?%a@&@a1M;s0X<;nj2z4
z88^gbz1$Fu%eWySvlgmx7nDB04T*|l+>j8v%?*xAhPT`d44MoK42(Pwk7)BiqQsd8
zA|JxTz@Wvzz>vWMv2QXDLp_560|Ub<9*BXbc_4B30Lo|Kg@lYGFT^3rybyy7cp(P6
z@Is;_6w1%wh3Kz@s-Mftz~BHfpBLie*Sru1|Kx>)BsX6@B+j(?AP#WngSae)50ZL|
z`5+cl^Fb`^<6~ejU|?XF&&L3E_ys<Q!#?ss4EzTbm*a=%x95kL=gtpFQ*rzZ44{lv
z%g?~T!N9=KSkKSE@Rxysp^G14P=^2m10y8offEym2}(SA3=nxx7E=WYGC&+=49&Kn
zU<KtOkfD+ckZ90gU|>)I<s7Jb5CzJDx(pCcfU<l&C@YzQWI!nvN`okF1_lOo21wQd
zWj~M@69dE-pv0*U5`bb*_5zg!pmIVODh8rJ+1G>t5)z;?0VD>>+Mp;m1aUwaOAS<r
zFhH^lNK6StFfcF}fwBw(B;G)&*o*-Zx1c-@QZm_(HFWZ3R_D$CSZ6a%Ue3N{b2>)@
s)8_A7%8Wwp!3xI4#tb0J2t=BjPWI<<+&q<M8slUuzO$Q!`Ij;Q04%Cz6951J
delta 1568
zcmbQLcvQLmo)F7a1_lNOTLuOO83qOh7A6LUU<L+;H_RYW1_ldO1_n_E1_n!31_m((
z1_pm9oyN+*pv=I)P|M1|z|X+Iu#lC3L6CugVIwO8gDe9B!(mni1`!4ZhKH;S4D1XH
z4BuE87$g`N82&-|;%p2IybKKW4DxIc19aIK7+66LVPjwrW?*1&W@BLBV_;wiXM-4=
z#>T*)&A`A=!3J^A5;g_~aRvs4U2G7GF0nB%$TKi7JZFP=gq<DY5EXU?1_1^J1}Aoi
zgM-;29w}#MVBln^XJF`K2fKt}29#dL4zX|xI|BnZ0|Ub`b_NC>1_p*pQ1Sch3=DD%
z3=AK^1~4!Pa4;}fGB7YmaX{3Ea4;|kF)%PBa6l|7=72b~3(8-_!N4HRz`(GRgMmS+
zo`HekDpcbK4h9A;1_p*dP@0_+5@bT03=C2X3=G<wAQv+*xN$-Z4B%v7P-I|W$bgD>
zaY8Jd!U+k9)tn3rEDQ_`r#T@Zc7c<D;UfbB!!u4u$ll;$V5kSh-E%Gm1|>!YhVNXE
zpp@caU|?flV9@7*M2Q)cw&8(<loON=;DI<Sjt63KB@e{H2|N&oPlcMZjt3HgTcPG0
zg3>2=80x`^<Qxwq$RG1S;{GcS1A`_50|O^7#HYr*kT~?_g~-S7GB9W{FfbJGLM)!m
z%fO((z`(GH7vh1-ypXtl0p;`XK|)TE58`ueK8S;?`061By7NISh~|UDT@I9A&j&GR
z0#w5mJ_ZH{1_p+Me2}<i;)jF?A3wwcGW?LB*W-u8u^&IgL0S9|hk}9|lpCh;L+qIc
z5&)&njr<G@1`G@ghxj2r`OFV-p@;y)Kt%zFxT63hJ0%G~49pUMB*sPo1_n@$T_C`~
zz`?-4utb1?;V%ON!&(7|IjaRB^bSD=21ZaehvaUCdP4>V26YBVa6-ixtQZ&=%o!jq
zgo%M@9R>yl3lIYdt0J*MOi(oFF+d#+$`v3%21qEWFhCMG69WT-8Uxtj_25DSl#f9P
z4io}543P2wRM>#Z0Z^G>3^hcFfq_AT0g|uv86c?|lukg>pil%AV4Mt)5CDmR$`23?
z!l0}S%66ba3zS_!(ICPQ!N4HNz`$U}z`$U{z`$V500}0L22f!GDiuu_AVCW%y+Goo
zAcBE`K^IChs3{wpTPt|xrKKj9q^2n3q$ZZ77Ej*563UyLonDk*nwO%Gl30>BnTgen
z-8sKBucWAQvpee?MxLD1#Nt$i;?$hf<dVq`*|xDH7v&dh?q}~{;tx+vEXhbMQYbD-
zEXmBz+bqVV!e|P&D6=@Vs3cV(DJL<7!97^P*w`3M8G%T1QwFER?DV42yu4ztwLaXA
zEIx^ODVuw^r!(?~rRL@3WTqFFD3qn<OjhJQ&z4=9Q&L*A`4#VKCSKpeOLJ0-OA?E-
H^79w~=yIqK
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
index 1fe093b4..9b37fc07 100644
--- a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+0100\n"
"PO-Revision-Date: 2024-04-04 12:59+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -23,98 +23,90 @@ msgstr ""
msgid "Barley net blotch"
msgstr "Byggbrunflekk"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:111
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:122
msgid "Sowing date"
msgstr "Sådato"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
-msgid "% Infected leaves"
-msgstr "% Infiserte blad"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:158
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:175
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr "Kjør modell"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:165
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:182
msgid "Model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:193
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr "Scroll forbi grafen ved å sveipe den prikkede linjen til høyre"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:319
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:375
msgid "Missing observation information"
msgstr "Manglende informasjon om feltobservasjoner"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:328
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
msgid "Missing spraying information"
msgstr "Manglende sprøytedata"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:442
msgid "Temperature, daily mean"
msgstr "Temperatur, daglig gjennomsnitt"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:443
msgid "Rain last 28 days"
msgstr "Regn siste 28 dager"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:444
msgid "Rain, daily"
msgstr "Regn, daglig sum"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
msgid "Day degrees since sowing"
msgstr "Døgngrader siden såing"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:362
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:429
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:513
msgid "Threshold"
msgstr "Terskel"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:363
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:430
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:447
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:514
msgid "Disease"
msgstr "Sykdom"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:370
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:392
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:601
msgid "Time"
msgstr "Tid"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:378
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:399
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:462
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Warning status"
msgstr "Varselstatus"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:413
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:497
msgid "No data returned"
msgstr "Ingen data returnert"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:426
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:510
msgid "Disease value"
msgstr "Sykdomsverdi"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:433
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:517
msgid "Barley net blotch development"
msgstr "Utvikling av byggbrunflekk"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:316
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:528
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:523
msgid "Select weather station"
msgstr "Velg målestasjon"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:472
-msgid "Select crop"
-msgstr "Velg kultur"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:500
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:581
msgid "Select preparation"
msgstr "Velg preparat"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:529
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:210
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:610
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:388
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
"is not designed to work with Internet Explorer, you may experience errors "
@@ -132,12 +124,12 @@ msgid "Cereal blotch models"
msgstr "Hvetebladflekkmodeller"
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:449
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:58
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:658
msgid "Septoria humidity model"
msgstr "Bladflekker i korn - fuktmodell"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:29
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:59
msgid ""
"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
@@ -146,148 +138,149 @@ msgid ""
"com/818734601' target='new'>informasjonsvideo</a>"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr "Bakgrunnsdata"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr "Land"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr "Vennligst velg"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-msgid "Weather station"
-msgstr "Målestasjon"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:53
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:103
msgid "Sprayings"
msgstr "Sprøytinger"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:55
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:105
msgid "Spraying 1"
msgstr "Første sprøyting"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:60
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:110
msgid "Spraying 2"
msgstr "Andre sprøyting"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:118
msgid "Phenology"
msgstr "Utvikling"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:72
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:120
msgid "Growth stage 31"
msgstr "GS 31"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:77
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:125
msgid "3rd upper leaf (gs 32)"
msgstr "GS 32"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:82
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:130
msgid "2nd upper leaf (gs 33)"
msgstr "GS 333"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:87
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:135
msgid "Upper leaf (gs 37-39)"
msgstr "GS 37-39"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:140
msgid "All kernels fully developed (gs 75)"
msgstr "GS 75"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:146
msgid "Show advanced settings"
msgstr "Vis avanserte innstillinger"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:152
msgid "Threshold values for humid hour"
msgstr "Terskelverdier for fuktig time"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:154
msgid "Relative humidity"
msgstr "Relativ luftfukt"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:109
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:159
msgid "Leaf wetness (min/hour)"
msgstr "Bladfukt (min/t)"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:114
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:164
msgid "Precipitation"
msgstr "Nedbør (mm)"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:169
msgid "Sliding hours past (hours)"
msgstr "Glidende timer passert"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:174
msgid "Sliding hours ahead (hours)"
msgstr "Glidende timer forut"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:132
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:182
msgid "Other threshold values"
msgstr "Andre terskelverdier"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:134
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:184
msgid "Number of consecutive 'humid hours'"
msgstr "Antall sammenhengende fuktige timer"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:189
msgid "Spraying protection days"
msgstr "Varighet (dager) av beskyttelse etter sprøyting"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:194
msgid "Leaf life time (days)"
msgstr "Bladets levetid (dager)"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:570
msgid "The model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:589
msgid "Leaf wetness, hourly"
msgstr "Bladfukt, timeverdi"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:590
msgid "Rain, hourly"
msgstr "Nedbør, timeverdi"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:381
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:591
msgid "Relative humidity, hourly mean"
msgstr "Relativ luftfukt, timesgjennomsnitt"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:382
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:592
msgid "Humid hour (yes/no)"
msgstr "Fuktig time (ja/nei)"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:593
msgid "Humid period hour"
msgstr "Fuktig periode-time"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:594
msgid "Humid hour sum"
msgstr "Sum fuktige timer"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:444
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:595
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:653
msgid "Humid period hour outside protection period"
msgstr "Fuktige timer utenfor beskyttelsesperiode"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:649
msgid "Hours"
msgstr "Timer"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:445
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:654
msgid "Threshold humid period"
msgstr "Terskel fuktig periode"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:655
msgid "Spraying protection period"
msgstr "Beskyttet periode ved sprøyting"
+#~ msgid "% Infected leaves"
+#~ msgstr "% Infiserte blad"
+
+#~ msgid "Select crop"
+#~ msgstr "Velg kultur"
+
+#~ msgid "Background data"
+#~ msgstr "Bakgrunnsdata"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Please select"
+#~ msgstr "Vennligst velg"
+
+#~ msgid "Weather station"
+#~ msgstr "Målestasjon"
+
#~ msgid "Background data for the barley net blotch model"
#~ msgstr "Bakgrunnsdata for byggbrunflekkmodellen"
diff --git a/cerealblotchmodels/locale/vi/LC_MESSAGES/django.po b/cerealblotchmodels/locale/vi/LC_MESSAGES/django.po
index 9e1b0c74..4d51865e 100644
--- a/cerealblotchmodels/locale/vi/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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"
@@ -22,98 +22,90 @@ msgstr ""
msgid "Barley net blotch"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:111
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:122
msgid "Sowing date"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
-msgid "% Infected leaves"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:158
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:175
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:165
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:182
msgid "Model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:193
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:319
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:375
msgid "Missing observation information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:328
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
msgid "Missing spraying information"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:442
msgid "Temperature, daily mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:443
msgid "Rain last 28 days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:444
msgid "Rain, daily"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
msgid "Day degrees since sowing"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:362
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:429
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:513
msgid "Threshold"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:363
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:430
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:447
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:514
msgid "Disease"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:370
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:392
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:601
msgid "Time"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:378
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:399
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:462
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Warning status"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:413
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:497
msgid "No data returned"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:426
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:510
msgid "Disease value"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:433
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:517
msgid "Barley net blotch development"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:316
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:528
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:523
msgid "Select weather station"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:472
-msgid "Select crop"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:500
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:581
msgid "Select preparation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:529
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:210
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:610
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:388
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
"is not designed to work with Internet Explorer, you may experience errors "
@@ -127,12 +119,12 @@ msgid "Cereal blotch models"
msgstr ""
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:449
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:58
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:658
msgid "Septoria humidity model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:29
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:59
msgid ""
"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
@@ -141,144 +133,127 @@ msgid ""
"com/818734601' target='new'>informasjonsvideo</a>"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-msgid "Weather station"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:53
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:103
msgid "Sprayings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:55
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:105
msgid "Spraying 1"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:60
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:110
msgid "Spraying 2"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:118
msgid "Phenology"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:72
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:120
msgid "Growth stage 31"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:77
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:125
msgid "3rd upper leaf (gs 32)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:82
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:130
msgid "2nd upper leaf (gs 33)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:87
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:135
msgid "Upper leaf (gs 37-39)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:140
msgid "All kernels fully developed (gs 75)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:146
msgid "Show advanced settings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:152
msgid "Threshold values for humid hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:154
msgid "Relative humidity"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:109
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:159
msgid "Leaf wetness (min/hour)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:114
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:164
msgid "Precipitation"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:169
msgid "Sliding hours past (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:174
msgid "Sliding hours ahead (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:132
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:182
msgid "Other threshold values"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:134
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:184
msgid "Number of consecutive 'humid hours'"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:189
msgid "Spraying protection days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:194
msgid "Leaf life time (days)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:570
msgid "The model is running, please wait"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:589
msgid "Leaf wetness, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:590
msgid "Rain, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:381
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:591
msgid "Relative humidity, hourly mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:382
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:592
msgid "Humid hour (yes/no)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:593
msgid "Humid period hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:594
msgid "Humid hour sum"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:444
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:595
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:653
msgid "Humid period hour outside protection period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:649
msgid "Hours"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:445
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:654
msgid "Threshold humid period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:655
msgid "Spraying protection period"
msgstr ""
diff --git a/cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.po b/cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.po
index 23557b70..fa9d06ea 100755
--- a/cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+0100\n"
"PO-Revision-Date: 2016-10-07 11:05+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -22,98 +22,90 @@ msgstr ""
msgid "Barley net blotch"
msgstr "大麦网斑病"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:111
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:122
msgid "Sowing date"
msgstr "播种日期"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
-msgid "% Infected leaves"
-msgstr "% 感染水平"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:158
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:175
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr "运行模型"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:165
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:182
msgid "Model is running, please wait"
msgstr "模型在运行，请等候"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:193
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr "点击右边点状线看上一幅图"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:319
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:375
msgid "Missing observation information"
msgstr "遗失的观测信息"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:328
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
msgid "Missing spraying information"
msgstr "遗失的喷药信息"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:442
msgid "Temperature, daily mean"
msgstr "日均温"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:443
msgid "Rain last 28 days"
msgstr "过去28天降雨"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:444
msgid "Rain, daily"
msgstr "日降雨"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
msgid "Day degrees since sowing"
msgstr "从撒种开始日温度"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:362
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:429
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:513
msgid "Threshold"
msgstr "阈值"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:363
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:430
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:447
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:514
msgid "Disease"
msgstr "疾病"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:370
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:392
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:601
msgid "Time"
msgstr "时间"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:378
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:399
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:462
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Warning status"
msgstr "预警信息"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:413
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:497
msgid "No data returned"
msgstr "无数据返回"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:426
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:510
msgid "Disease value"
msgstr "疾病值"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:433
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:517
msgid "Barley net blotch development"
msgstr "大麦网斑病发展"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:445
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:316
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:528
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:523
msgid "Select weather station"
msgstr "选择气象站"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:472
-msgid "Select crop"
-msgstr "选择作物"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:500
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:581
msgid "Select preparation"
msgstr "选择准备"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:529
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:210
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:610
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:388
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
"is not designed to work with Internet Explorer, you may experience errors "
@@ -127,12 +119,12 @@ msgid "Cereal blotch models"
msgstr "谷物斑点病模型"
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:449
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:58
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:658
msgid "Septoria humidity model"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:29
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:59
msgid ""
"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
@@ -141,160 +133,152 @@ msgid ""
"com/818734601' target='new'>informasjonsvideo</a>"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr ""
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-msgid "Weather station"
-msgstr "气象站"
-
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:53
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:103
#, fuzzy
#| msgid "Spraying date"
msgid "Sprayings"
msgstr "喷药日期"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:55
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:105
#, fuzzy
#| msgid "Spraying date"
msgid "Spraying 1"
msgstr "喷药日期"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:60
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:110
#, fuzzy
#| msgid "Spraying date"
msgid "Spraying 2"
msgstr "喷药日期"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:118
msgid "Phenology"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:72
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:120
msgid "Growth stage 31"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:77
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:125
msgid "3rd upper leaf (gs 32)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:82
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:130
msgid "2nd upper leaf (gs 33)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:87
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:135
msgid "Upper leaf (gs 37-39)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:140
msgid "All kernels fully developed (gs 75)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:146
msgid "Show advanced settings"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:152
msgid "Threshold values for humid hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:154
msgid "Relative humidity"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:109
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:159
msgid "Leaf wetness (min/hour)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:114
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:164
#, fuzzy
#| msgid "Preparation"
msgid "Precipitation"
msgstr "准备"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:169
msgid "Sliding hours past (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:174
msgid "Sliding hours ahead (hours)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:132
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:182
msgid "Other threshold values"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:134
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:184
msgid "Number of consecutive 'humid hours'"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:189
msgid "Spraying protection days"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:194
msgid "Leaf life time (days)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:360
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:570
#, fuzzy
#| msgid "Model is running, please wait"
msgid "The model is running, please wait"
msgstr "模型在运行，请等候"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:589
msgid "Leaf wetness, hourly"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:590
#, fuzzy
#| msgid "Rain, daily"
msgid "Rain, hourly"
msgstr "日降雨"
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:381
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:591
msgid "Relative humidity, hourly mean"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:382
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:592
msgid "Humid hour (yes/no)"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:593
msgid "Humid period hour"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:594
msgid "Humid hour sum"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:444
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:595
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:653
msgid "Humid period hour outside protection period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:649
msgid "Hours"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:445
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:654
msgid "Threshold humid period"
msgstr ""
-#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:446
+#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:655
msgid "Spraying protection period"
msgstr ""
+#~ msgid "% Infected leaves"
+#~ msgstr "% 感染水平"
+
+#~ msgid "Select crop"
+#~ msgstr "选择作物"
+
+#~ msgid "Weather station"
+#~ msgstr "气象站"
+
#~ msgid "Background data for the barley net blotch model"
#~ msgstr "大麦网斑病模型的背景数据"
diff --git a/cydiapomonella/locale/bg/LC_MESSAGES/django.po b/cydiapomonella/locale/bg/LC_MESSAGES/django.po
index 75cad8d1..085cdf58 100644
--- a/cydiapomonella/locale/bg/LC_MESSAGES/django.po
+++ b/cydiapomonella/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,104 +18,140 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: cydiapomonella/templates/cydiapomonella/index.html:29
-#: cydiapomonella/templates/cydiapomonella/index_new.html:22
+#: cydiapomonella/templates/cydiapomonella/index.html:22
+#: cydiapomonella/templates/cydiapomonella/index_old.html:29
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:713
-msgid ""
-"Loading weather data !! If it takes forever, please contact the VIPS team."
+#: cydiapomonella/templates/cydiapomonella/index.html:85
+msgid "Location name"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:86
+msgid "Latitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:87
+msgid "Longitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:88
+msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:718
-#: cydiapomonella/templates/cydiapomonella/index_new.html:42
+#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:727
-#: cydiapomonella/templates/cydiapomonella/index_new.html:51
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid ""
+"Check night temps and rainfall for weather stations and locations in regions "
+"with coddling moth"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid "Read more"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:171
+msgid ""
+"If all criteria for oviposition are met, calculate heat sum from start date "
+"below."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:733
-#: cydiapomonella/templates/cydiapomonella/index_new.html:57
+#: cydiapomonella/templates/cydiapomonella/index.html:184
+msgid "I want to use weather data"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:188
+msgid "for a specific location (coordinates)"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:195
+#: cydiapomonella/templates/cydiapomonella/index.html:208
+msgid "Select in map"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:765
-#: cydiapomonella/templates/cydiapomonella/index.html:768
-#: cydiapomonella/templates/cydiapomonella/index.html:771
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:63
-#: cydiapomonella/templates/cydiapomonella/index_new.html:66
-#: cydiapomonella/templates/cydiapomonella/index_new.html:69
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index.html:220
+msgid "I want to get night temperatures and rainfall back in time:"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:222
+#: cydiapomonella/templates/cydiapomonella/index.html:225
+#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index_old.html:765
+#: cydiapomonella/templates/cydiapomonella/index_old.html:768
+#: cydiapomonella/templates/cydiapomonella/index_old.html:771
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:782
-#: cydiapomonella/templates/cydiapomonella/index_new.html:81
+#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:783
-#: cydiapomonella/templates/cydiapomonella/index.html:784
-#: cydiapomonella/templates/cydiapomonella/index.html:785
-#: cydiapomonella/templates/cydiapomonella/index.html:786
-#: cydiapomonella/templates/cydiapomonella/index.html:787
-#: cydiapomonella/templates/cydiapomonella/index_new.html:82
-#: cydiapomonella/templates/cydiapomonella/index_new.html:83
-#: cydiapomonella/templates/cydiapomonella/index_new.html:84
-#: cydiapomonella/templates/cydiapomonella/index_new.html:85
-#: cydiapomonella/templates/cydiapomonella/index_new.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:241
+#: cydiapomonella/templates/cydiapomonella/index.html:242
+#: cydiapomonella/templates/cydiapomonella/index.html:243
+#: cydiapomonella/templates/cydiapomonella/index.html:244
+#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index_old.html:783
+#: cydiapomonella/templates/cydiapomonella/index_old.html:784
+#: cydiapomonella/templates/cydiapomonella/index_old.html:785
+#: cydiapomonella/templates/cydiapomonella/index_old.html:786
+#: cydiapomonella/templates/cydiapomonella/index_old.html:787
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:788
-#: cydiapomonella/templates/cydiapomonella/index_new.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:803
-#: cydiapomonella/templates/cydiapomonella/index_new.html:102
+#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:807
-#: cydiapomonella/templates/cydiapomonella/index_new.html:105
+#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
+#: cydiapomonella/templates/cydiapomonella/index_old.html:713
+msgid ""
+"Loading weather data !! If it takes forever, please contact the VIPS team."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid ""
"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "weather station for the period starting with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "and ending with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "is"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "day degrees"
msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "Heat sum, with a base temperature of"
-msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "calculated for "
-msgstr ""
diff --git a/cydiapomonella/locale/bs/LC_MESSAGES/django.po b/cydiapomonella/locale/bs/LC_MESSAGES/django.po
index 83e56be8..9a52c11e 100644
--- a/cydiapomonella/locale/bs/LC_MESSAGES/django.po
+++ b/cydiapomonella/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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"
@@ -19,104 +19,140 @@ msgstr ""
"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"
-#: cydiapomonella/templates/cydiapomonella/index.html:29
-#: cydiapomonella/templates/cydiapomonella/index_new.html:22
+#: cydiapomonella/templates/cydiapomonella/index.html:22
+#: cydiapomonella/templates/cydiapomonella/index_old.html:29
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:713
-msgid ""
-"Loading weather data !! If it takes forever, please contact the VIPS team."
+#: cydiapomonella/templates/cydiapomonella/index.html:85
+msgid "Location name"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:86
+msgid "Latitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:87
+msgid "Longitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:88
+msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:718
-#: cydiapomonella/templates/cydiapomonella/index_new.html:42
+#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:727
-#: cydiapomonella/templates/cydiapomonella/index_new.html:51
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid ""
+"Check night temps and rainfall for weather stations and locations in regions "
+"with coddling moth"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid "Read more"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:171
+msgid ""
+"If all criteria for oviposition are met, calculate heat sum from start date "
+"below."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:733
-#: cydiapomonella/templates/cydiapomonella/index_new.html:57
+#: cydiapomonella/templates/cydiapomonella/index.html:184
+msgid "I want to use weather data"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:188
+msgid "for a specific location (coordinates)"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:195
+#: cydiapomonella/templates/cydiapomonella/index.html:208
+msgid "Select in map"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:765
-#: cydiapomonella/templates/cydiapomonella/index.html:768
-#: cydiapomonella/templates/cydiapomonella/index.html:771
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:63
-#: cydiapomonella/templates/cydiapomonella/index_new.html:66
-#: cydiapomonella/templates/cydiapomonella/index_new.html:69
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index.html:220
+msgid "I want to get night temperatures and rainfall back in time:"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:222
+#: cydiapomonella/templates/cydiapomonella/index.html:225
+#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index_old.html:765
+#: cydiapomonella/templates/cydiapomonella/index_old.html:768
+#: cydiapomonella/templates/cydiapomonella/index_old.html:771
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:782
-#: cydiapomonella/templates/cydiapomonella/index_new.html:81
+#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:783
-#: cydiapomonella/templates/cydiapomonella/index.html:784
-#: cydiapomonella/templates/cydiapomonella/index.html:785
-#: cydiapomonella/templates/cydiapomonella/index.html:786
-#: cydiapomonella/templates/cydiapomonella/index.html:787
-#: cydiapomonella/templates/cydiapomonella/index_new.html:82
-#: cydiapomonella/templates/cydiapomonella/index_new.html:83
-#: cydiapomonella/templates/cydiapomonella/index_new.html:84
-#: cydiapomonella/templates/cydiapomonella/index_new.html:85
-#: cydiapomonella/templates/cydiapomonella/index_new.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:241
+#: cydiapomonella/templates/cydiapomonella/index.html:242
+#: cydiapomonella/templates/cydiapomonella/index.html:243
+#: cydiapomonella/templates/cydiapomonella/index.html:244
+#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index_old.html:783
+#: cydiapomonella/templates/cydiapomonella/index_old.html:784
+#: cydiapomonella/templates/cydiapomonella/index_old.html:785
+#: cydiapomonella/templates/cydiapomonella/index_old.html:786
+#: cydiapomonella/templates/cydiapomonella/index_old.html:787
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:788
-#: cydiapomonella/templates/cydiapomonella/index_new.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:803
-#: cydiapomonella/templates/cydiapomonella/index_new.html:102
+#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:807
-#: cydiapomonella/templates/cydiapomonella/index_new.html:105
+#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
+#: cydiapomonella/templates/cydiapomonella/index_old.html:713
+msgid ""
+"Loading weather data !! If it takes forever, please contact the VIPS team."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid ""
"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "weather station for the period starting with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "and ending with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "is"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "day degrees"
msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "Heat sum, with a base temperature of"
-msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "calculated for "
-msgstr ""
diff --git a/cydiapomonella/locale/de/LC_MESSAGES/django.po b/cydiapomonella/locale/de/LC_MESSAGES/django.po
index 75cad8d1..085cdf58 100644
--- a/cydiapomonella/locale/de/LC_MESSAGES/django.po
+++ b/cydiapomonella/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,104 +18,140 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: cydiapomonella/templates/cydiapomonella/index.html:29
-#: cydiapomonella/templates/cydiapomonella/index_new.html:22
+#: cydiapomonella/templates/cydiapomonella/index.html:22
+#: cydiapomonella/templates/cydiapomonella/index_old.html:29
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:713
-msgid ""
-"Loading weather data !! If it takes forever, please contact the VIPS team."
+#: cydiapomonella/templates/cydiapomonella/index.html:85
+msgid "Location name"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:86
+msgid "Latitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:87
+msgid "Longitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:88
+msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:718
-#: cydiapomonella/templates/cydiapomonella/index_new.html:42
+#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:727
-#: cydiapomonella/templates/cydiapomonella/index_new.html:51
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid ""
+"Check night temps and rainfall for weather stations and locations in regions "
+"with coddling moth"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid "Read more"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:171
+msgid ""
+"If all criteria for oviposition are met, calculate heat sum from start date "
+"below."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:733
-#: cydiapomonella/templates/cydiapomonella/index_new.html:57
+#: cydiapomonella/templates/cydiapomonella/index.html:184
+msgid "I want to use weather data"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:188
+msgid "for a specific location (coordinates)"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:195
+#: cydiapomonella/templates/cydiapomonella/index.html:208
+msgid "Select in map"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:765
-#: cydiapomonella/templates/cydiapomonella/index.html:768
-#: cydiapomonella/templates/cydiapomonella/index.html:771
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:63
-#: cydiapomonella/templates/cydiapomonella/index_new.html:66
-#: cydiapomonella/templates/cydiapomonella/index_new.html:69
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index.html:220
+msgid "I want to get night temperatures and rainfall back in time:"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:222
+#: cydiapomonella/templates/cydiapomonella/index.html:225
+#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index_old.html:765
+#: cydiapomonella/templates/cydiapomonella/index_old.html:768
+#: cydiapomonella/templates/cydiapomonella/index_old.html:771
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:782
-#: cydiapomonella/templates/cydiapomonella/index_new.html:81
+#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:783
-#: cydiapomonella/templates/cydiapomonella/index.html:784
-#: cydiapomonella/templates/cydiapomonella/index.html:785
-#: cydiapomonella/templates/cydiapomonella/index.html:786
-#: cydiapomonella/templates/cydiapomonella/index.html:787
-#: cydiapomonella/templates/cydiapomonella/index_new.html:82
-#: cydiapomonella/templates/cydiapomonella/index_new.html:83
-#: cydiapomonella/templates/cydiapomonella/index_new.html:84
-#: cydiapomonella/templates/cydiapomonella/index_new.html:85
-#: cydiapomonella/templates/cydiapomonella/index_new.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:241
+#: cydiapomonella/templates/cydiapomonella/index.html:242
+#: cydiapomonella/templates/cydiapomonella/index.html:243
+#: cydiapomonella/templates/cydiapomonella/index.html:244
+#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index_old.html:783
+#: cydiapomonella/templates/cydiapomonella/index_old.html:784
+#: cydiapomonella/templates/cydiapomonella/index_old.html:785
+#: cydiapomonella/templates/cydiapomonella/index_old.html:786
+#: cydiapomonella/templates/cydiapomonella/index_old.html:787
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:788
-#: cydiapomonella/templates/cydiapomonella/index_new.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:803
-#: cydiapomonella/templates/cydiapomonella/index_new.html:102
+#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:807
-#: cydiapomonella/templates/cydiapomonella/index_new.html:105
+#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
+#: cydiapomonella/templates/cydiapomonella/index_old.html:713
+msgid ""
+"Loading weather data !! If it takes forever, please contact the VIPS team."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid ""
"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "weather station for the period starting with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "and ending with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "is"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "day degrees"
msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "Heat sum, with a base temperature of"
-msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "calculated for "
-msgstr ""
diff --git a/cydiapomonella/locale/fi/LC_MESSAGES/django.po b/cydiapomonella/locale/fi/LC_MESSAGES/django.po
index 75cad8d1..085cdf58 100644
--- a/cydiapomonella/locale/fi/LC_MESSAGES/django.po
+++ b/cydiapomonella/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,104 +18,140 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: cydiapomonella/templates/cydiapomonella/index.html:29
-#: cydiapomonella/templates/cydiapomonella/index_new.html:22
+#: cydiapomonella/templates/cydiapomonella/index.html:22
+#: cydiapomonella/templates/cydiapomonella/index_old.html:29
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:713
-msgid ""
-"Loading weather data !! If it takes forever, please contact the VIPS team."
+#: cydiapomonella/templates/cydiapomonella/index.html:85
+msgid "Location name"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:86
+msgid "Latitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:87
+msgid "Longitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:88
+msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:718
-#: cydiapomonella/templates/cydiapomonella/index_new.html:42
+#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:727
-#: cydiapomonella/templates/cydiapomonella/index_new.html:51
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid ""
+"Check night temps and rainfall for weather stations and locations in regions "
+"with coddling moth"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid "Read more"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:171
+msgid ""
+"If all criteria for oviposition are met, calculate heat sum from start date "
+"below."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:733
-#: cydiapomonella/templates/cydiapomonella/index_new.html:57
+#: cydiapomonella/templates/cydiapomonella/index.html:184
+msgid "I want to use weather data"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:188
+msgid "for a specific location (coordinates)"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:195
+#: cydiapomonella/templates/cydiapomonella/index.html:208
+msgid "Select in map"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:765
-#: cydiapomonella/templates/cydiapomonella/index.html:768
-#: cydiapomonella/templates/cydiapomonella/index.html:771
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:63
-#: cydiapomonella/templates/cydiapomonella/index_new.html:66
-#: cydiapomonella/templates/cydiapomonella/index_new.html:69
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index.html:220
+msgid "I want to get night temperatures and rainfall back in time:"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:222
+#: cydiapomonella/templates/cydiapomonella/index.html:225
+#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index_old.html:765
+#: cydiapomonella/templates/cydiapomonella/index_old.html:768
+#: cydiapomonella/templates/cydiapomonella/index_old.html:771
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:782
-#: cydiapomonella/templates/cydiapomonella/index_new.html:81
+#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:783
-#: cydiapomonella/templates/cydiapomonella/index.html:784
-#: cydiapomonella/templates/cydiapomonella/index.html:785
-#: cydiapomonella/templates/cydiapomonella/index.html:786
-#: cydiapomonella/templates/cydiapomonella/index.html:787
-#: cydiapomonella/templates/cydiapomonella/index_new.html:82
-#: cydiapomonella/templates/cydiapomonella/index_new.html:83
-#: cydiapomonella/templates/cydiapomonella/index_new.html:84
-#: cydiapomonella/templates/cydiapomonella/index_new.html:85
-#: cydiapomonella/templates/cydiapomonella/index_new.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:241
+#: cydiapomonella/templates/cydiapomonella/index.html:242
+#: cydiapomonella/templates/cydiapomonella/index.html:243
+#: cydiapomonella/templates/cydiapomonella/index.html:244
+#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index_old.html:783
+#: cydiapomonella/templates/cydiapomonella/index_old.html:784
+#: cydiapomonella/templates/cydiapomonella/index_old.html:785
+#: cydiapomonella/templates/cydiapomonella/index_old.html:786
+#: cydiapomonella/templates/cydiapomonella/index_old.html:787
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:788
-#: cydiapomonella/templates/cydiapomonella/index_new.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:803
-#: cydiapomonella/templates/cydiapomonella/index_new.html:102
+#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:807
-#: cydiapomonella/templates/cydiapomonella/index_new.html:105
+#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
+#: cydiapomonella/templates/cydiapomonella/index_old.html:713
+msgid ""
+"Loading weather data !! If it takes forever, please contact the VIPS team."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid ""
"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "weather station for the period starting with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "and ending with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "is"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "day degrees"
msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "Heat sum, with a base temperature of"
-msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "calculated for "
-msgstr ""
diff --git a/cydiapomonella/locale/nb/LC_MESSAGES/django.mo b/cydiapomonella/locale/nb/LC_MESSAGES/django.mo
index d5e6a992650486d7696f042c6857269c8f4a1359..271c9db640e40e460ce2d39be4d6bf9c1d99c224 100644
GIT binary patch
delta 1461
zcmey%GgG+!o)F7a1_lNO87Th4z`&r&z`$^a5hTjMP{0I{D`a9|Fl1n0=wo7Fh-YA6
zIKaffz|X+Ipuo()z{kMAV8G14z{0@5V9(6Jz`?-4;KIzn;K9Ja;LFUwV9mh5FpZgk
zL5hKa;Sw_gLl6T4!&`{DdIkp;1_mz%1_n<S1_oXR28Jmt3=EtM3=E4{AR5;|`7faI
zpI8_e#6WIiWnf@uU|<kug;*%h3UQDID+2>J0|SEvE5t!AtPl@*vNA9*F)%RXvobK~
zFfcF_u`)0yG1fCM%x7g_kYHe7IK;-lpu)hwaGQ;RArfQ(I|Bn30|P@8I|Bm`0|P@U
zJH)^uc8G=L><kS03=9kn><|k!utOYnjh%s^0OUic{x}W>244mShD;8K$F_4o%st4#
zz+h9)z`$^Z1L6}-PKe6|IT;uP85kI3IU(ZuoDd7mIUyPyI3Wgkb22cnGB7ZNaxyT8
zGB7Yib3%Mr$O-XC2`2*sC>BA{0}3$#1_lOc28bGvK9C>lL2&}|C5QvUpg5FdfJ6nz
z*CGrMM~O2)90gJ%!~k&sh%L+j2|W-Sgh6QnM1!J+nE~Q(kmEpNpftt?VmK$}B$wtS
zmZU07KF#PBkdd04t&o?Qo>8JulA2pktdN+OqEM8WnU|KBlcSK9U!+i;npl#NTBJ~1
zl30?Np9fKqlb;ObW#%aqrKW==$}>wcCNnZ6Om1URt@l(YPs}S(D9KkyPc1>RA+;#6
zq_ij%Vhr4(q{QTGh0HvKlFZyxD+Yw#(&ALO15y%85*a+x6hID3F3K!PEy_#;yD+~j
zvmn1X6XZID#G+J%+|&{sV})e6M>A3rOB9Mra~0Bx@^eA{C@N7%0fj(PYEFK+9)nL}
zNoGlDO6ufQOg`d1P@gH}CFZ6w_~hrML*%|P*@_3HCZ;Il<`<<h1gGYtCYOL*oSRrM
z*^pVmKO{3ZwJJX^l>rohsd*`xdFcwE0AWZ;tW-!zO)pAKEe5fR89;%Ws8C#xnw*)I
znXCW{N(GJN{QRPn%)G>s)MCxajm#D7h6;v;R>sDgScDn<JW`7kvJ>+ZQc4wyvr@CO
zQx&qyQgc#@L9qr2Q-%C=g}l_1q{BOkz`;^>cv(?#Nn&wUeqL&kLMAktQi~LFQ&T3h
zv-(diVHK|TN=;WN%gj;8NX;ur1%*nYLP=&$Qet+hLZ(7VW{N^uQKA(COjS}*X?Cgt
z$Y5|}xTF>p=jVbVBvm0B5+kX3sbI@f)6;WO)6+qrkXodWUr>-%nNy;pkd#`Knx3an
zaCm9X;T;7f3YKMwMY*Y<xG76bQ8>I*p*XuJvn*91GcOMkQ7MTf`5<4V=B4Eq=`lDJ
zrKW%aGcjdy8>_!aa7k)Pab99s9)nM6UOH6b3ag#4PinD3ZfX%jSZYqXLZ(7?Vo}Lt
zK{jd2kj#|gVo)rVWafavD>pTTA-yOuB_%OEwTJ;ig5oE&M4_NGFS`V)H??GP2%9DV
DSm;!2
delta 607
zcmbO!{FkTxo)F7a1_lNOVFm^U83qQ1Ees3{vJ4CiK8zqy28IKS5b=YI3=D=03=H=e
z85sB(7#IYY7#R2%7#I|o7#LU>7#Q@K7#KJh7#K{L7#LI-7#M7s7#KVl7#Nb67#O@5
z7#LPFF)&y&Ffe>$Vqg$sU|=v}W?*1vV5n#CWQG_R2&EI585p=37#IqfAqLknGcYhQ
zFfcSRGcf2dFfg<-GcYJIGB9jnW?+zDU|_h)0<rKN3j+fe$Rn%_3_J`B405ax{o1S$
zhZ(R!JZ8ztz@X2-z!1*Lz~IYJ&%n^m%D`X)GKiIdL6CugL5L0PG6oekh=Dq63=F&s
z3=HOM3=EtM3=FPp3=FIc3=IBk5Ql}bK^zdl#=rmyG>~IKAp#0NkVDuQAm)PjAag)8
z2n&G-2L^~GAT|htf|i{D5(1#$1VsxoNCJvM7K4Hv<PeaMz~o$}kjaY70h4{0y(W9I
zcu!u#Vl#<V-XJkAMIkjWB{MHwp**uBgCRLFC%H5yu_QG`AuYd1fgvTaQXwTZy(l%c
z7{o4~oX1+hZlGXbVP#^r`7Nt3<K!rI=gIZ#hLbZn{3f5_u$?T+DWy@8nWK=Ou8^CW
g!jP0&l$xHGS^_aHy(lpyB{4m<hyhGaF5uJz00JsZ*#H0l
diff --git a/cydiapomonella/locale/nb/LC_MESSAGES/django.po b/cydiapomonella/locale/nb/LC_MESSAGES/django.po
index c26b9dc1..eac9d875 100644
--- a/cydiapomonella/locale/nb/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/nb/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-30 08:43+0100\n"
-"PO-Revision-Date: 2024-10-30 08:46+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+0100\n"
+"PO-Revision-Date: 2024-10-31 11:33+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: nb\n"
@@ -18,102 +18,151 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.4.2\n"
-#: cydiapomonella/templates/cydiapomonella/index.html:29
-#: cydiapomonella/templates/cydiapomonella/index_new.html:22
+#: cydiapomonella/templates/cydiapomonella/index.html:22
+#: cydiapomonella/templates/cydiapomonella/index_old.html:29
msgid "Cydia pomonella"
msgstr "Eplevikler"
-#: cydiapomonella/templates/cydiapomonella/index.html:713
-msgid "Loading weather data !! If it takes forever, please contact the VIPS team."
-msgstr "Laster værdata. Hvis det tar veldig lang tid, vennligst kontakt VIPS-teamet."
+#: cydiapomonella/templates/cydiapomonella/index.html:85
+msgid "Location name"
+msgstr "Stedsnavn"
-#: cydiapomonella/templates/cydiapomonella/index.html:718
-#: cydiapomonella/templates/cydiapomonella/index_new.html:42
+#: cydiapomonella/templates/cydiapomonella/index.html:86
+msgid "Latitude"
+msgstr "Breddegrad"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:87
+msgid "Longitude"
+msgstr "Lengdegrad"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:88
+msgid "Timezone"
+msgstr "Tidssone"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr "Beregn fare for angrep av eplevikler"
-#: cydiapomonella/templates/cydiapomonella/index.html:727
-#: cydiapomonella/templates/cydiapomonella/index_new.html:51
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid ""
+"Check night temps and rainfall for weather stations and locations in regions "
+"with coddling moth"
+msgstr ""
+"Her kan du sjekke kveldstemperatur og nedbør for værstasjoner i regioner med "
+"eplevikler"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid "Read more"
+msgstr "Les mer"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:171
+msgid ""
+"If all criteria for oviposition are met, calculate heat sum from start date "
+"below."
+msgstr ""
+"Dersom alle kriteriene for egglegging er oppfylt, beregn påløpt varmesum ved "
+"å skrive inn startdato nedenfor."
+
+#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr "Ingen værdata er tilgjengelig fra den valgte målestasjonen"
-#: cydiapomonella/templates/cydiapomonella/index.html:733
-#: cydiapomonella/templates/cydiapomonella/index_new.html:57
+#: cydiapomonella/templates/cydiapomonella/index.html:184
+msgid "I want to use weather data"
+msgstr "Jeg vil bruke værdata"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:188
+msgid "for a specific location (coordinates)"
+msgstr "for et punkt i kartet"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:195
+#: cydiapomonella/templates/cydiapomonella/index.html:208
+msgid "Select in map"
+msgstr "Velg i kart"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr "Velg målestasjon"
-#: cydiapomonella/templates/cydiapomonella/index.html:765
-#: cydiapomonella/templates/cydiapomonella/index.html:768
-#: cydiapomonella/templates/cydiapomonella/index.html:771
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:63
-#: cydiapomonella/templates/cydiapomonella/index_new.html:66
-#: cydiapomonella/templates/cydiapomonella/index_new.html:69
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index.html:220
+msgid "I want to get night temperatures and rainfall back in time:"
+msgstr "Jeg vil hente data tilbake i tid fra:"
+
+#: cydiapomonella/templates/cydiapomonella/index.html:222
+#: cydiapomonella/templates/cydiapomonella/index.html:225
+#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index_old.html:765
+#: cydiapomonella/templates/cydiapomonella/index_old.html:768
+#: cydiapomonella/templates/cydiapomonella/index_old.html:771
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "days"
msgstr "dager"
-#: cydiapomonella/templates/cydiapomonella/index.html:782
-#: cydiapomonella/templates/cydiapomonella/index_new.html:81
+#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr "Dato"
-#: cydiapomonella/templates/cydiapomonella/index.html:783
-#: cydiapomonella/templates/cydiapomonella/index.html:784
-#: cydiapomonella/templates/cydiapomonella/index.html:785
-#: cydiapomonella/templates/cydiapomonella/index.html:786
-#: cydiapomonella/templates/cydiapomonella/index.html:787
-#: cydiapomonella/templates/cydiapomonella/index_new.html:82
-#: cydiapomonella/templates/cydiapomonella/index_new.html:83
-#: cydiapomonella/templates/cydiapomonella/index_new.html:84
-#: cydiapomonella/templates/cydiapomonella/index_new.html:85
-#: cydiapomonella/templates/cydiapomonella/index_new.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:241
+#: cydiapomonella/templates/cydiapomonella/index.html:242
+#: cydiapomonella/templates/cydiapomonella/index.html:243
+#: cydiapomonella/templates/cydiapomonella/index.html:244
+#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index_old.html:783
+#: cydiapomonella/templates/cydiapomonella/index_old.html:784
+#: cydiapomonella/templates/cydiapomonella/index_old.html:785
+#: cydiapomonella/templates/cydiapomonella/index_old.html:786
+#: cydiapomonella/templates/cydiapomonella/index_old.html:787
msgid "Temp at"
msgstr "Temp kl"
-#: cydiapomonella/templates/cydiapomonella/index.html:788
-#: cydiapomonella/templates/cydiapomonella/index_new.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr "Døgnnedbør"
-#: cydiapomonella/templates/cydiapomonella/index.html:803
-#: cydiapomonella/templates/cydiapomonella/index_new.html:102
+#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr "Varmesum"
-#: cydiapomonella/templates/cydiapomonella/index.html:807
-#: cydiapomonella/templates/cydiapomonella/index_new.html:105
+#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr "Beregn varmesum fra dato"
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-msgid "Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+#: cydiapomonella/templates/cydiapomonella/index_old.html:713
+msgid ""
+"Loading weather data !! If it takes forever, please contact the VIPS team."
+msgstr ""
+"Laster værdata. Hvis det tar veldig lang tid, vennligst kontakt VIPS-teamet."
+
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
msgstr "Varmesum, med basistemperatur 10, beregnet for "
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "weather station for the period starting with"
msgstr "målestasjon for perioden fra og med"
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "and ending with"
msgstr "til og med"
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "is"
msgstr "er"
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "day degrees"
msgstr "graddager"
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "Heat sum, with a base temperature of"
-msgstr "Varmesum, med basistemperatur"
+#~ msgid "Heat sum, with a base temperature of"
+#~ msgstr "Varmesum, med basistemperatur"
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "calculated for "
-msgstr "beregnet for "
+#~ msgid "calculated for "
+#~ msgstr "beregnet for "
diff --git a/cydiapomonella/locale/vi/LC_MESSAGES/django.po b/cydiapomonella/locale/vi/LC_MESSAGES/django.po
index 353e88c3..4afe5e3a 100644
--- a/cydiapomonella/locale/vi/LC_MESSAGES/django.po
+++ b/cydiapomonella/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: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,104 +18,140 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: cydiapomonella/templates/cydiapomonella/index.html:29
-#: cydiapomonella/templates/cydiapomonella/index_new.html:22
+#: cydiapomonella/templates/cydiapomonella/index.html:22
+#: cydiapomonella/templates/cydiapomonella/index_old.html:29
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:713
-msgid ""
-"Loading weather data !! If it takes forever, please contact the VIPS team."
+#: cydiapomonella/templates/cydiapomonella/index.html:85
+msgid "Location name"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:86
+msgid "Latitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:87
+msgid "Longitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:88
+msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:718
-#: cydiapomonella/templates/cydiapomonella/index_new.html:42
+#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:727
-#: cydiapomonella/templates/cydiapomonella/index_new.html:51
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid ""
+"Check night temps and rainfall for weather stations and locations in regions "
+"with coddling moth"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid "Read more"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:171
+msgid ""
+"If all criteria for oviposition are met, calculate heat sum from start date "
+"below."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:733
-#: cydiapomonella/templates/cydiapomonella/index_new.html:57
+#: cydiapomonella/templates/cydiapomonella/index.html:184
+msgid "I want to use weather data"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:188
+msgid "for a specific location (coordinates)"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:195
+#: cydiapomonella/templates/cydiapomonella/index.html:208
+msgid "Select in map"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:765
-#: cydiapomonella/templates/cydiapomonella/index.html:768
-#: cydiapomonella/templates/cydiapomonella/index.html:771
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:63
-#: cydiapomonella/templates/cydiapomonella/index_new.html:66
-#: cydiapomonella/templates/cydiapomonella/index_new.html:69
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index.html:220
+msgid "I want to get night temperatures and rainfall back in time:"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:222
+#: cydiapomonella/templates/cydiapomonella/index.html:225
+#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index_old.html:765
+#: cydiapomonella/templates/cydiapomonella/index_old.html:768
+#: cydiapomonella/templates/cydiapomonella/index_old.html:771
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:782
-#: cydiapomonella/templates/cydiapomonella/index_new.html:81
+#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:783
-#: cydiapomonella/templates/cydiapomonella/index.html:784
-#: cydiapomonella/templates/cydiapomonella/index.html:785
-#: cydiapomonella/templates/cydiapomonella/index.html:786
-#: cydiapomonella/templates/cydiapomonella/index.html:787
-#: cydiapomonella/templates/cydiapomonella/index_new.html:82
-#: cydiapomonella/templates/cydiapomonella/index_new.html:83
-#: cydiapomonella/templates/cydiapomonella/index_new.html:84
-#: cydiapomonella/templates/cydiapomonella/index_new.html:85
-#: cydiapomonella/templates/cydiapomonella/index_new.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:241
+#: cydiapomonella/templates/cydiapomonella/index.html:242
+#: cydiapomonella/templates/cydiapomonella/index.html:243
+#: cydiapomonella/templates/cydiapomonella/index.html:244
+#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index_old.html:783
+#: cydiapomonella/templates/cydiapomonella/index_old.html:784
+#: cydiapomonella/templates/cydiapomonella/index_old.html:785
+#: cydiapomonella/templates/cydiapomonella/index_old.html:786
+#: cydiapomonella/templates/cydiapomonella/index_old.html:787
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:788
-#: cydiapomonella/templates/cydiapomonella/index_new.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:803
-#: cydiapomonella/templates/cydiapomonella/index_new.html:102
+#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:807
-#: cydiapomonella/templates/cydiapomonella/index_new.html:105
+#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
+#: cydiapomonella/templates/cydiapomonella/index_old.html:713
+msgid ""
+"Loading weather data !! If it takes forever, please contact the VIPS team."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid ""
"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "weather station for the period starting with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "and ending with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "is"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "day degrees"
msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "Heat sum, with a base temperature of"
-msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "calculated for "
-msgstr ""
diff --git a/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
index 353e88c3..4afe5e3a 100644
--- a/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-30 08:43+0100\n"
+"POT-Creation-Date: 2024-10-31 11:29+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,104 +18,140 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: cydiapomonella/templates/cydiapomonella/index.html:29
-#: cydiapomonella/templates/cydiapomonella/index_new.html:22
+#: cydiapomonella/templates/cydiapomonella/index.html:22
+#: cydiapomonella/templates/cydiapomonella/index_old.html:29
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:713
-msgid ""
-"Loading weather data !! If it takes forever, please contact the VIPS team."
+#: cydiapomonella/templates/cydiapomonella/index.html:85
+msgid "Location name"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:86
+msgid "Latitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:87
+msgid "Longitude"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:88
+msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:718
-#: cydiapomonella/templates/cydiapomonella/index_new.html:42
+#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:727
-#: cydiapomonella/templates/cydiapomonella/index_new.html:51
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid ""
+"Check night temps and rainfall for weather stations and locations in regions "
+"with coddling moth"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:170
+msgid "Read more"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:171
+msgid ""
+"If all criteria for oviposition are met, calculate heat sum from start date "
+"below."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:733
-#: cydiapomonella/templates/cydiapomonella/index_new.html:57
+#: cydiapomonella/templates/cydiapomonella/index.html:184
+msgid "I want to use weather data"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:188
+msgid "for a specific location (coordinates)"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:195
+#: cydiapomonella/templates/cydiapomonella/index.html:208
+msgid "Select in map"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:765
-#: cydiapomonella/templates/cydiapomonella/index.html:768
-#: cydiapomonella/templates/cydiapomonella/index.html:771
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:63
-#: cydiapomonella/templates/cydiapomonella/index_new.html:66
-#: cydiapomonella/templates/cydiapomonella/index_new.html:69
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index.html:220
+msgid "I want to get night temperatures and rainfall back in time:"
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:222
+#: cydiapomonella/templates/cydiapomonella/index.html:225
+#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index_old.html:765
+#: cydiapomonella/templates/cydiapomonella/index_old.html:768
+#: cydiapomonella/templates/cydiapomonella/index_old.html:771
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:782
-#: cydiapomonella/templates/cydiapomonella/index_new.html:81
+#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:783
-#: cydiapomonella/templates/cydiapomonella/index.html:784
-#: cydiapomonella/templates/cydiapomonella/index.html:785
-#: cydiapomonella/templates/cydiapomonella/index.html:786
-#: cydiapomonella/templates/cydiapomonella/index.html:787
-#: cydiapomonella/templates/cydiapomonella/index_new.html:82
-#: cydiapomonella/templates/cydiapomonella/index_new.html:83
-#: cydiapomonella/templates/cydiapomonella/index_new.html:84
-#: cydiapomonella/templates/cydiapomonella/index_new.html:85
-#: cydiapomonella/templates/cydiapomonella/index_new.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:241
+#: cydiapomonella/templates/cydiapomonella/index.html:242
+#: cydiapomonella/templates/cydiapomonella/index.html:243
+#: cydiapomonella/templates/cydiapomonella/index.html:244
+#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index_old.html:783
+#: cydiapomonella/templates/cydiapomonella/index_old.html:784
+#: cydiapomonella/templates/cydiapomonella/index_old.html:785
+#: cydiapomonella/templates/cydiapomonella/index_old.html:786
+#: cydiapomonella/templates/cydiapomonella/index_old.html:787
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:788
-#: cydiapomonella/templates/cydiapomonella/index_new.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:803
-#: cydiapomonella/templates/cydiapomonella/index_new.html:102
+#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:807
-#: cydiapomonella/templates/cydiapomonella/index_new.html:105
+#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
+#: cydiapomonella/templates/cydiapomonella/index_old.html:713
+msgid ""
+"Loading weather data !! If it takes forever, please contact the VIPS team."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid ""
"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "weather station for the period starting with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "and ending with"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "is"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:815
-#: cydiapomonella/templates/cydiapomonella/index_new.html:114
+#: cydiapomonella/templates/cydiapomonella/index_old.html:815
msgid "day degrees"
msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "Heat sum, with a base temperature of"
-msgstr ""
-
-#: cydiapomonella/templates/cydiapomonella/index_new.html:113
-msgid "calculated for "
-msgstr ""
diff --git a/cydiapomonella/static/js/cydiapomonella.js b/cydiapomonella/static/js/cydiapomonella.js
index 05103bc1..e79d1667 100644
--- a/cydiapomonella/static/js/cydiapomonella.js
+++ b/cydiapomonella/static/js/cydiapomonella.js
@@ -17,15 +17,12 @@
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
-
-
-
class CydiaPomonella
{
weatherStationDataURL = "https://lmt.nibio.no/services/rest/vips/getdata/forecastfallback";
- gridDataURL = "https://weather.vips.nibio.no/rest/grid/openmeteo/"; // TODO: Revider APIet
- TIMEZONE = "Europe/Oslo";
+ gridDataURL = "https://weather.vips.nibio.no/rest/grid/openmeteo/";
+ TIMEZONE_OSLO = "Europe/Oslo";
DATE_FORMAT = "YYYY-MM-DD";
HEATSUM_BASE_TEMP = 10.0;
WEATHER_DATASOURCE_TYPE_COORDINATES = "coordinates";
@@ -102,7 +99,7 @@ class CydiaPomonella
hourlyDataResponse = await fetch(
this.weatherStationDataURL + "?weatherStationId=" + selectedWeatherStationId
+ "&elementMeasurementTypes[]=RR&elementMeasurementTypes[]=TM"
- + "&timeZone=" + this.TIMEZONE
+ + "&timeZone=" + this.TIMEZONE_OSLO
+ "&startDate=" + startDateHourly.format(this.DATE_FORMAT) + "&startTime=0"
+ "&endDate=" + endDateHourly.format(this.DATE_FORMAT) + "&endTime=12"
+ "&logIntervalId=1"
@@ -113,7 +110,7 @@ class CydiaPomonella
hourlyDataResponse = await fetch(
this.gridDataURL + "?longitude=" + selectedCoordinate[0] + "&latitude=" + selectedCoordinate[1]
+ "&elementMeasurementTypes[]=RR&elementMeasurementTypes[]=TM"
- + "&timeZone=" + this.TIMEZONE
+ + "&timeZone=" + document.getElementById("timezone").value
+ "&startDate=" + startDateHourly.format(this.DATE_FORMAT) + "&startTime=0"
+ "&endDate=" + endDateHourly.format(this.DATE_FORMAT) + "&endTime=12"
+ "&logIntervalId=1"
@@ -155,7 +152,7 @@ class CydiaPomonella
}
// Get daily temperature data for the heat sum
const heatSumStartDate = this.setToTZMidnight(moment(document.getElementById("heatSumStartDate").value));
- const heatSumEndDate = this.setToTZMidnight(moment().tz(this.TIMEZONE).subtract(1,"days"));
+ const heatSumEndDate = this.setToTZMidnight(moment().tz(this.TIMEZONE_OSLO).subtract(1,"days"));
let heatSumDataResponse = undefined;
if(this.getSelectedWeatherdataSourceType() == this.WEATHER_DATASOURCE_TYPE_WEATHERSTATION && selectedWeatherStationId != undefined)
@@ -163,7 +160,7 @@ class CydiaPomonella
heatSumDataResponse = await fetch(
this.weatherStationDataURL + "?weatherStationId=" + selectedWeatherStationId
+ "&elementMeasurementTypes[]=TM"
- + "&timeZone=" + this.TIMEZONE
+ + "&timeZone=" + this.TIMEZONE_OSLO
+ "&startDate=" + heatSumStartDate.format(this.DATE_FORMAT) + "&startTime=0"
+ "&endDate=" + heatSumEndDate.format(this.DATE_FORMAT) + "&endTime=23"
+ "&logIntervalId=2"
@@ -174,7 +171,7 @@ class CydiaPomonella
heatSumDataResponse = await fetch(
this.gridDataURL + "?longitude=" + selectedCoordinate[0] + "&latitude=" + selectedCoordinate[1]
+ "&elementMeasurementTypes[]=TM"
- + "&timeZone=" + this.TIMEZONE
+ + "&timeZone=" + document.getElementById("timezone").value
+ "&startDate=" + heatSumStartDate.format(this.DATE_FORMAT) + "&startTime=0"
+ "&endDate=" + heatSumEndDate.format(this.DATE_FORMAT) + "&endTime=23"
+ "&logIntervalId=2"
@@ -271,7 +268,7 @@ class CydiaPomonella
while(currentDate < today)
{
//console.info("currentDate=" + currentDate.format());
- let nightTemps = this.getNightTempsForDate(moment(currentDate).tz(this.TIMEZONE), hourlyData);
+ let nightTemps = this.getNightTempsForDate(moment(currentDate).tz(this.TIMEZONE_OSLO), hourlyData);
//console.info(nightTemps);
let rowHTML = "<tr><td>" + currentDate.format(this.DATE_FORMAT) + "</td>";
@@ -305,7 +302,7 @@ class CydiaPomonella
getEndDateHourly()
{
- return moment().tz(this.TIMEZONE).hour(12);
+ return moment().tz(this.TIMEZONE_OSLO).hour(12);
}
/**
@@ -338,7 +335,7 @@ class CydiaPomonella
setToTZMidnight(theDate)
{
- return theDate.tz(this.TIMEZONE).hour(0).minute(0).second(0).millisecond(0);
+ return theDate.tz(this.TIMEZONE_OSLO).hour(0).minute(0).second(0).millisecond(0);
}
}
diff --git a/cydiapomonella/templates/cydiapomonella/index.html b/cydiapomonella/templates/cydiapomonella/index.html
index 7b6bb63e..d511bcd9 100644
--- a/cydiapomonella/templates/cydiapomonella/index.html
+++ b/cydiapomonella/templates/cydiapomonella/index.html
@@ -29,13 +29,15 @@ Created: 2024-10-28
{% block extendJS %}
<script type="text/javascript" src="{% static "js/moment.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/moment-timezone-with-data.min.js" %}"></script>
+
<script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
+<script type="text/javascript" src="{% url "views.settings_js" %}"></script>
+<script type="text/javascript" src="{% static "js/util.js" %}"></script>
{% endblock %}
{% block customJS %}
<script type="module">
import CydiaPomonella from "../static/js/cydiapomonella.js";
-
const cydiaPomonella = new CydiaPomonella();
window.onload = (event) => {
cydiaPomonella.renderWeatherstations();
@@ -43,7 +45,6 @@ Created: 2024-10-28
// We need to do it this way to keep the "this" reference of the class
window.runModel = function () {cydiaPomonella.runModel()};
window.runHeatSumCalculations = function () {cydiaPomonella.runHeatSumCalculations();};
-
/* ######## MAP UI FUNCTIONALITY ######### */
@@ -56,8 +57,6 @@ Created: 2024-10-28
document.getElementById("weatherstation").checked = true;
document.getElementById('input-weatherstation').style.display="block";
document.getElementById('input-coordinates').style.display="none";
- inputLatitudeElement.value = ""
- inputLongitudeElement.value = ""
};
window.displayCoordinatesInput = function () {
document.getElementById("coordinates").checked = true;
@@ -76,9 +75,20 @@ Created: 2024-10-28
inputLatitudeElement.value = selectedLatitude;
inputLongitudeElement.value = selectedLongitude;
}
+ getTimezoneForPoint(selectedLatitude, selectedLongitude);
cydiaPomonella.runModel();
}
+ const getTimezoneForPoint = (latitude, longitude) => {
+ getLocationInformation(latitude, longitude).then(locationInfo => {
+ document.getElementById("timezone").value = locationInfo.timezone;
+ document.getElementById("gridPointInfo").innerHTML = `<b>{% trans "Location name" %}</b> ${locationInfo.location}<br>
+ <b>{% trans "Latitude" %}Breddegrad</b> ${locationInfo.latitude}<br>
+ <b>{% trans "Longitude" %}Lengdegrad</b> ${locationInfo.longitude}<br>
+ <b>{% trans "Timezone" %}Tidssone</b> ${locationInfo.timezone}`
+ });
+ }
+
let selectedPoint = null;
let selectedFeature = undefined;
window.openCoordinatesMap = () => {
@@ -157,8 +167,8 @@ Created: 2024-10-28
<div class="row">
<div class="col-md-12">
<h1>{% trans "Calculate the risk of attack by the coddling moth" %}</h1>
- <p>Her kan du sjekke kveldstemperatur og nedbør for værstasjoner i regioner med eplevikler. <a href="https://www.vips-landbruk.no/information/12/#eplevikler">Les mer her</a>. <br> Dersom alle kriteriene for egglegging er oppfylt, beregn påløpt varmesum ved å skrive inn startdato
- nedenfor.</p>
+ <p>{% trans "Check night temps and rainfall for weather stations and locations in regions with coddling moth" %} <a href="https://www.vips-landbruk.no/information/12/#eplevikler">{% trans "Read more" %}</a>. <br>
+ {% trans "If all criteria for oviposition are met, calculate heat sum from start date below." %}</p>
</div>
</div>
@@ -171,29 +181,31 @@ Created: 2024-10-28
<div class="row">
<div class="col-md-6">
<div class="form-group">
- <h4>Jeg vil bruke værdata</h4>
+ <h4>{% trans "I want to use weather data" %}</h4>
<div class="radio">
<label>
- <input type="radio" name="weatherdataType" id="coordinates" value="coordinates" checked onchange="displayCoordinatesInput()">
- for et spesifikt punkt (koordinater)
+ <input type="radio" name="weatherdataType" id="coordinates" value="coordinates" onchange="displayCoordinatesInput()">
+ {% trans "for a specific location (coordinates)" %}
</label>
- <div id="input-coordinates" class="form-inline" style="margin-top: 10px;">
- <input type="text" class="form-control" name="latitude" id="latitude" onchange="runModel()" placeholder="Breddegrad" aria-label="Breddegrad">
- <input type="text" class="form-control" name="longitude" id="longitude" onchange="runModel()" placeholder="Lengdegrad" aria-label="Lengdegrad">
- <button type="button" class="btn btn-primary" onclick="openCoordinatesMap()" style="margin-left: 5px;"><i class="fa fa-map-marker fa-lg"></i> Velg i kart</button>
+ <div id="input-coordinates" class="form-inline" style="margin-top: 10px; display: none;"">
+ <input type="hidden" class="form-control" name="latitude" id="latitude" placeholder="Breddegrad" aria-label="Breddegrad">
+ <input type="hidden" class="form-control" name="longitude" id="longitude" placeholder="Lengdegrad" aria-label="Lengdegrad">
+ <input type="hidden" class="form-control" name="timezone" id="timezone" placeholder="Tidssone" aria-label="Tidssone">
+ <div id="gridPointInfo"></div>
+ <button type="button" class="btn btn-primary" onclick="openCoordinatesMap()" style="margin-left: 5px;"><i class="fa fa-map-marker fa-lg"></i> {% trans "Select in map" %}</button>
</div>
<div id="coordinates-map" class="map-modal"></div>
</div>
<div class="radio">
<label>
- <input type="radio" name="weatherdataType" id="weatherstation" value="weatherstation" onchange="displayWeatherstationInput()">
+ <input type="radio" name="weatherdataType" id="weatherstation" value="weatherstation" checked onchange="displayWeatherstationInput()">
fra en værstasjon
</label>
- <div id="input-weatherstation" class="form-inline" style="margin-top: 10px; display: none;">
+ <div id="input-weatherstation" class="form-inline" style="margin-top: 10px;" >
<select name="weatherStationName" id="weatherStationId" class="form-control" style="width: 60%;" onchange="runModel();">
<option value="-1">-- {% trans "Select weather station" %} --</option>
</select>
- <button type="button" class="btn btn-primary" onclick="openPoiMap()" style="margin-left: 5px;"><i class="fa fa-map-marker fa-lg"></i> Velg i kart</button>
+ <button type="button" class="btn btn-primary" onclick="openPoiMap()" style="margin-left: 5px;"><i class="fa fa-map-marker fa-lg"></i> {% trans "Select in map" %}</button>
</div>
<div id="poi-map" class="map-modal"></div>
</div>
@@ -205,7 +217,7 @@ Created: 2024-10-28
</div>
<div class="col-md-6">
<form>
- <h4>Jeg vil hente data tilbake i tid fra: </h4>
+ <h4>{% trans "I want to get night temperatures and rainfall back in time:" %} </h4>
<label class="radio-inline">
<input type="radio" name="radioDays" value="7" checked onclick="runModel()">7 {% trans "days" %}
</label>
--
GitLab