diff --git a/.gitignore b/.gitignore
index 6eddb66f8da3af4b77f0af2c82e08aed03316bc9..cc038dd95d6c3e09434cff767b94f73614396b07 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ VIPSWeb/local_settings.py
.project
.pydevproject
*.pyc
+*.mo
geckodriver.log
VIPSWeb/static/admin
VIPSWeb/static/test/2012-02-10.kml
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index cc4f3e6ee5316c05b2ee7fcaccb0e5eed7c18ac5..0000000000000000000000000000000000000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//common/util.py=utf-8
-encoding//forecasts/models.py=utf-8
-encoding//information/migrations/0001_initial.py=utf-8
-encoding//vips_messages/migrations/0004_auto_20160712_1001.py=utf-8
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
index 7cf982cc92b55c073e8ebc0392181aa4245dd268..6d931f0aca9f4a0b9c1651402d0d3c56bdab9419 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: 2018-11-22 13:23+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\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,164 +30,172 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.5\n"
-#: local_settings.py:169
+#: VIPSWeb/local_settings.py:170
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:179
+#: VIPSWeb/local_settings.py:181
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:185
+#: VIPSWeb/local_settings.py:187
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:192
+#: VIPSWeb/local_settings.py:194
msgid "Other models and services"
msgstr ""
-#: templates/404.html:3 templates/404.html.py:5
+#: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
msgid "File not found"
msgstr ""
-#: templates/404.html:6
+#: VIPSWeb/templates/404.html:6
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/base.html:59
+#: VIPSWeb/templates/base.html:59
msgid "Toggle navigation"
msgstr "Навигация"
-#: templates/base.html:85
+#: VIPSWeb/templates/base.html:85
msgid "Language"
msgstr ""
-#: templates/base.html:96
+#: VIPSWeb/templates/base.html:96
msgid "Administration"
msgstr ""
-#: templates/base.html:98
+#: VIPSWeb/templates/base.html:98
msgid "Sign out"
msgstr ""
-#: templates/base.html:102
+#: VIPSWeb/templates/base.html:102
msgid "Sign in"
msgstr ""
-#: templates/base.html:119
+#: VIPSWeb/templates/base.html:119
msgid "This is the default page contents."
msgstr "Това е съдържанието на страницата по подразбиране. "
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "This website uses cookies to give you the best possible user experience"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "Got it!"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "More info"
msgstr ""
-#: templates/index.html:25 templates/index_old.html:25
+#: VIPSWeb/templates/index.html:25 VIPSWeb/templates/index_old.html:25
msgid "Welcome"
msgstr "Добре дошли"
-#: templates/index.html:42 templates/index_old.html:42
+#: VIPSWeb/templates/index.html:42 VIPSWeb/templates/index_old.html:42
msgid ""
"WARNING: We recommend using Chrome on Android handsets. Click OK to install "
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:47 templates/index_old.html:47
+#: VIPSWeb/templates/index.html:47
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 "
-"and missing features. Please use a different browser, like Microsoft Edge or "
-"Google Chrome."
+"and missing features. Please use a different browser, like Firefox, "
+"Microsoft Edge or Google Chrome."
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "All observations"
msgstr ""
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Съобщения"
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Съобщения"
-#: templates/index.html:97 templates/index_old.html:97
+#: VIPSWeb/templates/index.html:97 VIPSWeb/templates/index_old.html:97
msgid "Crops"
msgstr ""
-#: templates/index.html:114 templates/index.html.py:152
-#: templates/index_old.html:147
+#: VIPSWeb/templates/index.html:114 VIPSWeb/templates/index.html:152
+#: VIPSWeb/templates/index_old.html:147
msgid "Forecasts"
msgstr "Прогноза"
-#: templates/index.html:115
+#: VIPSWeb/templates/index.html:115
msgid "Observations"
msgstr ""
-#: templates/index.html:119 templates/index_old.html:115
+#: VIPSWeb/templates/index.html:119 VIPSWeb/templates/index_old.html:115
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:120 templates/index_old.html:116
+#: VIPSWeb/templates/index.html:120 VIPSWeb/templates/index_old.html:116
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:121 templates/index_old.html:117
+#: VIPSWeb/templates/index.html:121 VIPSWeb/templates/index_old.html:117
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:122 templates/index_old.html:118
+#: VIPSWeb/templates/index.html:122 VIPSWeb/templates/index_old.html:118
msgid "Missing data"
msgstr ""
-#: templates/index.html:123 templates/index_old.html:119
+#: VIPSWeb/templates/index.html:123 VIPSWeb/templates/index_old.html:119
msgid "No forecast available"
msgstr ""
-#: templates/index.html:145 templates/index_old.html:140
+#: VIPSWeb/templates/index.html:145 VIPSWeb/templates/index_old.html:140
#, fuzzy
#| msgid "Forecasts"
msgid "My forecasts"
msgstr "Прогноза"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Sort by"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Weather station"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Pest"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Model"
msgstr ""
-#: templates/index.html:154 templates/index_old.html:149
+#: VIPSWeb/templates/index.html:154 VIPSWeb/templates/index_old.html:149
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
-#: templatetags/template_helper.py:74
+#: VIPSWeb/templates/index_old.html:47
+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 "
+"and missing features. Please use a different browser, like Microsoft Edge or "
+"Google Chrome."
+msgstr ""
+
+#: VIPSWeb/templatetags/template_helper.py:75
#, fuzzy
msgid "Information"
msgstr "Друго действие"
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
index 09100f273874f0e2244d89a6f94d4c78c05f88ed..b433ee21e318e2bce10e6a9840d177fdbe343fc5 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: 2018-11-22 13:23+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2015-02-13 11:26+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -19,163 +19,171 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: local_settings.py:169
+#: VIPSWeb/local_settings.py:170
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:179
+#: VIPSWeb/local_settings.py:181
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:185
+#: VIPSWeb/local_settings.py:187
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:192
+#: VIPSWeb/local_settings.py:194
msgid "Other models and services"
msgstr ""
-#: templates/404.html:3 templates/404.html.py:5
+#: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
msgid "File not found"
msgstr ""
-#: templates/404.html:6
+#: VIPSWeb/templates/404.html:6
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/base.html:59
+#: VIPSWeb/templates/base.html:59
msgid "Toggle navigation"
msgstr "Prebaci navigaciju "
-#: templates/base.html:85
+#: VIPSWeb/templates/base.html:85
msgid "Language"
msgstr ""
-#: templates/base.html:96
+#: VIPSWeb/templates/base.html:96
msgid "Administration"
msgstr ""
-#: templates/base.html:98
+#: VIPSWeb/templates/base.html:98
msgid "Sign out"
msgstr ""
-#: templates/base.html:102
+#: VIPSWeb/templates/base.html:102
msgid "Sign in"
msgstr ""
-#: templates/base.html:119
+#: VIPSWeb/templates/base.html:119
msgid "This is the default page contents."
msgstr "Ovo je zadani sadržaj stranice "
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "This website uses cookies to give you the best possible user experience"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "Got it!"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "More info"
msgstr ""
-#: templates/index.html:25 templates/index_old.html:25
+#: VIPSWeb/templates/index.html:25 VIPSWeb/templates/index_old.html:25
msgid "Welcome"
msgstr "Dobrodošli "
-#: templates/index.html:42 templates/index_old.html:42
+#: VIPSWeb/templates/index.html:42 VIPSWeb/templates/index_old.html:42
msgid ""
"WARNING: We recommend using Chrome on Android handsets. Click OK to install "
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:47 templates/index_old.html:47
+#: VIPSWeb/templates/index.html:47
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 "
-"and missing features. Please use a different browser, like Microsoft Edge or "
-"Google Chrome."
+"and missing features. Please use a different browser, like Firefox, "
+"Microsoft Edge or Google Chrome."
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "All observations"
msgstr ""
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Poruke"
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Poruke"
-#: templates/index.html:97 templates/index_old.html:97
+#: VIPSWeb/templates/index.html:97 VIPSWeb/templates/index_old.html:97
msgid "Crops"
msgstr "Usjevi "
-#: templates/index.html:114 templates/index.html.py:152
-#: templates/index_old.html:147
+#: VIPSWeb/templates/index.html:114 VIPSWeb/templates/index.html:152
+#: VIPSWeb/templates/index_old.html:147
msgid "Forecasts"
msgstr "Prognoze "
-#: templates/index.html:115
+#: VIPSWeb/templates/index.html:115
msgid "Observations"
msgstr ""
-#: templates/index.html:119 templates/index_old.html:115
+#: VIPSWeb/templates/index.html:119 VIPSWeb/templates/index_old.html:115
msgid "High risk of infection"
msgstr "Visok rizik infekcije"
-#: templates/index.html:120 templates/index_old.html:116
+#: VIPSWeb/templates/index.html:120 VIPSWeb/templates/index_old.html:116
msgid "Medium risk of infection"
msgstr "Srednji rizik infekcije"
-#: templates/index.html:121 templates/index_old.html:117
+#: VIPSWeb/templates/index.html:121 VIPSWeb/templates/index_old.html:117
msgid "No risk of infection"
msgstr "Bez rizika infekcije"
-#: templates/index.html:122 templates/index_old.html:118
+#: VIPSWeb/templates/index.html:122 VIPSWeb/templates/index_old.html:118
msgid "Missing data"
msgstr "Podaci nedostaju"
-#: templates/index.html:123 templates/index_old.html:119
+#: VIPSWeb/templates/index.html:123 VIPSWeb/templates/index_old.html:119
msgid "No forecast available"
msgstr "Prognoza nije dostupna"
-#: templates/index.html:145 templates/index_old.html:140
+#: VIPSWeb/templates/index.html:145 VIPSWeb/templates/index_old.html:140
#, fuzzy
#| msgid "Forecasts"
msgid "My forecasts"
msgstr "Prognoze "
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Sort by"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Weather station"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Pest"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Model"
msgstr ""
-#: templates/index.html:154 templates/index_old.html:149
+#: VIPSWeb/templates/index.html:154 VIPSWeb/templates/index_old.html:149
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
-#: templatetags/template_helper.py:74
+#: VIPSWeb/templates/index_old.html:47
+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 "
+"and missing features. Please use a different browser, like Microsoft Edge or "
+"Google Chrome."
+msgstr ""
+
+#: VIPSWeb/templatetags/template_helper.py:75
msgid "Information"
msgstr ""
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.po b/VIPSWeb/locale/de/LC_MESSAGES/django.po
index e12bebdcf0a0347f3a780ae244d59b817d930bc7..84d16fe982e094e8e2afbfbd6564079e3ca3f0f7 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: 2018-11-22 13:23+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,157 +18,165 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:169
+#: VIPSWeb/local_settings.py:170
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:179
+#: VIPSWeb/local_settings.py:181
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:185
+#: VIPSWeb/local_settings.py:187
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:192
+#: VIPSWeb/local_settings.py:194
msgid "Other models and services"
msgstr ""
-#: templates/404.html:3 templates/404.html.py:5
+#: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
msgid "File not found"
msgstr ""
-#: templates/404.html:6
+#: VIPSWeb/templates/404.html:6
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/base.html:59
+#: VIPSWeb/templates/base.html:59
msgid "Toggle navigation"
msgstr ""
-#: templates/base.html:85
+#: VIPSWeb/templates/base.html:85
msgid "Language"
msgstr ""
-#: templates/base.html:96
+#: VIPSWeb/templates/base.html:96
msgid "Administration"
msgstr ""
-#: templates/base.html:98
+#: VIPSWeb/templates/base.html:98
msgid "Sign out"
msgstr ""
-#: templates/base.html:102
+#: VIPSWeb/templates/base.html:102
msgid "Sign in"
msgstr ""
-#: templates/base.html:119
+#: VIPSWeb/templates/base.html:119
msgid "This is the default page contents."
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "This website uses cookies to give you the best possible user experience"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "Got it!"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "More info"
msgstr ""
-#: templates/index.html:25 templates/index_old.html:25
+#: VIPSWeb/templates/index.html:25 VIPSWeb/templates/index_old.html:25
msgid "Welcome"
msgstr ""
-#: templates/index.html:42 templates/index_old.html:42
+#: VIPSWeb/templates/index.html:42 VIPSWeb/templates/index_old.html:42
msgid ""
"WARNING: We recommend using Chrome on Android handsets. Click OK to install "
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:47 templates/index_old.html:47
+#: VIPSWeb/templates/index.html:47
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 "
-"and missing features. Please use a different browser, like Microsoft Edge or "
-"Google Chrome."
+"and missing features. Please use a different browser, like Firefox, "
+"Microsoft Edge or Google Chrome."
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "All observations"
msgstr ""
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
msgid "Latest messages"
msgstr ""
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
msgid "All messages"
msgstr ""
-#: templates/index.html:97 templates/index_old.html:97
+#: VIPSWeb/templates/index.html:97 VIPSWeb/templates/index_old.html:97
msgid "Crops"
msgstr ""
-#: templates/index.html:114 templates/index.html.py:152
-#: templates/index_old.html:147
+#: VIPSWeb/templates/index.html:114 VIPSWeb/templates/index.html:152
+#: VIPSWeb/templates/index_old.html:147
msgid "Forecasts"
msgstr ""
-#: templates/index.html:115
+#: VIPSWeb/templates/index.html:115
msgid "Observations"
msgstr ""
-#: templates/index.html:119 templates/index_old.html:115
+#: VIPSWeb/templates/index.html:119 VIPSWeb/templates/index_old.html:115
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:120 templates/index_old.html:116
+#: VIPSWeb/templates/index.html:120 VIPSWeb/templates/index_old.html:116
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:121 templates/index_old.html:117
+#: VIPSWeb/templates/index.html:121 VIPSWeb/templates/index_old.html:117
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:122 templates/index_old.html:118
+#: VIPSWeb/templates/index.html:122 VIPSWeb/templates/index_old.html:118
msgid "Missing data"
msgstr ""
-#: templates/index.html:123 templates/index_old.html:119
+#: VIPSWeb/templates/index.html:123 VIPSWeb/templates/index_old.html:119
msgid "No forecast available"
msgstr ""
-#: templates/index.html:145 templates/index_old.html:140
+#: VIPSWeb/templates/index.html:145 VIPSWeb/templates/index_old.html:140
msgid "My forecasts"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Sort by"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Weather station"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Pest"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Model"
msgstr ""
-#: templates/index.html:154 templates/index_old.html:149
+#: VIPSWeb/templates/index.html:154 VIPSWeb/templates/index_old.html:149
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
-#: templatetags/template_helper.py:74
+#: VIPSWeb/templates/index_old.html:47
+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 "
+"and missing features. Please use a different browser, like Microsoft Edge or "
+"Google Chrome."
+msgstr ""
+
+#: VIPSWeb/templatetags/template_helper.py:75
msgid "Information"
msgstr ""
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.po b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
index 4b51feb2bb73fdcbef0094b94079ee66a77ba079..b328de14302d4f254139be4e13311857cb5afe87 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: 2018-11-22 13:23+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,163 +18,171 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:169
+#: VIPSWeb/local_settings.py:170
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:179
+#: VIPSWeb/local_settings.py:181
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:185
+#: VIPSWeb/local_settings.py:187
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:192
+#: VIPSWeb/local_settings.py:194
msgid "Other models and services"
msgstr ""
-#: templates/404.html:3 templates/404.html.py:5
+#: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
msgid "File not found"
msgstr ""
-#: templates/404.html:6
+#: VIPSWeb/templates/404.html:6
msgid "We are sorry, but the requested file was not found"
msgstr ""
-#: templates/base.html:59
+#: VIPSWeb/templates/base.html:59
msgid "Toggle navigation"
msgstr ""
-#: templates/base.html:85
+#: VIPSWeb/templates/base.html:85
msgid "Language"
msgstr ""
-#: templates/base.html:96
+#: VIPSWeb/templates/base.html:96
msgid "Administration"
msgstr ""
-#: templates/base.html:98
+#: VIPSWeb/templates/base.html:98
msgid "Sign out"
msgstr ""
-#: templates/base.html:102
+#: VIPSWeb/templates/base.html:102
msgid "Sign in"
msgstr ""
-#: templates/base.html:119
+#: VIPSWeb/templates/base.html:119
msgid "This is the default page contents."
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "This website uses cookies to give you the best possible user experience"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "Got it!"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "More info"
msgstr ""
-#: templates/index.html:25 templates/index_old.html:25
+#: VIPSWeb/templates/index.html:25 VIPSWeb/templates/index_old.html:25
msgid "Welcome"
msgstr "Tervetuloa"
-#: templates/index.html:42 templates/index_old.html:42
+#: VIPSWeb/templates/index.html:42 VIPSWeb/templates/index_old.html:42
msgid ""
"WARNING: We recommend using Chrome on Android handsets. Click OK to install "
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:47 templates/index_old.html:47
+#: VIPSWeb/templates/index.html:47
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 "
-"and missing features. Please use a different browser, like Microsoft Edge or "
-"Google Chrome."
+"and missing features. Please use a different browser, like Firefox, "
+"Microsoft Edge or Google Chrome."
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "All observations"
msgstr ""
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Viestit"
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Viestit"
-#: templates/index.html:97 templates/index_old.html:97
+#: VIPSWeb/templates/index.html:97 VIPSWeb/templates/index_old.html:97
msgid "Crops"
msgstr "Sato"
-#: templates/index.html:114 templates/index.html.py:152
-#: templates/index_old.html:147
+#: VIPSWeb/templates/index.html:114 VIPSWeb/templates/index.html:152
+#: VIPSWeb/templates/index_old.html:147
msgid "Forecasts"
msgstr "Hälytykset"
-#: templates/index.html:115
+#: VIPSWeb/templates/index.html:115
msgid "Observations"
msgstr ""
-#: templates/index.html:119 templates/index_old.html:115
+#: VIPSWeb/templates/index.html:119 VIPSWeb/templates/index_old.html:115
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:120 templates/index_old.html:116
+#: VIPSWeb/templates/index.html:120 VIPSWeb/templates/index_old.html:116
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:121 templates/index_old.html:117
+#: VIPSWeb/templates/index.html:121 VIPSWeb/templates/index_old.html:117
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:122 templates/index_old.html:118
+#: VIPSWeb/templates/index.html:122 VIPSWeb/templates/index_old.html:118
msgid "Missing data"
msgstr ""
-#: templates/index.html:123 templates/index_old.html:119
+#: VIPSWeb/templates/index.html:123 VIPSWeb/templates/index_old.html:119
msgid "No forecast available"
msgstr ""
-#: templates/index.html:145 templates/index_old.html:140
+#: VIPSWeb/templates/index.html:145 VIPSWeb/templates/index_old.html:140
#, fuzzy
#| msgid "Forecasts"
msgid "My forecasts"
msgstr "Hälytykset"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Sort by"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Weather station"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Pest"
msgstr ""
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Model"
msgstr ""
-#: templates/index.html:154 templates/index_old.html:149
+#: VIPSWeb/templates/index.html:154 VIPSWeb/templates/index_old.html:149
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
-#: templatetags/template_helper.py:74
+#: VIPSWeb/templates/index_old.html:47
+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 "
+"and missing features. Please use a different browser, like Microsoft Edge or "
+"Google Chrome."
+msgstr ""
+
+#: VIPSWeb/templatetags/template_helper.py:75
msgid "Information"
msgstr ""
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
index a9b16caa82b2044288c603d7cc9dbbb678331d97..468f7dec72762ab0a7408f66883351a725f9c75e 100755
--- a/VIPSWeb/locale/nb/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPSWeb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-22 13:23+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2013-11-07 20:18+0200\n"
"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,71 +30,71 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: local_settings.py:169
+#: VIPSWeb/local_settings.py:170
msgid "Cereals and oilseeds"
msgstr "Korn og oljevekster"
-#: local_settings.py:179
+#: VIPSWeb/local_settings.py:181
msgid "Potato and vegetables"
msgstr "Poteter og grønnsaker"
-#: local_settings.py:185
+#: VIPSWeb/local_settings.py:187
msgid "Fruits and berries"
msgstr "Frukt og bær"
-#: local_settings.py:192
+#: VIPSWeb/local_settings.py:194
msgid "Other models and services"
msgstr "Andre modeller og tjenester"
-#: templates/404.html:3 templates/404.html.py:5
+#: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
msgid "File not found"
msgstr "Fil ikke funnet"
-#: templates/404.html:6
+#: VIPSWeb/templates/404.html:6
msgid "We are sorry, but the requested file was not found"
msgstr "Beklager, men den etterspurte filen ble ikke funnet"
-#: templates/base.html:59
+#: VIPSWeb/templates/base.html:59
msgid "Toggle navigation"
msgstr "Vis/skjul navigasjon"
-#: templates/base.html:85
+#: VIPSWeb/templates/base.html:85
msgid "Language"
msgstr "Språk"
-#: templates/base.html:96
+#: VIPSWeb/templates/base.html:96
msgid "Administration"
msgstr "Administrasjon"
-#: templates/base.html:98
+#: VIPSWeb/templates/base.html:98
msgid "Sign out"
msgstr "Logg ut"
-#: templates/base.html:102
+#: VIPSWeb/templates/base.html:102
msgid "Sign in"
msgstr "Logg inn"
-#: templates/base.html:119
+#: VIPSWeb/templates/base.html:119
msgid "This is the default page contents."
msgstr "Dette er standardinnholdet på siden"
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "This website uses cookies to give you the best possible user experience"
msgstr "Denne websiden bruker cookies for å gi deg en god brukeropplevelse"
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "Got it!"
msgstr "Skjønner!"
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "More info"
msgstr "Mer informasjon"
-#: templates/index.html:25 templates/index_old.html:25
+#: VIPSWeb/templates/index.html:25 VIPSWeb/templates/index_old.html:25
msgid "Welcome"
msgstr "Velkommen"
-#: templates/index.html:42 templates/index_old.html:42
+#: VIPSWeb/templates/index.html:42 VIPSWeb/templates/index_old.html:42
msgid ""
"WARNING: We recommend using Chrome on Android handsets. Click OK to install "
"Chrome, or Cancel to proceed without installing Chrome."
@@ -103,93 +103,111 @@ msgstr ""
"OK for å installere Chrome, eller Cancel for å fortsette uten å installere "
"Chrome."
-#: templates/index.html:47 templates/index_old.html:47
+#: VIPSWeb/templates/index.html:47
+#, fuzzy
+#| 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 and missing features. Please use a different browser, like "
+#| "Microsoft Edge or Google Chrome."
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 "
-"and missing features. Please use a different browser, like Microsoft Edge or "
-"Google Chrome."
+"and missing features. Please use a different browser, like Firefox, "
+"Microsoft Edge or Google Chrome."
msgstr ""
"ADVARSEL: Det ser ut som du bruker Internet Explorer på denne websiden. VIPS "
"er ikke designet for å fungere med Internet Explorer, så du må forvente feil "
"og manglende funksjonalitet. Vennligst bruk en moderne nettleser som "
"Microsoft Edge, Firefox eller Google Chrome."
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "Surveillance and first observations"
msgstr "Overvåkning og førstefunn"
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "All observations"
msgstr "Alle observasjoner"
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
msgid "Latest messages"
msgstr "Siste meldinger"
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
msgid "All messages"
msgstr "Alle meldinger"
-#: templates/index.html:97 templates/index_old.html:97
+#: VIPSWeb/templates/index.html:97 VIPSWeb/templates/index_old.html:97
msgid "Crops"
msgstr "Kulturer"
-#: templates/index.html:114 templates/index.html.py:152
-#: templates/index_old.html:147
+#: VIPSWeb/templates/index.html:114 VIPSWeb/templates/index.html:152
+#: VIPSWeb/templates/index_old.html:147
msgid "Forecasts"
msgstr "Varsler"
-#: templates/index.html:115
+#: VIPSWeb/templates/index.html:115
#, fuzzy
#| msgid "All observations"
msgid "Observations"
msgstr "Alle observasjoner"
-#: templates/index.html:119 templates/index_old.html:115
+#: VIPSWeb/templates/index.html:119 VIPSWeb/templates/index_old.html:115
msgid "High risk of infection"
msgstr "Fare for angrep"
-#: templates/index.html:120 templates/index_old.html:116
+#: VIPSWeb/templates/index.html:120 VIPSWeb/templates/index_old.html:116
msgid "Medium risk of infection"
msgstr "Mulig fare for angrep"
-#: templates/index.html:121 templates/index_old.html:117
+#: VIPSWeb/templates/index.html:121 VIPSWeb/templates/index_old.html:117
msgid "No risk of infection"
msgstr "Ingen fare for angrep"
-#: templates/index.html:122 templates/index_old.html:118
+#: VIPSWeb/templates/index.html:122 VIPSWeb/templates/index_old.html:118
msgid "Missing data"
msgstr "Data mangler"
-#: templates/index.html:123 templates/index_old.html:119
+#: VIPSWeb/templates/index.html:123 VIPSWeb/templates/index_old.html:119
msgid "No forecast available"
msgstr "Varsel beregnes ikke"
-#: templates/index.html:145 templates/index_old.html:140
+#: VIPSWeb/templates/index.html:145 VIPSWeb/templates/index_old.html:140
msgid "My forecasts"
msgstr "Mine varsler"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Sort by"
msgstr "Sorter etter"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Weather station"
msgstr "Målestasjon"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Pest"
msgstr "Skadegjører"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Model"
msgstr "Modell"
-#: templates/index.html:154 templates/index_old.html:149
+#: VIPSWeb/templates/index.html:154 VIPSWeb/templates/index_old.html:149
msgid "Select crops or zoom in to see list of forecasts"
msgstr "Velg kultur eller zoom inn for å se liste over varsler"
-#: templatetags/template_helper.py:74
+#: VIPSWeb/templates/index_old.html:47
+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 "
+"and missing features. Please use a different browser, like Microsoft Edge or "
+"Google Chrome."
+msgstr ""
+"ADVARSEL: Det ser ut som du bruker Internet Explorer på denne websiden. VIPS "
+"er ikke designet for å fungere med Internet Explorer, så du må forvente feil "
+"og manglende funksjonalitet. Vennligst bruk en moderne nettleser som "
+"Microsoft Edge, Firefox eller Google Chrome."
+
+#: VIPSWeb/templatetags/template_helper.py:75
msgid "Information"
msgstr "Informasjon"
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.po b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
index e207d6b0e3e4597720c3a452a2b351b8d5e276f7..968e6015e162c047e76d76b1da75af79d77a3b34 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: 2018-11-22 13:23+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,164 +18,172 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: local_settings.py:169
+#: VIPSWeb/local_settings.py:170
msgid "Cereals and oilseeds"
msgstr ""
-#: local_settings.py:179
+#: VIPSWeb/local_settings.py:181
msgid "Potato and vegetables"
msgstr ""
-#: local_settings.py:185
+#: VIPSWeb/local_settings.py:187
msgid "Fruits and berries"
msgstr ""
-#: local_settings.py:192
+#: VIPSWeb/local_settings.py:194
msgid "Other models and services"
msgstr ""
-#: templates/404.html:3 templates/404.html.py:5
+#: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
msgid "File not found"
msgstr "File không tìm thấy"
-#: templates/404.html:6
+#: VIPSWeb/templates/404.html:6
msgid "We are sorry, but the requested file was not found"
msgstr "Chúng tôi rất xin lỗi, nhưng các tập tin yêu cầu không được tìm thấy"
-#: templates/base.html:59
+#: VIPSWeb/templates/base.html:59
msgid "Toggle navigation"
msgstr "chuyển hướng toggle"
-#: templates/base.html:85
+#: VIPSWeb/templates/base.html:85
msgid "Language"
msgstr ""
-#: templates/base.html:96
+#: VIPSWeb/templates/base.html:96
msgid "Administration"
msgstr ""
-#: templates/base.html:98
+#: VIPSWeb/templates/base.html:98
#, fuzzy
#| msgid "Sign in"
msgid "Sign out"
msgstr "Đăng nhập"
-#: templates/base.html:102
+#: VIPSWeb/templates/base.html:102
msgid "Sign in"
msgstr "Đăng nhập"
-#: templates/base.html:119
+#: VIPSWeb/templates/base.html:119
msgid "This is the default page contents."
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "This website uses cookies to give you the best possible user experience"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "Got it!"
msgstr ""
-#: templates/base.html:146
+#: VIPSWeb/templates/base.html:146
msgid "More info"
msgstr ""
-#: templates/index.html:25 templates/index_old.html:25
+#: VIPSWeb/templates/index.html:25 VIPSWeb/templates/index_old.html:25
msgid "Welcome"
msgstr "Chào mừng"
-#: templates/index.html:42 templates/index_old.html:42
+#: VIPSWeb/templates/index.html:42 VIPSWeb/templates/index_old.html:42
msgid ""
"WARNING: We recommend using Chrome on Android handsets. Click OK to install "
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:47 templates/index_old.html:47
+#: VIPSWeb/templates/index.html:47
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 "
-"and missing features. Please use a different browser, like Microsoft Edge or "
-"Google Chrome."
+"and missing features. Please use a different browser, like Firefox, "
+"Microsoft Edge or Google Chrome."
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:78 templates/index_old.html:78
+#: VIPSWeb/templates/index.html:78 VIPSWeb/templates/index_old.html:78
msgid "All observations"
msgstr ""
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Tin nhắn"
-#: templates/index.html:84 templates/index_old.html:84
+#: VIPSWeb/templates/index.html:84 VIPSWeb/templates/index_old.html:84
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Tin nhắn"
-#: templates/index.html:97 templates/index_old.html:97
+#: VIPSWeb/templates/index.html:97 VIPSWeb/templates/index_old.html:97
msgid "Crops"
msgstr "mùa gặt"
-#: templates/index.html:114 templates/index.html.py:152
-#: templates/index_old.html:147
+#: VIPSWeb/templates/index.html:114 VIPSWeb/templates/index.html:152
+#: VIPSWeb/templates/index_old.html:147
msgid "Forecasts"
msgstr "dự báo"
-#: templates/index.html:115
+#: VIPSWeb/templates/index.html:115
msgid "Observations"
msgstr ""
-#: templates/index.html:119 templates/index_old.html:115
+#: VIPSWeb/templates/index.html:119 VIPSWeb/templates/index_old.html:115
msgid "High risk of infection"
msgstr "Nguy cơ lây nhiễm cao"
-#: templates/index.html:120 templates/index_old.html:116
+#: VIPSWeb/templates/index.html:120 VIPSWeb/templates/index_old.html:116
msgid "Medium risk of infection"
msgstr "Rủi ro trung bình của nhiễm trùng"
-#: templates/index.html:121 templates/index_old.html:117
+#: VIPSWeb/templates/index.html:121 VIPSWeb/templates/index_old.html:117
msgid "No risk of infection"
msgstr "Không có nguy cơ lây nhiễm"
-#: templates/index.html:122 templates/index_old.html:118
+#: VIPSWeb/templates/index.html:122 VIPSWeb/templates/index_old.html:118
msgid "Missing data"
msgstr "Dữ liệu bị mất"
-#: templates/index.html:123 templates/index_old.html:119
+#: VIPSWeb/templates/index.html:123 VIPSWeb/templates/index_old.html:119
msgid "No forecast available"
msgstr "Không dự báo có sẵn"
-#: templates/index.html:145 templates/index_old.html:140
+#: VIPSWeb/templates/index.html:145 VIPSWeb/templates/index_old.html:140
msgid "My forecasts"
msgstr "dự báo của tôi"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Sort by"
msgstr "Sắp xếp theo"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Weather station"
msgstr "Trạm thời tiết"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Pest"
msgstr "côn trùng"
-#: templates/index.html:153 templates/index_old.html:148
+#: VIPSWeb/templates/index.html:153 VIPSWeb/templates/index_old.html:148
msgid "Model"
msgstr "Kiểu mẫu"
-#: templates/index.html:154 templates/index_old.html:149
+#: VIPSWeb/templates/index.html:154 VIPSWeb/templates/index_old.html:149
msgid "Select crops or zoom in to see list of forecasts"
msgstr "Chọn cây trồng hoặc phóng to để xem danh sách các dự báo"
-#: templatetags/template_helper.py:74
+#: VIPSWeb/templates/index_old.html:47
+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 "
+"and missing features. Please use a different browser, like Microsoft Edge or "
+"Google Chrome."
+msgstr ""
+
+#: VIPSWeb/templatetags/template_helper.py:75
msgid "Information"
msgstr "Thông tin"
diff --git a/VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po b/VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po
index 06b2da9bdbba435159b52b821416f5fc00357218..87085f893d7eae8ee287267342c8eded1e66b745 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: 2019-06-20 10:32+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2019-06-24 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,19 +17,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
-#: VIPSWeb/local_settings.py:169
+#: VIPSWeb/local_settings.py:170
msgid "Cereals and oilseeds"
msgstr "谷物和油籽"
-#: VIPSWeb/local_settings.py:179
+#: VIPSWeb/local_settings.py:181
msgid "Potato and vegetables"
msgstr "土豆和蔬菜"
-#: VIPSWeb/local_settings.py:185
+#: VIPSWeb/local_settings.py:187
msgid "Fruits and berries"
msgstr "水果和浆果"
-#: VIPSWeb/local_settings.py:192
+#: VIPSWeb/local_settings.py:194
msgid "Other models and services"
msgstr "其他模型和服务"
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index 835289b28289f270b84d9182fb4b7672030b2cb4..a2a4db4f40542c321faa3353e987b4ff09c6d609 100755
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -282,6 +282,11 @@ div.alert-nowarning{
background-color: #dddddd;
}
+div.alert-success{
+ background-color: #79bd8b;
+ color: black;
+}
+
/*
.ol-attribution {
top: 5px;
diff --git a/cerealblotchmodels/locale/de/LC_MESSAGES/django.mo b/applefruitmoth/locale/bg/LC_MESSAGES/django.mo
old mode 100755
new mode 100644
similarity index 100%
rename from cerealblotchmodels/locale/de/LC_MESSAGES/django.mo
rename to applefruitmoth/locale/bg/LC_MESSAGES/django.mo
diff --git a/applefruitmoth/locale/bg/LC_MESSAGES/django.po b/applefruitmoth/locale/bg/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..e8a4cfd3011131941a04819d197d0a2488cc5ce7
--- /dev/null
+++ b/applefruitmoth/locale/bg/LC_MESSAGES/django.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: applefruitmoth/templates/applefruitmoth/index.html:25
+#: applefruitmoth/templates/applefruitmoth/index.html:27
+msgid "Apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:32
+msgid "Description of apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:33
+msgid "Messages"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:59
+msgid "High risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:60
+msgid "Medium risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:61
+msgid "No risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:62
+msgid "Forecast not ready"
+msgstr ""
diff --git a/applefruitmoth/locale/bs/LC_MESSAGES/django.mo b/applefruitmoth/locale/bs/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d2d31a4fd72f68dc53c29f8a8b14d56d933f3e63
Binary files /dev/null and b/applefruitmoth/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/applefruitmoth/locale/bs/LC_MESSAGES/django.po b/applefruitmoth/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..ec1d5b723899e5d04e05c05b42e4290deebdb089
--- /dev/null
+++ b/applefruitmoth/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: applefruitmoth/templates/applefruitmoth/index.html:25
+#: applefruitmoth/templates/applefruitmoth/index.html:27
+msgid "Apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:32
+msgid "Description of apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:33
+msgid "Messages"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:59
+msgid "High risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:60
+msgid "Medium risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:61
+msgid "No risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:62
+msgid "Forecast not ready"
+msgstr ""
diff --git a/applefruitmoth/locale/de/LC_MESSAGES/django.po b/applefruitmoth/locale/de/LC_MESSAGES/django.po
index 9f73a469ef0697b5b389a97c1990c19f09e551a0..caa58b3efc11b097b4d5d8297104b1725c7f1d82 100755
--- a/applefruitmoth/locale/de/LC_MESSAGES/django.po
+++ b/applefruitmoth/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: 2016-09-28 13:03-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,31 +18,31 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/applefruitmoth/index.html:25
-#: templates/applefruitmoth/index.html:27
+#: applefruitmoth/templates/applefruitmoth/index.html:25
+#: applefruitmoth/templates/applefruitmoth/index.html:27
msgid "Apple fruit moth forecasting"
msgstr ""
-#: templates/applefruitmoth/index.html:32
+#: applefruitmoth/templates/applefruitmoth/index.html:32
msgid "Description of apple fruit moth forecasting"
msgstr ""
-#: templates/applefruitmoth/index.html:33
+#: applefruitmoth/templates/applefruitmoth/index.html:33
msgid "Messages"
msgstr ""
-#: templates/applefruitmoth/index.html:59
+#: applefruitmoth/templates/applefruitmoth/index.html:59
msgid "High risk of infection"
msgstr ""
-#: templates/applefruitmoth/index.html:60
+#: applefruitmoth/templates/applefruitmoth/index.html:60
msgid "Medium risk of infection"
msgstr ""
-#: templates/applefruitmoth/index.html:61
+#: applefruitmoth/templates/applefruitmoth/index.html:61
msgid "No risk of infection"
msgstr ""
-#: templates/applefruitmoth/index.html:62
+#: applefruitmoth/templates/applefruitmoth/index.html:62
msgid "Forecast not ready"
msgstr ""
diff --git a/applefruitmoth/locale/fi/LC_MESSAGES/django.mo b/applefruitmoth/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/applefruitmoth/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/applefruitmoth/locale/fi/LC_MESSAGES/django.po b/applefruitmoth/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..e8a4cfd3011131941a04819d197d0a2488cc5ce7
--- /dev/null
+++ b/applefruitmoth/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: applefruitmoth/templates/applefruitmoth/index.html:25
+#: applefruitmoth/templates/applefruitmoth/index.html:27
+msgid "Apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:32
+msgid "Description of apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:33
+msgid "Messages"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:59
+msgid "High risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:60
+msgid "Medium risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:61
+msgid "No risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:62
+msgid "Forecast not ready"
+msgstr ""
diff --git a/applefruitmoth/locale/nb/LC_MESSAGES/django.po b/applefruitmoth/locale/nb/LC_MESSAGES/django.po
index 78f0e8a6700638238878fc9dbb513171f2cffbf0..1ee4b8090955bcd1e4381ecb7145879aef17bc82 100755
--- a/applefruitmoth/locale/nb/LC_MESSAGES/django.po
+++ b/applefruitmoth/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-14 09:50+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,33 +18,46 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/applefruitmoth/index.html:25
-#: templates/applefruitmoth/index.html:27
+#: applefruitmoth/templates/applefruitmoth/index.html:25
+#: applefruitmoth/templates/applefruitmoth/index.html:27
msgid "Apple fruit moth forecasting"
msgstr "Rognebærmøllvarsling"
-#: templates/applefruitmoth/index.html:32
+#: applefruitmoth/templates/applefruitmoth/index.html:32
msgid "Description of apple fruit moth forecasting"
-msgstr "<p>Rognebærmøllvarslingen er et samarbeid mellom lokale rådgivere i fruktdistriktene og NIBIO. I august måned teller de lokale rådgiverne antall bærklaser på merka referansetrær av rogn. De høster samtidig en bærprøve som sendes til NIBIO. Fra denne bærprøven finner vi angrepsgrad av rognebærmøll i rogn for hver prognosestasjon. Det beregnes også andel parasitterte rognebærmøll. Ut i fra denne informasjonen kan mengden rognebærmøll som overvintrer anslås. Følgende vår telles antall blomsterklaser på de samme referansetrærne, og vi kan så regne ut varselet. Er det nok blomsterklaser på våren i forhold til antallet møll som har overvintret, vil rognebærmøllen holde seg til rogn og det blir ikke angrep. Bare hvis det blir for lite bær på rogna vil møllen angripe eple. Du kan lese mer om rognebærmøll i <a href=\"http://leksikon.nibio.no/vieworganism.php?organismId=1_276\" target=\"new\">Plantevernleksikonet</a>.</p>"
-"<p>Varmesum og nedbørsmengde finner du <a href=\"http://gamlevips.nibio.no/weather/we707s.jsp\" target=\"new\">her</a></p>"
-
-#: templates/applefruitmoth/index.html:33
+msgstr ""
+"<p>Rognebærmøllvarslingen er et samarbeid mellom lokale rådgivere i "
+"fruktdistriktene og NIBIO. I august måned teller de lokale rådgiverne antall "
+"bærklaser på merka referansetrær av rogn. De høster samtidig en bærprøve som "
+"sendes til NIBIO. Fra denne bærprøven finner vi angrepsgrad av rognebærmøll "
+"i rogn for hver prognosestasjon. Det beregnes også andel parasitterte "
+"rognebærmøll. Ut i fra denne informasjonen kan mengden rognebærmøll som "
+"overvintrer anslås. Følgende vår telles antall blomsterklaser på de samme "
+"referansetrærne, og vi kan så regne ut varselet. Er det nok blomsterklaser "
+"på våren i forhold til antallet møll som har overvintret, vil rognebærmøllen "
+"holde seg til rogn og det blir ikke angrep. Bare hvis det blir for lite bær "
+"på rogna vil møllen angripe eple. Du kan lese mer om rognebærmøll i <a href="
+"\"http://leksikon.nibio.no/vieworganism.php?organismId=1_276\" target=\"new"
+"\">Plantevernleksikonet</a>.</p><p>Varmesum og nedbørsmengde finner du <a "
+"href=\"http://gamlevips.nibio.no/weather/we707s.jsp\" target=\"new\">her</"
+"a></p>"
+
+#: applefruitmoth/templates/applefruitmoth/index.html:33
msgid "Messages"
msgstr "Meldinger"
-#: templates/applefruitmoth/index.html:59
+#: applefruitmoth/templates/applefruitmoth/index.html:59
msgid "High risk of infection"
msgstr "Fare for angrep"
-#: templates/applefruitmoth/index.html:60
+#: applefruitmoth/templates/applefruitmoth/index.html:60
msgid "Medium risk of infection"
msgstr "Mulig fare for angrep"
-#: templates/applefruitmoth/index.html:61
+#: applefruitmoth/templates/applefruitmoth/index.html:61
msgid "No risk of infection"
msgstr "Ingen fare for angrep"
-#: templates/applefruitmoth/index.html:62
+#: applefruitmoth/templates/applefruitmoth/index.html:62
msgid "Forecast not ready"
msgstr "Varsel ikke beregnet"
-
diff --git a/applefruitmoth/locale/vi/LC_MESSAGES/django.mo b/applefruitmoth/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/applefruitmoth/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/applefruitmoth/locale/vi/LC_MESSAGES/django.po b/applefruitmoth/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..731a4dc8451caed408b4f9395d74af5683bc1762
--- /dev/null
+++ b/applefruitmoth/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: applefruitmoth/templates/applefruitmoth/index.html:25
+#: applefruitmoth/templates/applefruitmoth/index.html:27
+msgid "Apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:32
+msgid "Description of apple fruit moth forecasting"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:33
+msgid "Messages"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:59
+msgid "High risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:60
+msgid "Medium risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:61
+msgid "No risk of infection"
+msgstr ""
+
+#: applefruitmoth/templates/applefruitmoth/index.html:62
+msgid "Forecast not ready"
+msgstr ""
diff --git a/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.mo b/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.mo
index 88aec1f6120091106e50d53ee550cbebff9f56d5..ced71181b062f347caa6c56942ec199cd5716197 100644
Binary files a/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.mo and b/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.mo differ
diff --git a/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.po b/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.po
index 8f6a95da099ffc722d9ce9e1c2fba77d2329afde..28a394ea5dd400e9c6a30c20874f786e72d76b11 100755
--- a/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,42 +7,42 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-11-03 13:50+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
"Language: zh_Hans\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Last-Translator: \n"
-"Language-Team: \n"
"X-Generator: Poedit 1.8.7\n"
-#: templates/applefruitmoth/index.html:25
-#: templates/applefruitmoth/index.html:27
+#: applefruitmoth/templates/applefruitmoth/index.html:25
+#: applefruitmoth/templates/applefruitmoth/index.html:27
msgid "Apple fruit moth forecasting"
msgstr "花揪巢蛾预报"
-#: templates/applefruitmoth/index.html:32
+#: applefruitmoth/templates/applefruitmoth/index.html:32
msgid "Description of apple fruit moth forecasting"
msgstr "花揪巢蛾预报的描述"
-#: templates/applefruitmoth/index.html:33
+#: applefruitmoth/templates/applefruitmoth/index.html:33
msgid "Messages"
msgstr "信息"
-#: templates/applefruitmoth/index.html:59
+#: applefruitmoth/templates/applefruitmoth/index.html:59
msgid "High risk of infection"
msgstr "感染的高风险"
-#: templates/applefruitmoth/index.html:60
+#: applefruitmoth/templates/applefruitmoth/index.html:60
msgid "Medium risk of infection"
msgstr "感染的中度风险"
-#: templates/applefruitmoth/index.html:61
+#: applefruitmoth/templates/applefruitmoth/index.html:61
msgid "No risk of infection"
msgstr "无感染风险"
-#: templates/applefruitmoth/index.html:62
+#: applefruitmoth/templates/applefruitmoth/index.html:62
msgid "Forecast not ready"
msgstr "预报未准备好"
diff --git a/calculators/locale/bg/LC_MESSAGES/django.mo b/calculators/locale/bg/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/calculators/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/calculators/locale/bg/LC_MESSAGES/django.po b/calculators/locale/bg/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..63b5ee2819e3d959ca8895f27b94a34d835b1199
--- /dev/null
+++ b/calculators/locale/bg/LC_MESSAGES/django.po
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: calculators/templates/calculators/eil.html:25
+#: calculators/templates/calculators/eil.html:27
+msgid "Economic injury level (EIL) calculator"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:32
+msgid "Input"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:35
+msgid "The cost of purchasing and applying the control action (insecticide)"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:36
+msgid "Control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:42
+msgid "The market value of the crop in local currency per weight unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:43
+msgid "Market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:49
+msgid ""
+"The maximum yield per production unit. Historical values are typically used "
+"for this expression."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:50
+msgid "Yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:57
+msgid "The proportion of the pest population killed."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:58
+msgid "Control efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:64
+msgid "Damage expressed as crop yield loss per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:65
+msgid "Damage per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:69
+msgid "Settings"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:71
+msgid "Currency"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:75
+msgid "Crop mass unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:79
+msgid "Crop area unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:83
+msgid "Pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:84
+msgid "Number of aphids per plant"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:87
+msgid "Run model"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:91
+msgid "Results"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:93
+msgid "Calculated EIL"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:115
+msgid "EIL as a function of yield loss per pest unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:116
+msgid "EIL as a function of control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:117
+msgid "EIL as a function of market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:118
+msgid "EIL as a function of yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:119
+msgid "EIL as a function of insecticide efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/index.html:25
+#: calculators/templates/calculators/index.html:27
+msgid "Calculators"
+msgstr ""
diff --git a/calculators/locale/bs/LC_MESSAGES/django.mo b/calculators/locale/bs/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d2d31a4fd72f68dc53c29f8a8b14d56d933f3e63
Binary files /dev/null and b/calculators/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/calculators/locale/bs/LC_MESSAGES/django.po b/calculators/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..807a4463cb99787b79e242fab8217cc33a9321f1
--- /dev/null
+++ b/calculators/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,131 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: calculators/templates/calculators/eil.html:25
+#: calculators/templates/calculators/eil.html:27
+msgid "Economic injury level (EIL) calculator"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:32
+msgid "Input"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:35
+msgid "The cost of purchasing and applying the control action (insecticide)"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:36
+msgid "Control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:42
+msgid "The market value of the crop in local currency per weight unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:43
+msgid "Market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:49
+msgid ""
+"The maximum yield per production unit. Historical values are typically used "
+"for this expression."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:50
+msgid "Yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:57
+msgid "The proportion of the pest population killed."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:58
+msgid "Control efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:64
+msgid "Damage expressed as crop yield loss per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:65
+msgid "Damage per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:69
+msgid "Settings"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:71
+msgid "Currency"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:75
+msgid "Crop mass unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:79
+msgid "Crop area unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:83
+msgid "Pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:84
+msgid "Number of aphids per plant"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:87
+msgid "Run model"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:91
+msgid "Results"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:93
+msgid "Calculated EIL"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:115
+msgid "EIL as a function of yield loss per pest unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:116
+msgid "EIL as a function of control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:117
+msgid "EIL as a function of market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:118
+msgid "EIL as a function of yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:119
+msgid "EIL as a function of insecticide efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/index.html:25
+#: calculators/templates/calculators/index.html:27
+msgid "Calculators"
+msgstr ""
diff --git a/calculators/locale/de/LC_MESSAGES/django.po b/calculators/locale/de/LC_MESSAGES/django.po
index c1561341c34d463f5726608423a1da14c724dee6..8c3f7b896f351d17c6a0e7792de0563b27837eff 100755
--- a/calculators/locale/de/LC_MESSAGES/django.po
+++ b/calculators/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:03-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,112 +18,114 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/calculators/eil.html:25 templates/calculators/eil.html.py:27
+#: calculators/templates/calculators/eil.html:25
+#: calculators/templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: templates/calculators/eil.html:32
+#: calculators/templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: templates/calculators/eil.html:35
+#: calculators/templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: templates/calculators/eil.html:36
+#: calculators/templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: templates/calculators/eil.html:42
+#: calculators/templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: templates/calculators/eil.html:43
+#: calculators/templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: templates/calculators/eil.html:49
+#: calculators/templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: templates/calculators/eil.html:50
+#: calculators/templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: templates/calculators/eil.html:57
+#: calculators/templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: templates/calculators/eil.html:58
+#: calculators/templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: templates/calculators/eil.html:64
+#: calculators/templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: templates/calculators/eil.html:65
+#: calculators/templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: templates/calculators/eil.html:69
+#: calculators/templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: templates/calculators/eil.html:71
+#: calculators/templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: templates/calculators/eil.html:75
+#: calculators/templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: templates/calculators/eil.html:79
+#: calculators/templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: templates/calculators/eil.html:83
+#: calculators/templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: templates/calculators/eil.html:84
+#: calculators/templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: templates/calculators/eil.html:87
+#: calculators/templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: templates/calculators/eil.html:91
+#: calculators/templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: templates/calculators/eil.html:93
+#: calculators/templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: templates/calculators/eil.html:115
+#: calculators/templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: templates/calculators/eil.html:116
+#: calculators/templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: templates/calculators/eil.html:117
+#: calculators/templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: templates/calculators/eil.html:118
+#: calculators/templates/calculators/eil.html:118
msgid "EIL as a function of yield potential"
msgstr ""
-#: templates/calculators/eil.html:119
+#: calculators/templates/calculators/eil.html:119
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: templates/calculators/index.html:25 templates/calculators/index.html:27
+#: calculators/templates/calculators/index.html:25
+#: calculators/templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/fi/LC_MESSAGES/django.mo b/calculators/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/calculators/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/calculators/locale/fi/LC_MESSAGES/django.po b/calculators/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..63b5ee2819e3d959ca8895f27b94a34d835b1199
--- /dev/null
+++ b/calculators/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: calculators/templates/calculators/eil.html:25
+#: calculators/templates/calculators/eil.html:27
+msgid "Economic injury level (EIL) calculator"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:32
+msgid "Input"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:35
+msgid "The cost of purchasing and applying the control action (insecticide)"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:36
+msgid "Control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:42
+msgid "The market value of the crop in local currency per weight unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:43
+msgid "Market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:49
+msgid ""
+"The maximum yield per production unit. Historical values are typically used "
+"for this expression."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:50
+msgid "Yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:57
+msgid "The proportion of the pest population killed."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:58
+msgid "Control efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:64
+msgid "Damage expressed as crop yield loss per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:65
+msgid "Damage per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:69
+msgid "Settings"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:71
+msgid "Currency"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:75
+msgid "Crop mass unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:79
+msgid "Crop area unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:83
+msgid "Pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:84
+msgid "Number of aphids per plant"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:87
+msgid "Run model"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:91
+msgid "Results"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:93
+msgid "Calculated EIL"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:115
+msgid "EIL as a function of yield loss per pest unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:116
+msgid "EIL as a function of control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:117
+msgid "EIL as a function of market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:118
+msgid "EIL as a function of yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:119
+msgid "EIL as a function of insecticide efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/index.html:25
+#: calculators/templates/calculators/index.html:27
+msgid "Calculators"
+msgstr ""
diff --git a/calculators/locale/nb/LC_MESSAGES/django.po b/calculators/locale/nb/LC_MESSAGES/django.po
index c5ce9609d70da61e13aab44d0d6d7c6d970cec8a..bc61b5a0acf81a10a4fd0dc8a3445e411b632ca3 100755
--- a/calculators/locale/nb/LC_MESSAGES/django.po
+++ b/calculators/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-01 14:19+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,116 +18,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/calculators/eil.html:25
-#: templates/calculators/eil.html.py:27
+#: calculators/templates/calculators/eil.html:25
+#: calculators/templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "Økonomisk skadeterskelkalkulator (EIL)"
-#: templates/calculators/eil.html:32
+#: calculators/templates/calculators/eil.html:32
msgid "Input"
msgstr "Inndata"
-#: templates/calculators/eil.html:35
+#: calculators/templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
-msgstr "Kostnaden ved innkjøp og bruk av bekjempelsesmetode (f.eks. plantevernmiddel)"
+msgstr ""
+"Kostnaden ved innkjøp og bruk av bekjempelsesmetode (f.eks. plantevernmiddel)"
-#: templates/calculators/eil.html:36
+#: calculators/templates/calculators/eil.html:36
msgid "Control cost"
msgstr "Bekjempelseskostnad"
-#: templates/calculators/eil.html:42
+#: calculators/templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr "Markedsverdi i lokal valuta pr vektenhet"
-#: templates/calculators/eil.html:43
+#: calculators/templates/calculators/eil.html:43
msgid "Market value"
msgstr "Markedsverdi i lokal valuta"
-#: templates/calculators/eil.html:49
+#: calculators/templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
-msgstr "Maksimalt avlingsnivå per arealenhet. Det er vanlig å bruke historiske "
+msgstr ""
+"Maksimalt avlingsnivå per arealenhet. Det er vanlig å bruke historiske "
"verdier."
-#: templates/calculators/eil.html:50
+#: calculators/templates/calculators/eil.html:50
msgid "Yield potential"
msgstr "Avlingspotensial"
-#: templates/calculators/eil.html:57
+#: calculators/templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr "Andelen av skadegjører som drepes"
-#: templates/calculators/eil.html:58
+#: calculators/templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr "Bekjempelseseffekt"
-#: templates/calculators/eil.html:64
+#: calculators/templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr "Skade uttrykt som avlingstap per skadegjørermåleenhet"
-#: templates/calculators/eil.html:65
+#: calculators/templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr "Skade per skadegjørermåleenhet"
-#: templates/calculators/eil.html:69
+#: calculators/templates/calculators/eil.html:69
msgid "Settings"
msgstr "Innstillinger"
-#: templates/calculators/eil.html:71
+#: calculators/templates/calculators/eil.html:71
msgid "Currency"
msgstr "Valuta"
-#: templates/calculators/eil.html:75
+#: calculators/templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr "Avlingsmasseenhet"
-#: templates/calculators/eil.html:79
+#: calculators/templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr "Avlingsarealenhet"
-#: templates/calculators/eil.html:83
+#: calculators/templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr "Skadegjørermåleenhet"
-#: templates/calculators/eil.html:84
+#: calculators/templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr "Antall bladlus per plante"
-#: templates/calculators/eil.html:87
+#: calculators/templates/calculators/eil.html:87
msgid "Run model"
msgstr "Kjør modell"
-#: templates/calculators/eil.html:91
+#: calculators/templates/calculators/eil.html:91
msgid "Results"
msgstr "Resultater"
-#: templates/calculators/eil.html:93
+#: calculators/templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr "Beregnet EIL"
-#: templates/calculators/eil.html:115
+#: calculators/templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr "EIL som funksjon av avlingstap per skadegjørerenhet"
-#: templates/calculators/eil.html:116
+#: calculators/templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr "EIL som funksjon av bekjempelseskostnad"
-#: templates/calculators/eil.html:117
+#: calculators/templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr "EIL som funksjon av markedsverdi"
-#: templates/calculators/eil.html:118
+#: calculators/templates/calculators/eil.html:118
msgid "EIL as a function of yield potential"
msgstr "EIL som funksjon av avlingspotensial"
-#: templates/calculators/eil.html:119
+#: calculators/templates/calculators/eil.html:119
msgid "EIL as a function of insecticide efficacy"
msgstr "EIL som funksjon av bekjempelseseffekt"
-#: templates/calculators/index.html:25
-#: templates/calculators/index.html:27
+#: calculators/templates/calculators/index.html:25
+#: calculators/templates/calculators/index.html:27
msgid "Calculators"
msgstr "Kalkulatorer"
-
diff --git a/calculators/locale/vi/LC_MESSAGES/django.mo b/calculators/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/calculators/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/calculators/locale/vi/LC_MESSAGES/django.po b/calculators/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..ec54a0577f7a5007a50ac1b0a12ac6f0807eb9f4
--- /dev/null
+++ b/calculators/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: calculators/templates/calculators/eil.html:25
+#: calculators/templates/calculators/eil.html:27
+msgid "Economic injury level (EIL) calculator"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:32
+msgid "Input"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:35
+msgid "The cost of purchasing and applying the control action (insecticide)"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:36
+msgid "Control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:42
+msgid "The market value of the crop in local currency per weight unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:43
+msgid "Market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:49
+msgid ""
+"The maximum yield per production unit. Historical values are typically used "
+"for this expression."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:50
+msgid "Yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:57
+msgid "The proportion of the pest population killed."
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:58
+msgid "Control efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:64
+msgid "Damage expressed as crop yield loss per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:65
+msgid "Damage per pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:69
+msgid "Settings"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:71
+msgid "Currency"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:75
+msgid "Crop mass unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:79
+msgid "Crop area unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:83
+msgid "Pest measuring unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:84
+msgid "Number of aphids per plant"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:87
+msgid "Run model"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:91
+msgid "Results"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:93
+msgid "Calculated EIL"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:115
+msgid "EIL as a function of yield loss per pest unit"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:116
+msgid "EIL as a function of control cost"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:117
+msgid "EIL as a function of market value"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:118
+msgid "EIL as a function of yield potential"
+msgstr ""
+
+#: calculators/templates/calculators/eil.html:119
+msgid "EIL as a function of insecticide efficacy"
+msgstr ""
+
+#: calculators/templates/calculators/index.html:25
+#: calculators/templates/calculators/index.html:27
+msgid "Calculators"
+msgstr ""
diff --git a/calculators/locale/zh_Hans/LC_MESSAGES/django.po b/calculators/locale/zh_Hans/LC_MESSAGES/django.po
index 97c67b01b1006488772914a4635404264655988d..ceae23e9d4b1b979ab2fe26123db8424657b45aa 100755
--- a/calculators/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/calculators/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-06-01 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,112 +17,114 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: templates/calculators/eil.html:25 templates/calculators/eil.html.py:27
+#: calculators/templates/calculators/eil.html:25
+#: calculators/templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "经济损害水平计算器"
-#: templates/calculators/eil.html:32
+#: calculators/templates/calculators/eil.html:32
msgid "Input"
msgstr "输入"
-#: templates/calculators/eil.html:35
+#: calculators/templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr "购买和采取控制措施的成本(杀虫剂)"
-#: templates/calculators/eil.html:36
+#: calculators/templates/calculators/eil.html:36
msgid "Control cost"
msgstr "控制成本"
-#: templates/calculators/eil.html:42
+#: calculators/templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr "按当地货币计算的单位产量作物的市场价"
-#: templates/calculators/eil.html:43
+#: calculators/templates/calculators/eil.html:43
msgid "Market value"
msgstr "市场价值"
-#: templates/calculators/eil.html:49
+#: calculators/templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr "每生产单位的最大产量。在这个表达式中，通常使用历史数据。"
-#: templates/calculators/eil.html:50
+#: calculators/templates/calculators/eil.html:50
msgid "Yield potential"
msgstr "产量潜力"
-#: templates/calculators/eil.html:57
+#: calculators/templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr "被杀死害虫的比例"
-#: templates/calculators/eil.html:58
+#: calculators/templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr "控制效力"
-#: templates/calculators/eil.html:64
+#: calculators/templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr "损失表现为每害虫测定单位的作物产量损失"
-#: templates/calculators/eil.html:65
+#: calculators/templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr "每害虫测定单位的损害"
-#: templates/calculators/eil.html:69
+#: calculators/templates/calculators/eil.html:69
msgid "Settings"
msgstr "设置"
-#: templates/calculators/eil.html:71
+#: calculators/templates/calculators/eil.html:71
msgid "Currency"
msgstr "货币"
-#: templates/calculators/eil.html:75
+#: calculators/templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr "作物重量单位"
-#: templates/calculators/eil.html:79
+#: calculators/templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr "作物面积单位"
-#: templates/calculators/eil.html:83
+#: calculators/templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr "害虫测定单位"
-#: templates/calculators/eil.html:84
+#: calculators/templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr "每株植物的蚜虫数量"
-#: templates/calculators/eil.html:87
+#: calculators/templates/calculators/eil.html:87
msgid "Run model"
msgstr "运行模型"
-#: templates/calculators/eil.html:91
+#: calculators/templates/calculators/eil.html:91
msgid "Results"
msgstr "结果"
-#: templates/calculators/eil.html:93
+#: calculators/templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr "计算的经济损害水平"
-#: templates/calculators/eil.html:115
+#: calculators/templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr "经济损害水平作为每害虫单位的产量损失的参数"
-#: templates/calculators/eil.html:116
+#: calculators/templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr "经济损害水平作为控制成本的参数"
-#: templates/calculators/eil.html:117
+#: calculators/templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr "经济损害水平作为市场价值的参数"
-#: templates/calculators/eil.html:118
+#: calculators/templates/calculators/eil.html:118
msgid "EIL as a function of yield potential"
msgstr "经济损害水平作为产量潜力的参数"
-#: templates/calculators/eil.html:119
+#: calculators/templates/calculators/eil.html:119
msgid "EIL as a function of insecticide efficacy"
msgstr "经济损害水平作为杀虫剂效力的参数"
-#: templates/calculators/index.html:25 templates/calculators/index.html:27
+#: calculators/templates/calculators/index.html:25
+#: calculators/templates/calculators/index.html:27
msgid "Calculators"
msgstr "计算器"
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
index c0a8f3e0d46e0035c238f40af6ce2014e4586ce9..f8feb0dd4d53bdefcf13f0afb8ec362fcb30c30e 100755
--- a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
@@ -7,8 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
"POT-Creation-Date: 2020-06-22 10:02+0200\n"
"PO-Revision-Date: 2020-06-22 10:02+0200\n"
+=======
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: 2020-03-25 09:18+0100\n"
+>>>>>>> epleviklerNewFeatures
"Last-Translator: \n"
"Language-Team: \n"
"Language: nb\n"
diff --git a/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100755
index 152c73b13a20b8df3cff03efa7d9ba6a360ff080..0000000000000000000000000000000000000000
Binary files a/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.mo
deleted file mode 100644
index b03126cabddf3a62092e3e9c28b6d6b60a8d922a..0000000000000000000000000000000000000000
Binary files a/cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/cydiapomonella/locale/bg/LC_MESSAGES/django.mo b/cydiapomonella/locale/bg/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/cydiapomonella/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/cydiapomonella/locale/bg/LC_MESSAGES/django.po b/cydiapomonella/locale/bg/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..24edbd9cdfbdfc8ea81b3b55d1233b0c6eea32a1
--- /dev/null
+++ b/cydiapomonella/locale/bg/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/cydiapomonella/index.html:29
+msgid "Cydia pomonella"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:719
+msgid "Calculate the risk of attack by the coddling moth"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:722
+msgid ""
+"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 nedenfor. "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:734
+msgid "Select weather station"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:766
+#: templates/cydiapomonella/index.html:769
+#: templates/cydiapomonella/index.html:772
+#: templates/cydiapomonella/index.html:816
+msgid "days"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:783
+msgid "Date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:784
+#: templates/cydiapomonella/index.html:785
+#: templates/cydiapomonella/index.html:786
+#: templates/cydiapomonella/index.html:787
+#: templates/cydiapomonella/index.html:788
+msgid "Temp at"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:789
+msgid "Daily rainfall"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:804
+msgid "Heat sum"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:808
+msgid "Calculate heat sum from date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "weather station for the period starting with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "and ending with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "is"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "day degrees"
+msgstr ""
diff --git a/cydiapomonella/locale/bs/LC_MESSAGES/django.mo b/cydiapomonella/locale/bs/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d2d31a4fd72f68dc53c29f8a8b14d56d933f3e63
Binary files /dev/null and b/cydiapomonella/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/cydiapomonella/locale/bs/LC_MESSAGES/django.po b/cydiapomonella/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..0030a5c0e52f46e07bb849b4f0c9ee51aa6d4d77
--- /dev/null
+++ b/cydiapomonella/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,92 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: templates/cydiapomonella/index.html:29
+msgid "Cydia pomonella"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:719
+msgid "Calculate the risk of attack by the coddling moth"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:722
+msgid ""
+"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 nedenfor. "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:734
+msgid "Select weather station"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:766
+#: templates/cydiapomonella/index.html:769
+#: templates/cydiapomonella/index.html:772
+#: templates/cydiapomonella/index.html:816
+msgid "days"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:783
+msgid "Date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:784
+#: templates/cydiapomonella/index.html:785
+#: templates/cydiapomonella/index.html:786
+#: templates/cydiapomonella/index.html:787
+#: templates/cydiapomonella/index.html:788
+msgid "Temp at"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:789
+msgid "Daily rainfall"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:804
+msgid "Heat sum"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:808
+msgid "Calculate heat sum from date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "weather station for the period starting with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "and ending with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "is"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "day degrees"
+msgstr ""
diff --git a/cydiapomonella/locale/de/LC_MESSAGES/django.mo b/cydiapomonella/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/cydiapomonella/locale/de/LC_MESSAGES/django.mo differ
diff --git a/cydiapomonella/locale/de/LC_MESSAGES/django.po b/cydiapomonella/locale/de/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..24edbd9cdfbdfc8ea81b3b55d1233b0c6eea32a1
--- /dev/null
+++ b/cydiapomonella/locale/de/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/cydiapomonella/index.html:29
+msgid "Cydia pomonella"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:719
+msgid "Calculate the risk of attack by the coddling moth"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:722
+msgid ""
+"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 nedenfor. "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:734
+msgid "Select weather station"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:766
+#: templates/cydiapomonella/index.html:769
+#: templates/cydiapomonella/index.html:772
+#: templates/cydiapomonella/index.html:816
+msgid "days"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:783
+msgid "Date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:784
+#: templates/cydiapomonella/index.html:785
+#: templates/cydiapomonella/index.html:786
+#: templates/cydiapomonella/index.html:787
+#: templates/cydiapomonella/index.html:788
+msgid "Temp at"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:789
+msgid "Daily rainfall"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:804
+msgid "Heat sum"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:808
+msgid "Calculate heat sum from date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "weather station for the period starting with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "and ending with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "is"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "day degrees"
+msgstr ""
diff --git a/cydiapomonella/locale/fi/LC_MESSAGES/django.mo b/cydiapomonella/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/cydiapomonella/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/cydiapomonella/locale/fi/LC_MESSAGES/django.po b/cydiapomonella/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..24edbd9cdfbdfc8ea81b3b55d1233b0c6eea32a1
--- /dev/null
+++ b/cydiapomonella/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/cydiapomonella/index.html:29
+msgid "Cydia pomonella"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:719
+msgid "Calculate the risk of attack by the coddling moth"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:722
+msgid ""
+"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 nedenfor. "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:734
+msgid "Select weather station"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:766
+#: templates/cydiapomonella/index.html:769
+#: templates/cydiapomonella/index.html:772
+#: templates/cydiapomonella/index.html:816
+msgid "days"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:783
+msgid "Date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:784
+#: templates/cydiapomonella/index.html:785
+#: templates/cydiapomonella/index.html:786
+#: templates/cydiapomonella/index.html:787
+#: templates/cydiapomonella/index.html:788
+msgid "Temp at"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:789
+msgid "Daily rainfall"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:804
+msgid "Heat sum"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:808
+msgid "Calculate heat sum from date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "weather station for the period starting with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "and ending with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "is"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "day degrees"
+msgstr ""
diff --git a/cydiapomonella/locale/nb/LC_MESSAGES/django.mo b/cydiapomonella/locale/nb/LC_MESSAGES/django.mo
index 72ba8c957f81a9dd1c8cb9961d3a0bd56b3eadfc..ed2f194c90e5d68d3834d1b15d3534079c886d7c 100644
Binary files a/cydiapomonella/locale/nb/LC_MESSAGES/django.mo and b/cydiapomonella/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/cydiapomonella/locale/nb/LC_MESSAGES/django.po b/cydiapomonella/locale/nb/LC_MESSAGES/django.po
index 38c65a1633808c67cb852fbd4804bb9b3c14c95f..a9555e1a5eb71d0d49ff8f2ea9bf277879b82195 100644
--- a/cydiapomonella/locale/nb/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/nb/LC_MESSAGES/django.po
@@ -7,76 +7,85 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-29 15:48+0200\n"
-"PO-Revision-Date: 2020-06-29 15:51+0200\n"
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: 2020-08-24 15:03+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.3\n"
#: templates/cydiapomonella/index.html:29
msgid "Cydia pomonella"
msgstr "Eplevikler"
-#: templates/cydiapomonella/index.html:510
+#: templates/cydiapomonella/index.html:719
msgid "Calculate the risk of attack by the coddling moth"
msgstr "Beregn fare for angrep av eplevikler"
-#: templates/cydiapomonella/index.html:518
+#: templates/cydiapomonella/index.html:722
+msgid ""
+"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 nedenfor. "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:734
msgid "Select weather station"
msgstr "Velg målestasjon"
-#: templates/cydiapomonella/index.html:545
-#: templates/cydiapomonella/index.html:548
-#: templates/cydiapomonella/index.html:551
-#: templates/cydiapomonella/index.html:594
+#: templates/cydiapomonella/index.html:766
+#: templates/cydiapomonella/index.html:769
+#: templates/cydiapomonella/index.html:772
+#: templates/cydiapomonella/index.html:816
msgid "days"
msgstr "dager"
-#: templates/cydiapomonella/index.html:562
+#: templates/cydiapomonella/index.html:783
msgid "Date"
msgstr "Dato"
-#: templates/cydiapomonella/index.html:563
-#: templates/cydiapomonella/index.html:564
-#: templates/cydiapomonella/index.html:565
-#: templates/cydiapomonella/index.html:566
-#: templates/cydiapomonella/index.html:567
+#: templates/cydiapomonella/index.html:784
+#: templates/cydiapomonella/index.html:785
+#: templates/cydiapomonella/index.html:786
+#: templates/cydiapomonella/index.html:787
+#: templates/cydiapomonella/index.html:788
msgid "Temp at"
msgstr "Temp kl"
-#: templates/cydiapomonella/index.html:568
+#: templates/cydiapomonella/index.html:789
msgid "Daily rainfall"
msgstr "Døgnnedbør"
-#: templates/cydiapomonella/index.html:583
+#: templates/cydiapomonella/index.html:804
msgid "Heat sum"
msgstr "Varmesum"
-#: templates/cydiapomonella/index.html:587
+#: templates/cydiapomonella/index.html:808
msgid "Calculate heat sum from date"
msgstr "Beregn varmesum fra dato"
-#: templates/cydiapomonella/index.html:594
-msgid "Heat sum, with a base temperature of 10 degrees Celcius, calculated for"
-msgstr "Varmesum, med basistemperatur 10, beregnet for"
+#: templates/cydiapomonella/index.html:816
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+msgstr "Varmesum, med basistemperatur 10, beregnet for "
-#: templates/cydiapomonella/index.html:594
+#: templates/cydiapomonella/index.html:816
msgid "weather station for the period starting with"
msgstr "målestasjon for perioden fra og med"
-#: templates/cydiapomonella/index.html:594
+#: templates/cydiapomonella/index.html:816
msgid "and ending with"
msgstr "til og med"
-#: templates/cydiapomonella/index.html:594
+#: templates/cydiapomonella/index.html:816
msgid "is"
msgstr "er"
-#: templates/cydiapomonella/index.html:594
+#: templates/cydiapomonella/index.html:816
msgid "day degrees"
msgstr "graddager"
diff --git a/cydiapomonella/locale/vi/LC_MESSAGES/django.mo b/cydiapomonella/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/cydiapomonella/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/cydiapomonella/locale/vi/LC_MESSAGES/django.po b/cydiapomonella/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..33ba0c78f86da1d29ca154bdbd86ca652f82ba2e
--- /dev/null
+++ b/cydiapomonella/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/cydiapomonella/index.html:29
+msgid "Cydia pomonella"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:719
+msgid "Calculate the risk of attack by the coddling moth"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:722
+msgid ""
+"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 nedenfor. "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:734
+msgid "Select weather station"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:766
+#: templates/cydiapomonella/index.html:769
+#: templates/cydiapomonella/index.html:772
+#: templates/cydiapomonella/index.html:816
+msgid "days"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:783
+msgid "Date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:784
+#: templates/cydiapomonella/index.html:785
+#: templates/cydiapomonella/index.html:786
+#: templates/cydiapomonella/index.html:787
+#: templates/cydiapomonella/index.html:788
+msgid "Temp at"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:789
+msgid "Daily rainfall"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:804
+msgid "Heat sum"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:808
+msgid "Calculate heat sum from date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "weather station for the period starting with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "and ending with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "is"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "day degrees"
+msgstr ""
diff --git a/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.mo b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.mo differ
diff --git a/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..33ba0c78f86da1d29ca154bdbd86ca652f82ba2e
--- /dev/null
+++ b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-30 10:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/cydiapomonella/index.html:29
+msgid "Cydia pomonella"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:719
+msgid "Calculate the risk of attack by the coddling moth"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:722
+msgid ""
+"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 nedenfor. "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:734
+msgid "Select weather station"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:766
+#: templates/cydiapomonella/index.html:769
+#: templates/cydiapomonella/index.html:772
+#: templates/cydiapomonella/index.html:816
+msgid "days"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:783
+msgid "Date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:784
+#: templates/cydiapomonella/index.html:785
+#: templates/cydiapomonella/index.html:786
+#: templates/cydiapomonella/index.html:787
+#: templates/cydiapomonella/index.html:788
+msgid "Temp at"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:789
+msgid "Daily rainfall"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:804
+msgid "Heat sum"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:808
+msgid "Calculate heat sum from date"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid ""
+"Heat sum, with a base temperature of 10 degrees Celcius, calculated for "
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "weather station for the period starting with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "and ending with"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "is"
+msgstr ""
+
+#: templates/cydiapomonella/index.html:816
+msgid "day degrees"
+msgstr ""
diff --git a/cydiapomonella/static/js/moment.min.js.map b/cydiapomonella/static/js/moment.min.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..f6010c867396714ab30e6d3b4485852dfc44fb18
--- /dev/null
+++ b/cydiapomonella/static/js/moment.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"moment.min.js","sources":["../moment.js"],"names":["global","factory","exports","module","define","amd","moment","this","hookCallback","some","hooks","apply","arguments","isArray","input","Array","Object","prototype","toString","call","isObject","hasOwnProp","a","b","hasOwnProperty","isObjectEmpty","obj","getOwnPropertyNames","length","k","isUndefined","isNumber","isDate","Date","map","arr","fn","res","i","push","extend","valueOf","createUTC","format","locale","strict","createLocalOrUTC","utc","getParsingFlags","m","_pf","empty","unusedTokens","unusedInput","overflow","charsLeftOver","nullInput","invalidEra","invalidMonth","invalidFormat","userInvalidated","iso","parsedDateParts","era","meridiem","rfc2822","weekdayMismatch","isValid","_isValid","flags","parsedParts","isNowValid","isNaN","_d","getTime","invalidWeekday","_strict","undefined","bigHour","isFrozen","createInvalid","NaN","fun","t","len","momentProperties","updateInProgress","copyConfig","to","from","prop","val","_isAMomentObject","_i","_f","_l","_tzm","_isUTC","_offset","_locale","Moment","config","updateOffset","isMoment","warn","msg","suppressDeprecationWarnings","console","deprecate","firstTime","deprecationHandler","arg","key","args","slice","join","Error","stack","keys","deprecations","deprecateSimple","name","isFunction","Function","mergeConfigs","parentConfig","childConfig","Locale","set","zeroFill","number","targetLength","forceSign","absNumber","Math","abs","zerosToFill","pow","max","substr","formattingTokens","localFormattingTokens","formatFunctions","formatTokenFunctions","addFormatToken","token","padded","ordinal","callback","func","localeData","formatMoment","expandFormat","array","match","replace","mom","output","makeFormatFunction","invalidDate","replaceLongDateFormatTokens","longDateFormat","lastIndex","test","aliases","addUnitAlias","unit","shorthand","lowerCase","toLowerCase","normalizeUnits","units","normalizeObjectUnits","inputObject","normalizedProp","normalizedInput","priorities","addUnitPriority","priority","isLeapYear","year","absFloor","ceil","floor","toInt","argumentForCoercion","coercedNumber","value","isFinite","makeGetSet","keepTime","set$1","get","month","date","daysInMonth","regexes","match1","match2","match3","match4","match6","match1to2","match3to4","match5to6","match1to3","match1to4","match1to6","matchUnsigned","matchSigned","matchOffset","matchShortOffset","matchWord","addRegexToken","regex","strictRegex","isStrict","getParseRegexForToken","RegExp","regexEscape","matched","p1","p2","p3","p4","s","tokens","addParseToken","addWeekParseToken","_w","indexOf","YEAR","MONTH","DATE","HOUR","MINUTE","SECOND","MILLISECOND","WEEK","WEEKDAY","x","modMonth","o","monthsShort","months","monthsShortRegex","monthsRegex","monthsParse","defaultLocaleMonths","split","defaultLocaleMonthsShort","MONTHS_IN_FORMAT","defaultMonthsShortRegex","defaultMonthsRegex","setMonth","dayOfMonth","min","getSetMonth","computeMonthsParse","cmpLenRev","shortPieces","longPieces","mixedPieces","sort","_monthsRegex","_monthsShortRegex","_monthsStrictRegex","_monthsShortStrictRegex","daysInYear","y","parseTwoDigitYear","parseInt","getSetYear","createUTCDate","UTC","getUTCFullYear","setUTCFullYear","firstWeekOffset","dow","doy","fwd","getUTCDay","dayOfYearFromWeeks","week","weekday","resYear","dayOfYear","resDayOfYear","weekOfYear","resWeek","weekOffset","weeksInYear","weekOffsetNext","shiftWeekdays","ws","n","concat","weekdaysMin","weekdaysShort","weekdays","weekdaysMinRegex","weekdaysShortRegex","weekdaysRegex","weekdaysParse","d","defaultLocaleWeekdays","defaultLocaleWeekdaysShort","defaultLocaleWeekdaysMin","defaultWeekdaysRegex","defaultWeekdaysShortRegex","defaultWeekdaysMinRegex","computeWeekdaysParse","minp","shortp","longp","minPieces","day","_weekdaysRegex","_weekdaysShortRegex","_weekdaysMinRegex","_weekdaysStrictRegex","_weekdaysShortStrictRegex","_weekdaysMinStrictRegex","hFormat","hours","lowercase","minutes","matchMeridiem","_meridiemParse","seconds","kInput","_isPm","isPM","_meridiem","pos","pos1","pos2","getSetHour","globalLocale","baseConfig","calendar","sameDay","nextDay","nextWeek","lastDay","lastWeek","sameElse","LTS","LT","L","LL","LLL","LLLL","dayOfMonthOrdinalParse","relativeTime","future","past","ss","mm","h","hh","dd","w","ww","M","MM","yy","meridiemParse","locales","localeFamilies","normalizeLocale","chooseLocale","names","j","next","loadLocale","arr1","arr2","minl","commonPrefix","oldLocale","_abbr","require","getSetGlobalLocale","e","values","data","getLocale","defineLocale","abbr","_config","parentLocale","forEach","checkOverflow","_a","_overflowDayOfYear","_overflowWeeks","_overflowWeekday","extendedIsoRegex","basicIsoRegex","tzRegex","isoDates","isoTimes","aspNetJsonRegex","obsOffsets","UT","GMT","EDT","EST","CDT","CST","MDT","MST","PDT","PST","configFromISO","l","allowTime","dateFormat","timeFormat","tzFormat","string","exec","configFromStringAndFormat","extractFromRFC2822Strings","yearStr","monthStr","dayStr","hourStr","minuteStr","secondStr","result","untruncateYear","configFromRFC2822","parsedArray","weekdayStr","parsedInput","getDay","obsOffset","militaryOffset","numOffset","hm","calculateOffset","setUTCMinutes","getUTCMinutes","defaults","c","configFromArray","currentDate","expectedWeekday","yearToUse","nowValue","now","_useUTC","getUTCMonth","getUTCDate","getFullYear","getMonth","getDate","weekYear","temp","weekdayOverflow","curWeek","GG","W","E","createLocal","_week","gg","_dayOfYear","dayOfYearFromWeekInfo","_nextDay","ms","setFullYear","ISO_8601","RFC_2822","skipped","stringLength","totalParsedInputLength","hour","isPm","meridiemHour","meridiemFixWrap","erasConvertYear","prepareConfig","preparse","tempConfig","bestMoment","scoreToBeat","currentScore","validFormatFound","bestFormatIsValid","score","configFromStringAndArray","createFromInputFallback","configFromString","dayOrDate","minute","second","millisecond","configFromObject","isUTC","add","prototypeMin","other","prototypeMax","pickBy","moments","ordering","Duration","duration","years","quarters","quarter","weeks","isoWeek","days","milliseconds","unitHasDecimal","parseFloat","isDurationValid","_milliseconds","_days","_months","_data","_bubble","isDuration","absRound","round","offset","separator","utcOffset","sign","offsetFromString","chunkOffset","matcher","parts","matches","cloneWithOffset","model","diff","clone","setTime","local","getDateOffset","getTimezoneOffset","isUtc","aspNetRegex","isoRegex","createDuration","ret","diffRes","parseIso","base","isBefore","positiveMomentsDifference","momentsDifference","inp","isAfter","createAdder","direction","period","tmp","addSubtract","isAdding","invalid","subtract","isString","String","isMomentInput","arrayTest","dataTypeTest","filter","item","isNumberOrStringArray","property","objectTest","propertyTest","properties","isMomentInputObject","monthDiff","wholeMonthDiff","anchor","adjust","newLocaleData","defaultFormat","defaultFormatUtc","lang","MS_PER_400_YEARS","mod$1","dividend","divisor","localStartOfDate","utcStartOfDate","matchEraAbbr","erasAbbrRegex","computeErasParse","abbrPieces","namePieces","narrowPieces","eras","narrow","_erasRegex","_erasNameRegex","_erasAbbrRegex","_erasNarrowRegex","addWeekYearFormatToken","getter","getSetWeekYearHelper","weeksTarget","dayOfYearData","erasNameRegex","erasNarrowRegex","erasParse","_eraYearOrdinalRegex","eraYearOrdinalParse","isoWeekYear","_dayOfMonthOrdinalParse","_ordinalParse","_dayOfMonthOrdinalParseLenient","getSetDayOfMonth","getSetMinute","getSetMillisecond","getSetSecond","parseMs","proto","preParsePostFormat","time","formats","isCalendarSpec","sod","startOf","calendarFormat","asFloat","that","zoneDelta","endOf","startOfDate","isoWeekday","inputString","postformat","withoutSuffix","humanize","fromNow","toNow","invalidAt","localInput","isBetween","inclusivity","localFrom","localTo","isSame","inputMs","isSameOrAfter","isSameOrBefore","parsingFlags","prioritized","unitsObj","u","getPrioritizedUnits","toArray","toObject","toDate","toISOString","keepOffset","inspect","prefix","suffix","zone","isLocal","Symbol","for","toJSON","unix","creationData","eraName","since","until","eraNarrow","eraAbbr","eraYear","dir","isoWeeks","weekInfo","weeksInWeekYear","isoWeeksInYear","isoWeeksInISOWeekYear","keepLocalTime","keepMinutes","localAdjust","_changeInProgress","parseZone","tZone","hasAlignedHourOffset","isDST","isUtcOffset","zoneAbbr","zoneName","dates","isDSTShifted","_isDSTShifted","array1","array2","dontConvert","lengthDiff","diffs","compareArrays","proto$1","get$1","index","field","setter","listMonthsImpl","out","listWeekdaysImpl","localeSorted","shift","_calendar","_longDateFormat","formatUpper","toUpperCase","tok","_invalidDate","_ordinal","isFuture","_relativeTime","pastFuture","source","_eras","Infinity","isFormat","_monthsShort","monthName","_monthsParseExact","ii","llc","toLocaleLowerCase","_monthsParse","_longMonthsParse","_shortMonthsParse","firstDayOfYear","firstDayOfWeek","_weekdays","_weekdaysMin","_weekdaysShort","weekdayName","_weekdaysParseExact","_weekdaysParse","_shortWeekdaysParse","_minWeekdaysParse","_fullWeekdaysParse","charAt","isLower","langData","mathAbs","addSubtract$1","absCeil","daysToMonths","monthsToDays","makeAs","alias","as","asMilliseconds","asSeconds","asMinutes","asHours","asDays","asWeeks","asMonths","asQuarters","asYears","makeGetter","thresholds","relativeTime$1","posNegDuration","abs$1","toISOString$1","totalSign","ymSign","daysSign","hmsSign","total","toFixed","proto$2","monthsFromDays","argWithSuffix","argThresholds","withSuffix","th","assign","toIsoString","version","updateLocale","tmpLocale","relativeTimeRounding","roundingFunction","relativeTimeThreshold","threshold","limit","myMoment","HTML5_FMT","DATETIME_LOCAL","DATETIME_LOCAL_SECONDS","DATETIME_LOCAL_MS","TIME","TIME_SECONDS","TIME_MS"],"mappings":"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"}
\ No newline at end of file
diff --git a/cydiapomonella/templates/cydiapomonella/index.html b/cydiapomonella/templates/cydiapomonella/index.html
index c53a2f2df99254a288c3441e9f662079678dcb3c..14494e78d207161f879a31abbda212caec9c2962 100644
--- a/cydiapomonella/templates/cydiapomonella/index.html
+++ b/cydiapomonella/templates/cydiapomonella/index.html
@@ -46,56 +46,127 @@
{% endblock %}
{% block customCSS %}
<style>
+ /* Over ride datatable property to maintain default color */
.navbar-default {
background-color: #fff;
border-color:#fff;
}
+
+ /* Text align center - used in datatable */
+ .colCenter {text-align: center;}
+
+ /* Data table odd stripe color */
+/*
+ .table-striped>tbody>tr:nth-child(odd)>th {
+ background-color: #ebf1d4
+ }
+*/
+ /* Data table even stripe color */
+ /* .table-striped>tbody>tr:nth-child(even)>td, */
+ /* Choose your own color here Earlier color : #e4ddd6 */
+/*
+ .table-striped>tbody>tr:nth-child(even)>th {
+ background-color:#f9f9f9
+ }
+*/
+ body {
+ font-family: 'Source Sans Pro', sans-serif;
+ }
+
+ table.table > tbody > tr > td {
+ background-color: white;
+ border-bottom: 3px solid #d9e6e4;
+ }
+
+
</style>
{% endblock %}
{% block customJS %}
{% csrf_token %}
<script type="text/javascript">
+
var CONST_TIMEZONE = 'Europe/Oslo';
var dateToday = new Date();
var dateYesterday = getAdjustDate(dateToday,1);
var strEndDate = JSON.stringify(dateToday).substring(1,11);
+ var CON_idSpecial = {
+ "Helgøy" : "536"
+ , "Skiftun" : "537"
+ }
- //var jsonDailyData = "";
- var jsonHourlyData = "";
- var jsonMeasurdData = "";
-
+ /* Page onload function */
$(function(){
+ /* Calendar will not accept future dates including today */
document.getElementById('idTxtDateInput').setAttribute("max", JSON.stringify(dateYesterday).substring(1,11));
$('#idTxtDateInput').removeClass('hasDatepicker');
});
+ $(document).ajaxStart(function(){
+ // Show image container
+ $("#divIdAjaxLoader").show();
+ });
+
+ $(document).ajaxComplete(function(){
+ // Hide image container
+ $("#divIdAjaxLoader").hide();
+ });
+
+
+ /* Function for check whether the choosed weather station is within special category (e.g. devis) */
+ function isSpecialWeatherStation(paramStationId)
+ {
+ var result = false;
+ $.each( CON_idSpecial, function( key, value ) {
+ if (paramStationId === value)
+ {
+ result = true;
+ return false; // exit the each loop
+ }
+ });
+ return result;
+ }
+
+
+
+
/* Function works on date picker onClose event */
function funDtPickerHeatSum()
{
- var varWeatherId = $('#weatherStationId').find(':selected').val();
+ var varWeatherId = $('#weatherStationId').find(':selected').val();
+ var strStartDate = undefined;
+ var varLogInIntervalHourly = '1h';
+ var varLogInIntervalDaily = '1d';
+ var varElementMeasurementTypes = ['TM'];
+
+ var jsonParamUrlData = '';
+
+ var weatherStationIdParamJSON = getJsonData(varWeatherId);
+
if(typeof varWeatherId === "undefined")
{
- varWeatherId = '$(#weatherStationId)';
+ varWeatherId = '$(#weatherStationId)';
+ }
+ else{
+ varWeatherId = getJsonData(varWeatherId).id;
}
- var startDate = new Date($('#idTxtDateInput').val());
+ var startDate = new Date($('#idTxtDateInput').val());
- var strStartDate = JSON.stringify(getAdjustDate(new Date($('#idTxtDateInput').val()), 1 )).substring(1,11);
-
- var jsonParamUrlDataDaily = {
- weatherStationId : varWeatherId,
- elementMeasurementTypes : ['TM'],
- logInterval : '1d',
- startDate : strStartDate,
- startTime : '12',
- endDate : strEndDate,
- endTime : '11',
- timeZone : CONST_TIMEZONE
- }
-
- var jsonDailyData = getAjaxDailyData (jsonParamUrlDataDaily);
+
+ if(isSpecialWeatherStation(varWeatherId))
+ {
+ strStartDate = JSON.stringify(getAdjustDate(startDate, 2 )).substring(1,11);
+ jsonParamUrlData = getWeatherDataUrlParam(varWeatherId, strStartDate, strEndDate, varElementMeasurementTypes, varLogInIntervalHourly, CONST_TIMEZONE);
+ getAjaxHourlyData(jsonParamUrlData,weatherStationIdParamJSON,false);
+ }
+ else
+ {
+ strStartDate = JSON.stringify(getAdjustDate(startDate, 1 )).substring(1,11);
+ jsonParamUrlData = getWeatherDataUrlParam(varWeatherId, strStartDate, strEndDate, varElementMeasurementTypes, varLogInIntervalDaily, CONST_TIMEZONE);
+ getAjaxDailyData (jsonParamUrlData,weatherStationIdParamJSON);
+ }
}
@@ -113,121 +184,191 @@
*/
$('#idTxtDateInput').change(function(){
- funDtPickerHeatSum();
- });
+ funDtPickerHeatSum();
+ });
+ /* Convert string to JSON */
+ function getJsonData(strData)
+ {
+ return JSON.parse(strData);
+ }
/* On change of drop down for weather stations */
$('#weatherStationId').change(function(){
-
- var varWeatherId = $('#weatherStationId').find(':selected').val();
- if(typeof varWeatherId === "undefined")
+
+ var jsonParamUrlDataHourly = '';
+ var varStationPwd = '';
+ var varWeatherId = $('#weatherStationId').find(':selected').val();
+ var varElementMeasurementTypes = ['TM','RR'];
+ var varLogInIntervalHourly = '1h';
+
+ var weatherStationIdParamJSON = getJsonData(varWeatherId);
+
+ if(typeof varWeatherId === "undefined")
{
- varWeatherId = '$(#weatherStationId)';
+ varWeatherId = '$(#weatherStationId)';
+ }
+ else
+ {
+ varWeatherId = getJsonData(varWeatherId).id;
}
- var radioDaysValue = $("input[name='radioDays']:checked").val();
-
- var dateStartDate = getAdjustDate(dateToday,radioDaysValue);
- var strStartDate = JSON.stringify(dateStartDate).substring(1,11);
-
- var jsonParamUrlDataHourly = {
- weatherStationId : varWeatherId,
- elementMeasurementTypes : ['TM','RR'],
- logInterval : '1h',
- startDate : strStartDate,
- startTime : '12',
- endDate : strEndDate,
- endTime : '11',
- timeZone : CONST_TIMEZONE
- }
-
-
- jsonHourlyData = getAjaxHourlyData(jsonParamUrlDataHourly);
+ var radioDaysValue = $("input[name='radioDays']:checked").val();
+
+ var dateStartDate = getAdjustDate(dateToday,radioDaysValue);
+ var strStartDate = JSON.stringify(dateStartDate).substring(1,11);
+
+ if(isSpecialWeatherStation(varWeatherId))
+ {
+ var dateStartDate02 = getAdjustDate(dateToday, (parseInt(radioDaysValue) + 1));
+ strStartDate = JSON.stringify(dateStartDate02).substring(1,11);
+ }
+
+ jsonParamUrlDataHourly = getWeatherDataUrlParam(varWeatherId, strStartDate, strEndDate, varElementMeasurementTypes, varLogInIntervalHourly, CONST_TIMEZONE );
- //$('#idTxtDateInput').datepicker("setDate",dateStartDate);
+ getAjaxHourlyData(jsonParamUrlDataHourly,weatherStationIdParamJSON,true);
+
document.querySelector("#idTxtDateInput").valueAsDate = dateStartDate;
/*Calling function to calculate and place heatsum value based upon date placed on datepicker*/
- funDtPickerHeatSum();
+ //funDtPickerHeatSum();
});
+ /* Get the parameters of the URL for weather station */
+ function getWeatherDataUrlParam(varWeatherId, paramStartDate, strEndDate, paramElementMeasurementTypes, paramLogInInterval, paramTimeZone )
+ {
+
+
+ var jsonParamUrlDataHourly = '';
+
+ if(isSpecialWeatherStation(varWeatherId))
+ {
+ jsonParamUrlDataHourly = {
+ logInterval : paramLogInInterval,
+ startDate : paramStartDate,
+ startTime : '12',
+ endDate : strEndDate,
+ endTime : '11',
+ timeZone : paramTimeZone
+ }
+ }
+ else
+ {
+ jsonParamUrlDataHourly = {
+ weatherStationId : varWeatherId,
+ elementMeasurementTypes : paramElementMeasurementTypes,
+ logInterval : paramLogInInterval,
+ startDate : paramStartDate,
+ startTime : '12',
+ endDate : strEndDate,
+ endTime : '11',
+ timeZone : paramTimeZone
+ }
+ }
+
+ return jsonParamUrlDataHourly;
+
+
+ }
+
+
+
/* Radio button click*/
$(document).on("click", ".clsRadioDays", function(event){
$('#weatherStationId').change();
});
- /* Convert hourly data to daily data */
- function setConvertHourlyData(data)
+ /* Hourly data and Convert hourly data to daily data */
+ function setConvertHourlyData(data, flagActivate)
{
- var resultConvertData=[];
-
- var strDate01 = '';
- var strDate02 = '';
- var date01 = null;
- var data02 = null;
- var time19 = '';
- var time20 = '';
- var time21 = '';
- var time22 = '';
- var time23 = '';
- var rainFall = 0.0;
-
- var hourCount = 0;
- var tempval = '';
-
- strDate01 = JSON.stringify(getStrConvertedDate(data[0].timeMeasured)).substring(1,11);
+ resultHeatSumDailyData = [];
+ var tmElementMeasurementType = '';
+ var tmSUM = 0.0;
+ var strDate01_heatSum = '';
- date01 = new Date(strDate01);
- date02 = new Date(strDate01);
+ var resultConvertData = [];
-
- for (var i=0; i<data.length; i++)
- {
-
+ var strDate01 = '';
+ var strDate02 = '';
+ var date01 = null;
+ var data02 = null;
+ var time19 = '';
+ var time20 = '';
+ var time21 = '';
+ var time22 = '';
+ var time23 = '';
+ var rainFall = 0.0;
+
+ var hourCount = 0;
+ var tempval = '';
+
+ strDate01 = JSON.stringify(getStrConvertedDate(data[0].timeMeasured)).substring(1,11);
- strDate02 = JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(1,11);
+ date01 = new Date(strDate01);
+ date02 = new Date(strDate01);
+
+ for (var i=0; i<data.length; i++)
+ {
+ var varDtStartDate = undefined;
+ var radioDaysValue = $("input[name='radioDays']:checked").val();
+
+ var varDtData = new Date($.trim(getStrConvertedDate(data[i].timeMeasured).substring(0,11)));
+ if(flagActivate)
+ {
+ varDtStartDate = new Date($.trim(getStrConvertedDate(getAdjustDate(new Date(),radioDaysValue)).substring(0,11)));
+ }
+ else
+ {
+ var startDate = new Date($.trim($('#idTxtDateInput').val()));
+ varDtStartDate = new Date($.trim(JSON.stringify(getAdjustDate(startDate, 1 )).substring(1,11)));
+ }
+
+ if (varDtData.getTime() >= varDtStartDate.getTime())
+ {
+
+ strDate02 = JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(1,11);
switch (JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(12,14)) {
case '19':
if(data[i].elementMeasurementTypeId==='TM')
{
- time19 = data[i].value;
- tempval = data[i].elementMeasurementTypeId;
+
+ time19 = parseFloat(data[i].value).toFixed(1);
+ tempval = data[i].elementMeasurementTypeId;
}
break;
case '20':
if(data[i].elementMeasurementTypeId==='TM')
{
- time20 = data[i].value;
- tempval = data[i].elementMeasurementTypeId;
+ time20 = parseFloat(data[i].value).toFixed(1);
+ tempval = data[i].elementMeasurementTypeId;
}
break;
case '21':
if(data[i].elementMeasurementTypeId==='TM')
{
- time21 = data[i].value;
- tempval = data[i].elementMeasurementTypeId;
+ time21 = parseFloat(data[i].value).toFixed(1);
+ tempval = data[i].elementMeasurementTypeId;
}
break;
case '22':
if(data[i].elementMeasurementTypeId==='TM')
{
- time22 = data[i].value;
- tempval = data[i].elementMeasurementTypeId;
+ time22 = parseFloat(data[i].value).toFixed(1);
+ tempval = data[i].elementMeasurementTypeId;
}
break;
case '23':
if(data[i].elementMeasurementTypeId==='TM')
{
- time23 = data[i].value;
- tempval = data[i].elementMeasurementTypeId;
+ time23 = parseFloat(data[i].value).toFixed(1);
+ tempval = data[i].elementMeasurementTypeId;
}
break;
@@ -235,47 +376,71 @@
break;
}
-
-
if(strDate01.localeCompare(strDate02) !== 0)
{
-
+ //TODO -- check usability of this below if clause
+ if($.trim(strDate01_heatSum))
+ {
+ resultHeatSumDailyData.push({
+ 'elementMeasurementTypeId' : tmElementMeasurementType,
+ 'value' : (tmSUM/24),
+ 'timeMeasured' : strDate01_heatSum
+ });
+ }
+ var decimalPlace = 2;
+
+ /* Avoiding empty data */
+ if($.trim(time19))
+ {
+ /* Creating JSON list for data table */
+ resultConvertData.push({
+ resultDate: strDate01,
+ 'time19' : time19,
+ 'time20' : time20,
+ 'time21' : time21,
+ 'time22' : time22,
+ 'time23' : time23,
+ 'rainFall': rainFall.toFixed(1)
+ });
+ }
- var decimalPlace = 2;
+ strDate01 = JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(1,11);
+ rainFall = 0.0;
- resultConvertData.push({
- resultDate: strDate01,
- 'time19' : time19.toFixed(1),
- 'time20' : time20.toFixed(1), // getDecimalPlace(time20, decimalPlace),
- 'time21' : time21.toFixed(1),
- 'time22' : time22.toFixed(1),
- 'time23' : time23.toFixed(1),
- 'rainFall': rainFall.toFixed(1) //getDecimalPlace(rainFall,2)
+ tmSUM = 0.0;
+ tmElementMeasurementType = '';
+ strDate01_heatSum = data[i].timeMeasured;
+ }
- });
- strDate01 = JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(1,11);
- rainFall = 0.0;
+ if(data[i].elementMeasurementTypeId === 'RR')
+ {
+ rainFall = rainFall + data[i].value;
+ }
-
- }
- if(data[i].elementMeasurementTypeId==='RR')
+ /* HEAT SUM -- Daily TM */
+ if(data[i].elementMeasurementTypeId==='TM')
{
- rainFall = rainFall + data[i].value;
+ tmElementMeasurementType = data[i].elementMeasurementTypeId;
+ tmSUM = tmSUM + data[i].value;
}
+ }
+
}
- getWeatherDataTable(resultConvertData);
+ if(flagActivate)
+ {
+ getWeatherDataTable(resultConvertData);
+ }
}
-
/*function which return decimal with required (e.g. 2) places without rounding */
function getDecimalPlace(num, place)
{
@@ -285,42 +450,53 @@
/* Calculate the daily TM value for HeatSum */
function getHeatSumValue(data)
{
- var TM_BASE = 10;
- var TM_Daily = 0.0;
- var TM_SUM = 0.0;
- var TM_Calc = 0.0;
- var TM_NON_NEGATIVE = 0;
+ var TM_BASE = 10;
+ var TM_Daily = 0.0;
+ var TM_SUM = 0.0;
+ var TM_Calc = 0.0;
+ var TM_NON_NEGATIVE = 0;
- var counter = undefined;
-
- for (var i=0; i<data.length; i++)
+ var counter = undefined;
+
+ if($.trim(data))
{
- var strStartDateDtPicker = JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(1,11);
-
- if(strStartDateDtPicker===$('#idTxtDateInput').val())
- {
- counter = 0;
- }
- if(typeof counter === "undefined")
- {
- break;
- }
- else
+
+ for (var i=0; i<data.length; i++)
{
- TM_Daily = data[counter].value;
- TM_Calc = TM_Daily - TM_BASE;
- TM_NON_NEGATIVE = TM_NON_NEGATIVE + ((TM_Calc<0) ? 0 : TM_Calc);
- var temp = ((TM_Calc<0) ? 0 : TM_Calc)
- ++counter;
+ var strStartDateDtPicker = JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(1,11);
+
+ if(strStartDateDtPicker === $('#idTxtDateInput').val())
+ {
+ counter = 0;
+ TM_NON_NEGATIVE = 0;
+ }
+ if(typeof counter === "undefined")
+ {
+ //break;
+ }
+ else
+ {
+ TM_Daily = data[counter].value;
+ TM_Calc = TM_Daily - TM_BASE;
+ TM_NON_NEGATIVE = TM_NON_NEGATIVE + ((TM_Calc<0) ? 0 : TM_Calc);
+ ++counter;
+ }
+
}
+ $('#idSpanWeatherStationName').html($('#weatherStationId').find(':selected').text());
+ $('#idSpanStartDate').html($('#idTxtDateInput').val());
+ $('#idSpanEndDate').html(JSON.stringify(dateYesterday).substring(1,11));
+ $('#idDivResultNonNegative').html(Math.round(TM_NON_NEGATIVE));
+ $('#idSpanDateDifference').html(dateDifferenceInDays(new Date($('#idTxtDateInput').val()), new Date()));
+ }
+ else
+ {
+ $('#idSpanWeatherStationName').html('');
+ $('#idSpanStartDate').html('');
+ $('#idSpanEndDate').html('');
+ $('#idDivResultNonNegative').html('');
+ $('#idSpanDateDifference').html('');
}
-
- $('#idSpanWeatherStationName').html($('#weatherStationId').find(':selected').text());
- $('#idSpanStartDate').html($('#idTxtDateInput').val());
- $('#idSpanEndDate').html(JSON.stringify(dateYesterday).substring(1,11));
- $('#idDivResultNonNegative').html(Math.round(TM_NON_NEGATIVE));
- $('#idSpanDateDifference').html(dateDifferenceInDays(new Date($('#idTxtDateInput').val()), new Date()));
-
}
@@ -330,17 +506,19 @@
if($.trim(weatherData))
{
$('#idTableWeather').DataTable({
- "sDom": '<t><"clearfix">',
- "lengthMenu": [[50, -1], ["All"]],
- "aaData" : weatherData,
- "aoColumns" :
+ "sDom" : '<t><"clearfix">',
+ "lengthMenu" : [[50, -1], ["All"]],
+ "aaData" : weatherData,
+ "aoColumns" :
[
{
- "mData" : "resultDate",
- "render" :function(data, type, full, meta)
- {
- return data
- }
+ "mData" : "resultDate",
+ "render" : function(data, type, full, meta)
+ {
+ return data
+ },
+ "sClass" : "colCenter",
+ "bSortable" : false
},
{
"mData" : "time19",
@@ -348,6 +526,7 @@
{
return data
},
+ "sClass" : "colCenter",
"bSortable" : false
},
@@ -357,22 +536,26 @@
{
return data
},
+ "sClass" : "colCenter",
"bSortable" : false
},
+
{
"mData" : "time21",
"render" :function(data, type, full, meta)
{
return data
},
+ "sClass" : "colCenter",
"bSortable" : false
},
- {
+ {
"mData" : "time22",
"render" :function(data, type, full, meta)
{
return data
},
+ "sClass" : "colCenter",
"bSortable" : false
},
{
@@ -381,6 +564,7 @@
{
return data
},
+ "sClass" : "colCenter",
"bSortable" : false
} ,
{
@@ -389,10 +573,11 @@
{
return data
},
+ "sClass" : "colCenter",
"bSortable" : false
- }
+ }
],
- destroy: true
+ destroy : true
});
$('.dtr-data').addClass('text-wrap');
}
@@ -404,34 +589,61 @@
}
+
+
/* Fetch hourly data through ajax call */
- function getAjaxHourlyData(jsonParamUrlDataHourly)
+ function getAjaxHourlyData(jsonParamUrlDataHourly,idJsonParam, flagActivate)
{
- var resultData = "";
-
+ var resultData = [];
+ var strUrl = "";
+ if($.trim(idJsonParam.pas))
+ {
+ strUrl = "https://weather.vips.nibio.no/rest/fruitwebdavis/id="+idJsonParam.id+"&pw="+idJsonParam.pas;
+ }
+ else
+ {
+ strUrl = "https://lmt.nibio.no/services/rest/vips/getdata/forecastfallback";
+ }
$.ajax({
- url : "https://lmt.nibio.no/services/rest/vips/getdata/forecastfallback",
- type : 'GET',
- cache : false,
- data : jsonParamUrlDataHourly,
- //async : false,
- success : function (data) {
+ url : strUrl,
+ type : 'GET',
+ cache : false,
+ data : jsonParamUrlDataHourly,
+ success : function (data) {
+ resultHeatSumDailyData = []; /* Re initialize */
+ resultData = [];
if($.trim(data))
{
+ $('#idTableWeather').show();
$('#idDivHeatSum').show();
+ $('#divIdErrorWeatherStation').hide();
resultData = data;
- setConvertHourlyData(resultData);
+ setConvertHourlyData(resultData, flagActivate);
+
+ if($.trim(idJsonParam.pas))
+ {
+
+ getHeatSumValue(resultHeatSumDailyData);
+ resultHeatSumDailyData = [];
+ }
+ else
+ {
+ funDtPickerHeatSum();
+ }
+
+
}
else{
$('#idDivHeatSum').hide();
+ $('#divIdErrorWeatherStation').show();
+ $('#idTableWeather').hide();
}
},
error : function(xhr, status, error)
{
-
+ $('#idTableWeather').hide();
$('#idDivHeatSum').hide();
- alert('test 4');
}
});
@@ -443,43 +655,37 @@
/* Fetch Daily data through ajax call */
- function getAjaxDailyData(jsonParamUrlDataHourly)
+ function getAjaxDailyData(jsonParamUrlDataHourly,idJsonParam)
{
- var resultData = "";
-
- $.ajax({
- url : "https://lmt.nibio.no/services/rest/vips/getdata/forecastfallback",
- type : 'GET',
- cache : false,
- data : jsonParamUrlDataHourly,
- //async : false,
- success : function (data) {
- if($.trim(data))
+ var resultData = [];
+ $.ajax({
+ url : "https://lmt.nibio.no/services/rest/vips/getdata/forecastfallback",
+ type : 'GET',
+ cache : false,
+ data : jsonParamUrlDataHourly,
+ success : function (data) {
+ resultData = [];
+ if($.trim(data))
+ {
+ resultData = data;
+ getHeatSumValue(resultData);
+ }
+ },
+ error : function(xhr, status, error)
{
-
- resultData = data;
- getHeatSumValue(resultData);
+ //TODO
}
- else{
- //TODO
- }
- },
- error : function(xhr, status, error)
- {
- //TODO
- }
- });
-
+ });
+
return resultData;
-
}
/* Adjust the dates as per radio button click to understand start date and end date*/
function getAdjustDate(date,days)
{
- var result = new Date(date);
- result.setDate(result.getDate() - days);
+ var result = new Date(date);
+ result.setDate(result.getDate() - days);
return result;
}
@@ -492,9 +698,9 @@
/* Date difference */
function dateDifferenceInDays(startDate, endDate)
{
- var strEndDate = JSON.stringify(endDate).substring(1,11);
- var dtEndDate = new Date(strEndDate);
- var result = (dtEndDate - startDate)/(1000*60*60*24);
+ var strEndDate = JSON.stringify(endDate).substring(1,11);
+ var dtEndDate = new Date(strEndDate);
+ var result = (dtEndDate - startDate)/(1000*60*60*24);
return result;
}
@@ -504,39 +710,54 @@
{% block content %}
-
+<div class="col-sm-10">
+ <div id='divIdAjaxLoader' class="alert alert-warning alert-dismissable" style="display: none;" ><span class=".glyphicon .glyphicon-minus-sign"></span> <center><b>Loading weather data !! If it takes long time. Talk to administrator</b> </center></div>
+</div>
+<div class="clearfix"></div>
<div class="col-md-12" >
<h1>{% trans "Calculate the risk of attack by the coddling moth" %}</h1>
</div>
-
-
-<div class="container-fluid">
+<div class="col-md-12">
+ <h4>{% trans '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 nedenfor. ' %}</h4>
+</div>
+<div class="clearfix"></div>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-sm-10">
+ <div id='divIdErrorWeatherStation' class="alert alert-danger .alert-dismissable" style="display: none;" ><span class=".glyphicon .glyphicon-minus-sign"></span> No records available from selected weather station !!</div>
+ </div>
+ </div>
<div class="row ">
<div class="col-sm-4">
<select name="weatherStationName" id="weatherStationId" class="form-control">
<option value="-1">-- {% trans "Select weather station" %} --</option>
- <option value="11">Apelsvoll</option>
- <option value="12">Balestrand</option>
- <option value="13">Bø</option>
- <option value="86">Darbu</option>
- <option value="19">Gjerpen</option>
- <option value="21">Gvarv</option>
- <option value="22">Hjelmeland</option>
- <option value="25">Hønefoss</option>
- <option value="27">Kise</option>
- <option value="29">Landvik</option>
- <option value="30">Lier</option>
- <option value="65">Ljøsne</option>
- <option value="32">Lyngdal</option>
- <option value="35">Njøs</option>
- <option value="41">Rygge</option>
- <option value="42">Sande</option>
- <option value="131">Sandefjord</option>
- <option value="64">Slinde</option>
- <option value="47">Svelvik</option>
- <option value="91">Søve</option>
- <option value="61">Åsbakken</option>
+ <option value='{"id":"11","pas":""}'>Apelsvoll</option>
+ <option value='{"id":"12","pas":""}'>Balestrand</option>
+ <option value='{"id":"13","pas":""}'>Bø</option>
+ <option value='{"id":"86","pas":""}'>Darbu</option>
+ <option value='{"id":"19","pas":""}'>Gjerpen</option>
+ <option value='{"id":"21","pas":""}'>Gvarv</option>
+ <option value='{"id":"22","pas":""}'>Hjelmeland</option>
+ <option value='{"id":"25","pas":""}'>Hønefoss</option>
+ <option value='{"id":"27","pas":""}'>Kise</option>
+ <option value='{"id":"29","pas":""}'>Landvik</option>
+ <option value='{"id":"30","pas":""}'>Lier</option>
+ <option value='{"id":"65","pas":""}'>Ljøsne</option>
+ <option value='{"id":"32","pas":""}'>Lyngdal</option>
+ <option value='{"id":"35","pas":""}'>Njøs</option>
+ <option value='{"id":"41","pas":""}'>Rygge</option>
+ <option value='{"id":"42","pas":""}'>Sande</option>
+ <option value='{"id":"131","pas":""}'>Sandefjord</option>
+ <option value='{"id":"64","pas":""}'>Slinde</option>
+ <option value='{"id":"47","pas":""}'>Svelvik</option>
+ <option value='{"id":"91","pas":""}'>Søve</option>
+ <option value='{"id":"61","pas":""}'>Åsbakken</option>
+ <!--
+ <option value='{"id":"536","pas":"GF90esoleo"}'>Helgøy</option>
+ <option value='{"id":"537","pas":"Kgsf72k388"}'>Skiftun</option>
+ -->
+
</select>
</div>
<div class="col-sm-6">
@@ -556,7 +777,7 @@
<div class="row">
<div class="col-sm-10">
- <table id="idTableWeather" class="table table-striped table-bordered dt-responsive nowrap collapsed " style="width:fit-content;">
+ <table id="idTableWeather" class="table table-striped table-bordered dt-responsive nowrap collapsed " style="width:fit-content; display: none;">
<thead>
<tr>
<th>{% trans "Date" %}</th>
@@ -580,18 +801,19 @@
<div class="container-fluid" id="idDivHeatSum" style="display: none;">
<div class="row ">
- <label class="control-label">{% trans "Heat sum" %}</label>
+ <h3>{% trans "Heat sum" %}</h3>
<form class="form-inline">
<div class="form-group form-inline">
<label for="nameTxtDateInput">{% trans "Calculate heat sum from date" %}:</label>
- <input id="idTxtDateInput" name="nameTxtDateInput" class="form-control" type="date" placeholder="yyyy-mm-dd" onkeydown="return false" value="2020-01-01"/>
+ <input id="idTxtDateInput" name="nameTxtDateInput" class="form-control" type="date" placeholder="yyyy-mm-dd" onkeydown="return false" value="2020-01-01" style="line-height: inherit;"/>
</div>
<!-- button type="submit" class="btn btn-default">Submit</button -->
</form>
</div>
- <div class="row alert alert-warning">
- {% trans "Heat sum, with a base temperature of 10 degrees Celcius, calculated for" %} <span id='idSpanWeatherStationName'>-</span> {% trans "weather station for the period starting with" %} <span id="idSpanStartDate">-</span> {% trans "and ending with" %} <span id="idSpanEndDate">--</span> (<span id="idSpanDateDifference">-</span> {% trans "days" %}) {% trans "is" %} : <span class="label label-primary" id="idDivResultNonNegative"></span> {% trans "day degrees" %}
+ <div><br></div>
+ <div class="row alert alert-success">
+ {% trans "Heat sum, with a base temperature of 10 degrees Celcius, calculated for " %} <b><span id='idSpanWeatherStationName'>-</span></b> {% trans "weather station for the period starting with" %} <b><span id="idSpanStartDate">-</span></b> {% trans "and ending with" %} <b><span id="idSpanEndDate">--</span></b> (<b><span id="idSpanDateDifference">-</span></b> {% trans "days" %}) {% trans "is" %} : <b><span id="idDivResultNonNegative"></span></b> {% trans "day degrees" %}
</div>
</div>
diff --git a/forecasts/locale/bg/LC_MESSAGES/django.po b/forecasts/locale/bg/LC_MESSAGES/django.po
index 1e7da06d5552f724a3ae184b9fc3bd1fb7b3a560..cd5da8967addf897997a5ef7a8fdfffc5e474eb7 100755
--- a/forecasts/locale/bg/LC_MESSAGES/django.po
+++ b/forecasts/locale/bg/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPS BG\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-21 16:07+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2014-05-14 09:37+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,203 +30,219 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.5\n"
-#: models.py:521
+#: forecasts/models.py:541
msgid "Language code"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:1
+#: forecasts/templates/forecasts/bogus_translation_template.html:1
msgid "Percent"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:2
+#: forecasts/templates/forecasts/bogus_translation_template.html:2
msgid "Number"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:3
+#: forecasts/templates/forecasts/bogus_translation_template.html:3
msgid "Aggregated day degrees"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:4
+#: forecasts/templates/forecasts/bogus_translation_template.html:4
msgid "Degrees Celcius"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:5
+#: forecasts/templates/forecasts/bogus_translation_template.html:5
msgid "Hours"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:6
+#: forecasts/templates/forecasts/bogus_translation_template.html:6
msgid "Millimeters"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:7
+#: forecasts/templates/forecasts/bogus_translation_template.html:7
msgid "Minutes"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:8
+#: forecasts/templates/forecasts/bogus_translation_template.html:8
msgid "Minutes/day"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:9
+#: forecasts/templates/forecasts/bogus_translation_template.html:9
msgid "Minutes/hour"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:10
+#: forecasts/templates/forecasts/bogus_translation_template.html:10
#, fuzzy
#| msgid "Timestamp"
msgid "Time"
msgstr "Единица за време"
-#: templates/forecasts/bogus_translation_template.html:11
+#: forecasts/templates/forecasts/bogus_translation_template.html:11
msgid "Watt/square meter"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:12
+#: forecasts/templates/forecasts/bogus_translation_template.html:12
msgid "Yes or no"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:13
+#: forecasts/templates/forecasts/bogus_translation_template.html:13
msgid "Risk value"
msgstr ""
-#: templates/forecasts/detail.html:25 templates/forecasts/detail.html.py:27
-#: templates/forecasts/detail_error.html:25
+#: forecasts/templates/forecasts/detail.html:25
+#: forecasts/templates/forecasts/detail.html:27
+#: forecasts/templates/forecasts/detail_error.html:25
msgid "Details"
msgstr "Подробности"
-#: templates/forecasts/detail.html:38
+#: forecasts/templates/forecasts/detail.html:38
msgid "Model"
msgstr "Модел"
-#: templates/forecasts/detail.html:39 templates/forecasts/index.html:63
-#: templates/forecasts/index.html.py:84
+#: forecasts/templates/forecasts/detail.html:39
+#: forecasts/templates/forecasts/index.html:63
+#: forecasts/templates/forecasts/index.html:84
msgid "Location"
msgstr "Място"
-#: templates/forecasts/detail.html:40 templates/forecasts/index.html:62
-#: templates/forecasts/index.html.py:83
+#: forecasts/templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/index.html:62
+#: forecasts/templates/forecasts/index.html:83
msgid "Weather station"
msgstr "Климатична станция"
-#: templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/detail.html:40
msgid "Distance to location"
msgstr "Разстояние до мястото"
-#: templates/forecasts/detail.html:41
+#: forecasts/templates/forecasts/detail.html:41
msgid "Period"
msgstr "Период"
-#: templates/forecasts/detail.html:45
+#: forecasts/templates/forecasts/detail.html:45
msgid "Showing latest"
msgstr ""
-#: templates/forecasts/detail.html:47
+#: forecasts/templates/forecasts/detail.html:47
msgid "Days"
msgstr ""
-#: templates/forecasts/detail.html:48
+#: forecasts/templates/forecasts/detail.html:48
msgid "Change"
msgstr ""
-#: templates/forecasts/detail.html:56
+#: forecasts/templates/forecasts/detail.html:56
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: templates/forecasts/detail.html:68
+#: forecasts/templates/forecasts/detail.html:68
msgid "Timestamp"
msgstr "Единица за време"
-#: templates/forecasts/detail.html:69
+#: forecasts/templates/forecasts/detail.html:69
msgid "Warning status"
msgstr "Вид предупреждение"
-#: templates/forecasts/detail.html:89
+#: forecasts/templates/forecasts/detail.html:89
msgid "No results for this forecast"
msgstr "Няма резултати за тази прогноза"
-#: templates/forecasts/detail_error.html:27
+#: forecasts/templates/forecasts/detail_error.html:27
msgid "Error with details"
msgstr ""
-#: templates/forecasts/detail_error.html:28
+#: forecasts/templates/forecasts/detail_error.html:28
msgid "Forecast not found"
msgstr ""
-#: templates/forecasts/detail_error.html:29
+#: forecasts/templates/forecasts/detail_error.html:29
msgid "To list of available forecasts"
msgstr ""
-#: templates/forecasts/index.html:25 templates/forecasts/index.html.py:27
+#: forecasts/templates/forecasts/index.html:25
+#: forecasts/templates/forecasts/index.html:27
msgid "Forecasts"
msgstr "Прогнози"
-#: templates/forecasts/index.html:45
+#: forecasts/templates/forecasts/index.html:45
msgid "Search"
msgstr ""
-#: templates/forecasts/index.html:59 templates/forecasts/index.html.py:80
+#: forecasts/templates/forecasts/index.html:59
+#: forecasts/templates/forecasts/index.html:80
msgid "Crop"
msgstr ""
-#: templates/forecasts/index.html:60 templates/forecasts/index.html.py:81
+#: forecasts/templates/forecasts/index.html:60
+#: forecasts/templates/forecasts/index.html:81
msgid "Pest"
msgstr ""
-#: templates/forecasts/index.html:61 templates/forecasts/index.html.py:82
+#: forecasts/templates/forecasts/index.html:61
+#: forecasts/templates/forecasts/index.html:82
msgid "Model name"
msgstr "Име на модела"
-#: templates/forecasts/index.html:64 templates/forecasts/index.html.py:85
+#: forecasts/templates/forecasts/index.html:64
+#: forecasts/templates/forecasts/index.html:85
msgid "Date start"
msgstr "Начална дата"
-#: templates/forecasts/index.html:65 templates/forecasts/index.html.py:86
+#: forecasts/templates/forecasts/index.html:65
+#: forecasts/templates/forecasts/index.html:86
msgid "Date end"
msgstr "Крайна дата"
-#: templates/forecasts/index.html:75
+#: forecasts/templates/forecasts/index.html:75
#, fuzzy
#| msgid "Forecasts"
msgid "Private forecasts"
msgstr "Прогнози"
-#: templates/forecasts/index.html:100 templates/forecasts/index.html.py:139
+#: forecasts/templates/forecasts/index.html:100
+#: forecasts/templates/forecasts/index.html:139
msgid "Results"
msgstr "Резултати"
-#: templates/forecasts/index.html:155
+#: forecasts/templates/forecasts/index.html:155
msgid "Select crop"
msgstr ""
-#: templates/forecasts/index.html:171
+#: forecasts/templates/forecasts/index.html:171
msgid "Select pest"
msgstr ""
-#: templates/forecasts/index.html:187
+#: forecasts/templates/forecasts/index.html:187
msgid "Select model"
msgstr ""
-#: templates/models/detail.html:22 templates/models/detail_test.html:22
-#: templates/models/index.html:22 templates/models/index.html.py:24
+#: forecasts/templates/models/detail.html:22
+#: forecasts/templates/models/detail_test.html:22
+#: forecasts/templates/models/index.html:22
+#: forecasts/templates/models/index.html:24
msgid "Models"
msgstr "Модели"
-#: templates/models/detail.html:28 templates/models/detail_test.html:28
+#: forecasts/templates/models/detail.html:28
+#: forecasts/templates/models/detail_test.html:28
msgid "Description"
msgstr "Описание"
-#: templates/models/detail.html:29 templates/models/detail_test.html:29
+#: forecasts/templates/models/detail.html:29
+#: forecasts/templates/models/detail_test.html:29
msgid "Interpretation of warning status"
msgstr ""
-#: templates/models/detail.html:30 templates/models/detail_test.html:30
+#: forecasts/templates/models/detail.html:30
+#: forecasts/templates/models/detail_test.html:30
msgid "Technical usage"
msgstr ""
-#: templates/models/detail.html:31 templates/models/detail_test.html:31
+#: forecasts/templates/models/detail.html:31
+#: forecasts/templates/models/detail_test.html:31
msgid "Sample configuration"
msgstr "Конфигурация на пробата"
-#: templates/models/detail.html:44
+#: forecasts/templates/models/detail.html:44
msgid "This is technical info for model and web developers"
msgstr ""
diff --git a/forecasts/locale/bs/LC_MESSAGES/django.po b/forecasts/locale/bs/LC_MESSAGES/django.po
index ad4a1ecff7a2037bd554bbe306ea24ec536ed313..2f16e3e43264ab2758979b820f58d9152eaecf18 100755
--- a/forecasts/locale/bs/LC_MESSAGES/django.po
+++ b/forecasts/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-21 16:07+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2015-02-13 11:10+0100\n"
"Last-Translator: Mladen Cucak <mladencucak@gmail.com>\n"
"Language-Team: LANGUAGE <wvjeko@gmail.com>\n"
@@ -20,203 +20,219 @@ msgstr ""
"X-Generator: Poedit 1.7.4\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: models.py:521
+#: forecasts/models.py:541
msgid "Language code"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:1
+#: forecasts/templates/forecasts/bogus_translation_template.html:1
msgid "Percent"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:2
+#: forecasts/templates/forecasts/bogus_translation_template.html:2
msgid "Number"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:3
+#: forecasts/templates/forecasts/bogus_translation_template.html:3
msgid "Aggregated day degrees"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:4
+#: forecasts/templates/forecasts/bogus_translation_template.html:4
msgid "Degrees Celcius"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:5
+#: forecasts/templates/forecasts/bogus_translation_template.html:5
msgid "Hours"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:6
+#: forecasts/templates/forecasts/bogus_translation_template.html:6
msgid "Millimeters"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:7
+#: forecasts/templates/forecasts/bogus_translation_template.html:7
msgid "Minutes"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:8
+#: forecasts/templates/forecasts/bogus_translation_template.html:8
msgid "Minutes/day"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:9
+#: forecasts/templates/forecasts/bogus_translation_template.html:9
msgid "Minutes/hour"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:10
+#: forecasts/templates/forecasts/bogus_translation_template.html:10
#, fuzzy
#| msgid "Timestamp"
msgid "Time"
msgstr "Tačno vrijeme "
-#: templates/forecasts/bogus_translation_template.html:11
+#: forecasts/templates/forecasts/bogus_translation_template.html:11
msgid "Watt/square meter"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:12
+#: forecasts/templates/forecasts/bogus_translation_template.html:12
msgid "Yes or no"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:13
+#: forecasts/templates/forecasts/bogus_translation_template.html:13
msgid "Risk value"
msgstr ""
-#: templates/forecasts/detail.html:25 templates/forecasts/detail.html.py:27
-#: templates/forecasts/detail_error.html:25
+#: forecasts/templates/forecasts/detail.html:25
+#: forecasts/templates/forecasts/detail.html:27
+#: forecasts/templates/forecasts/detail_error.html:25
msgid "Details"
msgstr "Detalji"
-#: templates/forecasts/detail.html:38
+#: forecasts/templates/forecasts/detail.html:38
msgid "Model"
msgstr "Model"
-#: templates/forecasts/detail.html:39 templates/forecasts/index.html:63
-#: templates/forecasts/index.html.py:84
+#: forecasts/templates/forecasts/detail.html:39
+#: forecasts/templates/forecasts/index.html:63
+#: forecasts/templates/forecasts/index.html:84
msgid "Location"
msgstr "Lokacija"
-#: templates/forecasts/detail.html:40 templates/forecasts/index.html:62
-#: templates/forecasts/index.html.py:83
+#: forecasts/templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/index.html:62
+#: forecasts/templates/forecasts/index.html:83
msgid "Weather station"
msgstr "Meteo stanica"
-#: templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/detail.html:40
msgid "Distance to location"
msgstr "Udaljenost od lokacije"
-#: templates/forecasts/detail.html:41
+#: forecasts/templates/forecasts/detail.html:41
msgid "Period"
msgstr "Razdoblje "
-#: templates/forecasts/detail.html:45
+#: forecasts/templates/forecasts/detail.html:45
msgid "Showing latest"
msgstr "Prikazuje najnovije"
-#: templates/forecasts/detail.html:47
+#: forecasts/templates/forecasts/detail.html:47
msgid "Days"
msgstr "Dana"
-#: templates/forecasts/detail.html:48
+#: forecasts/templates/forecasts/detail.html:48
msgid "Change"
msgstr "Izmijeni"
-#: templates/forecasts/detail.html:56
+#: forecasts/templates/forecasts/detail.html:56
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: templates/forecasts/detail.html:68
+#: forecasts/templates/forecasts/detail.html:68
msgid "Timestamp"
msgstr "Tačno vrijeme "
-#: templates/forecasts/detail.html:69
+#: forecasts/templates/forecasts/detail.html:69
msgid "Warning status"
msgstr "Status upozorenja"
-#: templates/forecasts/detail.html:89
+#: forecasts/templates/forecasts/detail.html:89
msgid "No results for this forecast"
msgstr "Nema rezultata za ovu prognozu"
-#: templates/forecasts/detail_error.html:27
+#: forecasts/templates/forecasts/detail_error.html:27
msgid "Error with details"
msgstr ""
-#: templates/forecasts/detail_error.html:28
+#: forecasts/templates/forecasts/detail_error.html:28
msgid "Forecast not found"
msgstr ""
-#: templates/forecasts/detail_error.html:29
+#: forecasts/templates/forecasts/detail_error.html:29
msgid "To list of available forecasts"
msgstr ""
-#: templates/forecasts/index.html:25 templates/forecasts/index.html.py:27
+#: forecasts/templates/forecasts/index.html:25
+#: forecasts/templates/forecasts/index.html:27
msgid "Forecasts"
msgstr "Prognoze"
-#: templates/forecasts/index.html:45
+#: forecasts/templates/forecasts/index.html:45
msgid "Search"
msgstr ""
-#: templates/forecasts/index.html:59 templates/forecasts/index.html.py:80
+#: forecasts/templates/forecasts/index.html:59
+#: forecasts/templates/forecasts/index.html:80
msgid "Crop"
msgstr "Usjev"
-#: templates/forecasts/index.html:60 templates/forecasts/index.html.py:81
+#: forecasts/templates/forecasts/index.html:60
+#: forecasts/templates/forecasts/index.html:81
msgid "Pest"
msgstr ""
-#: templates/forecasts/index.html:61 templates/forecasts/index.html.py:82
+#: forecasts/templates/forecasts/index.html:61
+#: forecasts/templates/forecasts/index.html:82
msgid "Model name"
msgstr "Ime modela "
-#: templates/forecasts/index.html:64 templates/forecasts/index.html.py:85
+#: forecasts/templates/forecasts/index.html:64
+#: forecasts/templates/forecasts/index.html:85
msgid "Date start"
msgstr "Datum početka"
-#: templates/forecasts/index.html:65 templates/forecasts/index.html.py:86
+#: forecasts/templates/forecasts/index.html:65
+#: forecasts/templates/forecasts/index.html:86
msgid "Date end"
msgstr "Datum završetka "
-#: templates/forecasts/index.html:75
+#: forecasts/templates/forecasts/index.html:75
#, fuzzy
#| msgid "Forecasts"
msgid "Private forecasts"
msgstr "Prognoze"
-#: templates/forecasts/index.html:100 templates/forecasts/index.html.py:139
+#: forecasts/templates/forecasts/index.html:100
+#: forecasts/templates/forecasts/index.html:139
msgid "Results"
msgstr "Rezultati "
-#: templates/forecasts/index.html:155
+#: forecasts/templates/forecasts/index.html:155
msgid "Select crop"
msgstr ""
-#: templates/forecasts/index.html:171
+#: forecasts/templates/forecasts/index.html:171
msgid "Select pest"
msgstr ""
-#: templates/forecasts/index.html:187
+#: forecasts/templates/forecasts/index.html:187
msgid "Select model"
msgstr ""
-#: templates/models/detail.html:22 templates/models/detail_test.html:22
-#: templates/models/index.html:22 templates/models/index.html.py:24
+#: forecasts/templates/models/detail.html:22
+#: forecasts/templates/models/detail_test.html:22
+#: forecasts/templates/models/index.html:22
+#: forecasts/templates/models/index.html:24
msgid "Models"
msgstr "Modeli"
-#: templates/models/detail.html:28 templates/models/detail_test.html:28
+#: forecasts/templates/models/detail.html:28
+#: forecasts/templates/models/detail_test.html:28
msgid "Description"
msgstr "Opis"
-#: templates/models/detail.html:29 templates/models/detail_test.html:29
+#: forecasts/templates/models/detail.html:29
+#: forecasts/templates/models/detail_test.html:29
msgid "Interpretation of warning status"
msgstr ""
-#: templates/models/detail.html:30 templates/models/detail_test.html:30
+#: forecasts/templates/models/detail.html:30
+#: forecasts/templates/models/detail_test.html:30
msgid "Technical usage"
msgstr ""
-#: templates/models/detail.html:31 templates/models/detail_test.html:31
+#: forecasts/templates/models/detail.html:31
+#: forecasts/templates/models/detail_test.html:31
msgid "Sample configuration"
msgstr "Primjer konfiguracije "
-#: templates/models/detail.html:44
+#: forecasts/templates/models/detail.html:44
msgid "This is technical info for model and web developers"
msgstr ""
diff --git a/forecasts/locale/de/LC_MESSAGES/django.po b/forecasts/locale/de/LC_MESSAGES/django.po
index 4c5bba303877257ddd51228007fd6a76ddbb185c..0be73829e9112784c690db7aa0abd39ed9f34163 100755
--- a/forecasts/locale/de/LC_MESSAGES/django.po
+++ b/forecasts/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: 2018-08-21 16:07+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,198 +18,214 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: models.py:521
+#: forecasts/models.py:541
msgid "Language code"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:1
+#: forecasts/templates/forecasts/bogus_translation_template.html:1
msgid "Percent"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:2
+#: forecasts/templates/forecasts/bogus_translation_template.html:2
msgid "Number"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:3
+#: forecasts/templates/forecasts/bogus_translation_template.html:3
msgid "Aggregated day degrees"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:4
+#: forecasts/templates/forecasts/bogus_translation_template.html:4
msgid "Degrees Celcius"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:5
+#: forecasts/templates/forecasts/bogus_translation_template.html:5
msgid "Hours"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:6
+#: forecasts/templates/forecasts/bogus_translation_template.html:6
msgid "Millimeters"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:7
+#: forecasts/templates/forecasts/bogus_translation_template.html:7
msgid "Minutes"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:8
+#: forecasts/templates/forecasts/bogus_translation_template.html:8
msgid "Minutes/day"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:9
+#: forecasts/templates/forecasts/bogus_translation_template.html:9
msgid "Minutes/hour"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:10
+#: forecasts/templates/forecasts/bogus_translation_template.html:10
msgid "Time"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:11
+#: forecasts/templates/forecasts/bogus_translation_template.html:11
msgid "Watt/square meter"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:12
+#: forecasts/templates/forecasts/bogus_translation_template.html:12
msgid "Yes or no"
msgstr ""
-#: templates/forecasts/bogus_translation_template.html:13
+#: forecasts/templates/forecasts/bogus_translation_template.html:13
msgid "Risk value"
msgstr ""
-#: templates/forecasts/detail.html:25 templates/forecasts/detail.html.py:27
-#: templates/forecasts/detail_error.html:25
+#: forecasts/templates/forecasts/detail.html:25
+#: forecasts/templates/forecasts/detail.html:27
+#: forecasts/templates/forecasts/detail_error.html:25
msgid "Details"
msgstr ""
-#: templates/forecasts/detail.html:38
+#: forecasts/templates/forecasts/detail.html:38
msgid "Model"
msgstr ""
-#: templates/forecasts/detail.html:39 templates/forecasts/index.html:63
-#: templates/forecasts/index.html.py:84
+#: forecasts/templates/forecasts/detail.html:39
+#: forecasts/templates/forecasts/index.html:63
+#: forecasts/templates/forecasts/index.html:84
msgid "Location"
msgstr ""
-#: templates/forecasts/detail.html:40 templates/forecasts/index.html:62
-#: templates/forecasts/index.html.py:83
+#: forecasts/templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/index.html:62
+#: forecasts/templates/forecasts/index.html:83
msgid "Weather station"
msgstr ""
-#: templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/detail.html:40
msgid "Distance to location"
msgstr ""
-#: templates/forecasts/detail.html:41
+#: forecasts/templates/forecasts/detail.html:41
msgid "Period"
msgstr ""
-#: templates/forecasts/detail.html:45
+#: forecasts/templates/forecasts/detail.html:45
msgid "Showing latest"
msgstr ""
-#: templates/forecasts/detail.html:47
+#: forecasts/templates/forecasts/detail.html:47
msgid "Days"
msgstr ""
-#: templates/forecasts/detail.html:48
+#: forecasts/templates/forecasts/detail.html:48
msgid "Change"
msgstr ""
-#: templates/forecasts/detail.html:56
+#: forecasts/templates/forecasts/detail.html:56
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
-#: templates/forecasts/detail.html:68
+#: forecasts/templates/forecasts/detail.html:68
msgid "Timestamp"
msgstr ""
-#: templates/forecasts/detail.html:69
+#: forecasts/templates/forecasts/detail.html:69
msgid "Warning status"
msgstr ""
-#: templates/forecasts/detail.html:89
+#: forecasts/templates/forecasts/detail.html:89
msgid "No results for this forecast"
msgstr ""
-#: templates/forecasts/detail_error.html:27
+#: forecasts/templates/forecasts/detail_error.html:27
msgid "Error with details"
msgstr ""
-#: templates/forecasts/detail_error.html:28
+#: forecasts/templates/forecasts/detail_error.html:28
msgid "Forecast not found"
msgstr ""
-#: templates/forecasts/detail_error.html:29
+#: forecasts/templates/forecasts/detail_error.html:29
msgid "To list of available forecasts"
msgstr ""
-#: templates/forecasts/index.html:25 templates/forecasts/index.html.py:27
+#: forecasts/templates/forecasts/index.html:25
+#: forecasts/templates/forecasts/index.html:27
msgid "Forecasts"
msgstr ""
-#: templates/forecasts/index.html:45
+#: forecasts/templates/forecasts/index.html:45
msgid "Search"
msgstr ""
-#: templates/forecasts/index.html:59 templates/forecasts/index.html.py:80
+#: forecasts/templates/forecasts/index.html:59
+#: forecasts/templates/forecasts/index.html:80
msgid "Crop"
msgstr ""
-#: templates/forecasts/index.html:60 templates/forecasts/index.html.py:81
+#: forecasts/templates/forecasts/index.html:60
+#: forecasts/templates/forecasts/index.html:81
msgid "Pest"
msgstr ""
-#: templates/forecasts/index.html:61 templates/forecasts/index.html.py:82
+#: forecasts/templates/forecasts/index.html:61
+#: forecasts/templates/forecasts/index.html:82
msgid "Model name"
msgstr ""
-#: templates/forecasts/index.html:64 templates/forecasts/index.html.py:85
+#: forecasts/templates/forecasts/index.html:64
+#: forecasts/templates/forecasts/index.html:85
msgid "Date start"
msgstr ""
-#: templates/forecasts/index.html:65 templates/forecasts/index.html.py:86
+#: forecasts/templates/forecasts/index.html:65
+#: forecasts/templates/forecasts/index.html:86
msgid "Date end"
msgstr ""
-#: templates/forecasts/index.html:75
+#: forecasts/templates/forecasts/index.html:75
msgid "Private forecasts"
msgstr ""
-#: templates/forecasts/index.html:100 templates/forecasts/index.html.py:139
+#: forecasts/templates/forecasts/index.html:100
+#: forecasts/templates/forecasts/index.html:139
msgid "Results"
msgstr ""
-#: templates/forecasts/index.html:155
+#: forecasts/templates/forecasts/index.html:155
msgid "Select crop"
msgstr ""
-#: templates/forecasts/index.html:171
+#: forecasts/templates/forecasts/index.html:171
msgid "Select pest"
msgstr ""
-#: templates/forecasts/index.html:187
+#: forecasts/templates/forecasts/index.html:187
msgid "Select model"
msgstr ""
-#: templates/models/detail.html:22 templates/models/detail_test.html:22
-#: templates/models/index.html:22 templates/models/index.html.py:24
+#: forecasts/templates/models/detail.html:22
+#: forecasts/templates/models/detail_test.html:22
+#: forecasts/templates/models/index.html:22
+#: forecasts/templates/models/index.html:24
msgid "Models"
msgstr ""
-#: templates/models/detail.html:28 templates/models/detail_test.html:28
+#: forecasts/templates/models/detail.html:28
+#: forecasts/templates/models/detail_test.html:28
msgid "Description"
msgstr ""
-#: templates/models/detail.html:29 templates/models/detail_test.html:29
+#: forecasts/templates/models/detail.html:29
+#: forecasts/templates/models/detail_test.html:29
msgid "Interpretation of warning status"
msgstr ""
-#: templates/models/detail.html:30 templates/models/detail_test.html:30
+#: forecasts/templates/models/detail.html:30
+#: forecasts/templates/models/detail_test.html:30
msgid "Technical usage"
msgstr ""
-#: templates/models/detail.html:31 templates/models/detail_test.html:31
+#: forecasts/templates/models/detail.html:31
+#: forecasts/templates/models/detail_test.html:31
msgid "Sample configuration"
msgstr ""
-#: templates/models/detail.html:44
+#: forecasts/templates/models/detail.html:44
msgid "This is technical info for model and web developers"
msgstr ""
diff --git a/forecasts/locale/fi/LC_MESSAGES/django.mo b/forecasts/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/forecasts/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/forecasts/locale/fi/LC_MESSAGES/django.po b/forecasts/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..c7b108ecbf72665c6b92bea523f5b65b7caadf66
--- /dev/null
+++ b/forecasts/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,230 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: forecasts/models.py:541
+msgid "Language code"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:1
+msgid "Percent"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:2
+msgid "Number"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:3
+msgid "Aggregated day degrees"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:4
+msgid "Degrees Celcius"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:5
+msgid "Hours"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:6
+msgid "Millimeters"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:7
+msgid "Minutes"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:8
+msgid "Minutes/day"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:9
+msgid "Minutes/hour"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:10
+msgid "Time"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:11
+msgid "Watt/square meter"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:12
+msgid "Yes or no"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:13
+msgid "Risk value"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:25
+#: forecasts/templates/forecasts/detail.html:27
+#: forecasts/templates/forecasts/detail_error.html:25
+msgid "Details"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:38
+msgid "Model"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:39
+#: forecasts/templates/forecasts/index.html:63
+#: forecasts/templates/forecasts/index.html:84
+msgid "Location"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/index.html:62
+#: forecasts/templates/forecasts/index.html:83
+msgid "Weather station"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:40
+msgid "Distance to location"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:41
+msgid "Period"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:45
+msgid "Showing latest"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:47
+msgid "Days"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:48
+msgid "Change"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:56
+msgid "Scroll past chart by swiping the dotted line on the right"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:68
+msgid "Timestamp"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:69
+msgid "Warning status"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:89
+msgid "No results for this forecast"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail_error.html:27
+msgid "Error with details"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail_error.html:28
+msgid "Forecast not found"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail_error.html:29
+msgid "To list of available forecasts"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:25
+#: forecasts/templates/forecasts/index.html:27
+msgid "Forecasts"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:45
+msgid "Search"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:59
+#: forecasts/templates/forecasts/index.html:80
+msgid "Crop"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:60
+#: forecasts/templates/forecasts/index.html:81
+msgid "Pest"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:61
+#: forecasts/templates/forecasts/index.html:82
+msgid "Model name"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:64
+#: forecasts/templates/forecasts/index.html:85
+msgid "Date start"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:65
+#: forecasts/templates/forecasts/index.html:86
+msgid "Date end"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:75
+msgid "Private forecasts"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:100
+#: forecasts/templates/forecasts/index.html:139
+msgid "Results"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:155
+msgid "Select crop"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:171
+msgid "Select pest"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:187
+msgid "Select model"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:22
+#: forecasts/templates/models/detail_test.html:22
+#: forecasts/templates/models/index.html:22
+#: forecasts/templates/models/index.html:24
+msgid "Models"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:28
+#: forecasts/templates/models/detail_test.html:28
+msgid "Description"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:29
+#: forecasts/templates/models/detail_test.html:29
+msgid "Interpretation of warning status"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:30
+#: forecasts/templates/models/detail_test.html:30
+msgid "Technical usage"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:31
+#: forecasts/templates/models/detail_test.html:31
+msgid "Sample configuration"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:44
+msgid "This is technical info for model and web developers"
+msgstr ""
diff --git a/forecasts/locale/nb/LC_MESSAGES/django.po b/forecasts/locale/nb/LC_MESSAGES/django.po
index c5390412a6aba17a2eb8450f76b43de583eb0a0a..a04192135da580e60212720809b72937d416e10c 100755
--- a/forecasts/locale/nb/LC_MESSAGES/django.po
+++ b/forecasts/locale/nb/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-21 16:07+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,215 +31,214 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: models.py:521
+#: forecasts/models.py:541
msgid "Language code"
msgstr "Språkkode"
-#: templates/forecasts/bogus_translation_template.html:1
+#: forecasts/templates/forecasts/bogus_translation_template.html:1
msgid "Percent"
msgstr "Prosent"
-#: templates/forecasts/bogus_translation_template.html:2
+#: forecasts/templates/forecasts/bogus_translation_template.html:2
msgid "Number"
msgstr "Antall"
-#: templates/forecasts/bogus_translation_template.html:3
+#: forecasts/templates/forecasts/bogus_translation_template.html:3
msgid "Aggregated day degrees"
msgstr "Aggregerte døgngrader"
-#: templates/forecasts/bogus_translation_template.html:4
+#: forecasts/templates/forecasts/bogus_translation_template.html:4
msgid "Degrees Celcius"
msgstr "Grader Celcius"
-#: templates/forecasts/bogus_translation_template.html:5
+#: forecasts/templates/forecasts/bogus_translation_template.html:5
msgid "Hours"
msgstr "Timer"
-#: templates/forecasts/bogus_translation_template.html:6
+#: forecasts/templates/forecasts/bogus_translation_template.html:6
msgid "Millimeters"
msgstr "Millimeter"
-#: templates/forecasts/bogus_translation_template.html:7
+#: forecasts/templates/forecasts/bogus_translation_template.html:7
msgid "Minutes"
msgstr "Minutter"
-#: templates/forecasts/bogus_translation_template.html:8
+#: forecasts/templates/forecasts/bogus_translation_template.html:8
msgid "Minutes/day"
msgstr "Minutter/dag"
-#: templates/forecasts/bogus_translation_template.html:9
+#: forecasts/templates/forecasts/bogus_translation_template.html:9
msgid "Minutes/hour"
msgstr "Minutter/time"
-#: templates/forecasts/bogus_translation_template.html:10
+#: forecasts/templates/forecasts/bogus_translation_template.html:10
msgid "Time"
msgstr "Tidspunkt"
-#: templates/forecasts/bogus_translation_template.html:11
+#: forecasts/templates/forecasts/bogus_translation_template.html:11
msgid "Watt/square meter"
msgstr "Watt/kvadratmeter"
-#: templates/forecasts/bogus_translation_template.html:12
+#: forecasts/templates/forecasts/bogus_translation_template.html:12
msgid "Yes or no"
msgstr "Ja/nei"
-#: templates/forecasts/bogus_translation_template.html:13
+#: forecasts/templates/forecasts/bogus_translation_template.html:13
msgid "Risk value"
msgstr "Risikoverdi"
-#: templates/forecasts/detail.html:25
-#: templates/forecasts/detail.html.py:27
-#: templates/forecasts/detail_error.html:25
+#: forecasts/templates/forecasts/detail.html:25
+#: forecasts/templates/forecasts/detail.html:27
+#: forecasts/templates/forecasts/detail_error.html:25
msgid "Details"
msgstr "Detaljer"
-#: templates/forecasts/detail.html:38
+#: forecasts/templates/forecasts/detail.html:38
msgid "Model"
msgstr "Modell"
-#: templates/forecasts/detail.html:39
-#: templates/forecasts/index.html:63
-#: templates/forecasts/index.html.py:84
+#: forecasts/templates/forecasts/detail.html:39
+#: forecasts/templates/forecasts/index.html:63
+#: forecasts/templates/forecasts/index.html:84
msgid "Location"
msgstr "Plassering"
-#: templates/forecasts/detail.html:40
-#: templates/forecasts/index.html:62
-#: templates/forecasts/index.html.py:83
+#: forecasts/templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/index.html:62
+#: forecasts/templates/forecasts/index.html:83
msgid "Weather station"
msgstr "Målestasjon"
-#: templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/detail.html:40
msgid "Distance to location"
msgstr "Avstand til plassering"
-#: templates/forecasts/detail.html:41
+#: forecasts/templates/forecasts/detail.html:41
msgid "Period"
msgstr "Periode"
-#: templates/forecasts/detail.html:45
+#: forecasts/templates/forecasts/detail.html:45
msgid "Showing latest"
msgstr "Viser siste"
-#: templates/forecasts/detail.html:47
+#: forecasts/templates/forecasts/detail.html:47
msgid "Days"
msgstr "Dager"
-#: templates/forecasts/detail.html:48
+#: forecasts/templates/forecasts/detail.html:48
msgid "Change"
msgstr "Endre"
-#: templates/forecasts/detail.html:56
+#: forecasts/templates/forecasts/detail.html:56
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr "Bla forbi diagrammet ved å dra i den prikkete linjen til høyre"
-#: templates/forecasts/detail.html:68
+#: forecasts/templates/forecasts/detail.html:68
msgid "Timestamp"
msgstr "Tidspunkt"
-#: templates/forecasts/detail.html:69
+#: forecasts/templates/forecasts/detail.html:69
msgid "Warning status"
msgstr "Varselstatus"
-#: templates/forecasts/detail.html:89
+#: forecasts/templates/forecasts/detail.html:89
msgid "No results for this forecast"
msgstr "Ingen resultater for dette varselet"
-#: templates/forecasts/detail_error.html:27
+#: forecasts/templates/forecasts/detail_error.html:27
msgid "Error with details"
msgstr "Feil med detaljene"
-#: templates/forecasts/detail_error.html:28
+#: forecasts/templates/forecasts/detail_error.html:28
msgid "Forecast not found"
msgstr "Fant ikke varselet"
-#: templates/forecasts/detail_error.html:29
+#: forecasts/templates/forecasts/detail_error.html:29
msgid "To list of available forecasts"
msgstr "Til listen over tilgjengelige varsler"
-#: templates/forecasts/index.html:25
-#: templates/forecasts/index.html.py:27
+#: forecasts/templates/forecasts/index.html:25
+#: forecasts/templates/forecasts/index.html:27
msgid "Forecasts"
msgstr "Varsler"
-#: templates/forecasts/index.html:45
+#: forecasts/templates/forecasts/index.html:45
msgid "Search"
msgstr "Søk"
-#: templates/forecasts/index.html:59
-#: templates/forecasts/index.html.py:80
+#: forecasts/templates/forecasts/index.html:59
+#: forecasts/templates/forecasts/index.html:80
msgid "Crop"
msgstr "Kultur"
-#: templates/forecasts/index.html:60
-#: templates/forecasts/index.html.py:81
+#: forecasts/templates/forecasts/index.html:60
+#: forecasts/templates/forecasts/index.html:81
msgid "Pest"
msgstr "Skadegjører"
-#: templates/forecasts/index.html:61
-#: templates/forecasts/index.html.py:82
+#: forecasts/templates/forecasts/index.html:61
+#: forecasts/templates/forecasts/index.html:82
msgid "Model name"
msgstr "Modellnavn"
-#: templates/forecasts/index.html:64
-#: templates/forecasts/index.html.py:85
+#: forecasts/templates/forecasts/index.html:64
+#: forecasts/templates/forecasts/index.html:85
msgid "Date start"
msgstr "Startdato"
-#: templates/forecasts/index.html:65
-#: templates/forecasts/index.html.py:86
+#: forecasts/templates/forecasts/index.html:65
+#: forecasts/templates/forecasts/index.html:86
msgid "Date end"
msgstr "Sluttdato"
-#: templates/forecasts/index.html:75
+#: forecasts/templates/forecasts/index.html:75
msgid "Private forecasts"
msgstr "Private varsler"
-#: templates/forecasts/index.html:100
-#: templates/forecasts/index.html.py:139
+#: forecasts/templates/forecasts/index.html:100
+#: forecasts/templates/forecasts/index.html:139
msgid "Results"
msgstr "Resultater"
-#: templates/forecasts/index.html:155
+#: forecasts/templates/forecasts/index.html:155
msgid "Select crop"
msgstr "Velg kultur"
-#: templates/forecasts/index.html:171
+#: forecasts/templates/forecasts/index.html:171
msgid "Select pest"
msgstr "Velg skadegjører"
-#: templates/forecasts/index.html:187
+#: forecasts/templates/forecasts/index.html:187
msgid "Select model"
msgstr "Velg modell"
-#: templates/models/detail.html:22
-#: templates/models/detail_test.html:22
-#: templates/models/index.html:22
-#: templates/models/index.html.py:24
+#: forecasts/templates/models/detail.html:22
+#: forecasts/templates/models/detail_test.html:22
+#: forecasts/templates/models/index.html:22
+#: forecasts/templates/models/index.html:24
msgid "Models"
msgstr "Modeller"
-#: templates/models/detail.html:28
-#: templates/models/detail_test.html:28
+#: forecasts/templates/models/detail.html:28
+#: forecasts/templates/models/detail_test.html:28
msgid "Description"
msgstr "Beskrivelse"
-#: templates/models/detail.html:29
-#: templates/models/detail_test.html:29
+#: forecasts/templates/models/detail.html:29
+#: forecasts/templates/models/detail_test.html:29
msgid "Interpretation of warning status"
msgstr "Tolkning av varselstatus"
-#: templates/models/detail.html:30
-#: templates/models/detail_test.html:30
+#: forecasts/templates/models/detail.html:30
+#: forecasts/templates/models/detail_test.html:30
msgid "Technical usage"
msgstr "Teknisk bruksanvisning"
-#: templates/models/detail.html:31
-#: templates/models/detail_test.html:31
+#: forecasts/templates/models/detail.html:31
+#: forecasts/templates/models/detail_test.html:31
msgid "Sample configuration"
msgstr "Eksempelkonfigurasjon"
-#: templates/models/detail.html:44
+#: forecasts/templates/models/detail.html:44
msgid "This is technical info for model and web developers"
msgstr "Dette er teknisk informasjon for modellutviklere og programmerere"
-
diff --git a/forecasts/locale/vi/LC_MESSAGES/django.mo b/forecasts/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/forecasts/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/forecasts/locale/vi/LC_MESSAGES/django.po b/forecasts/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..d02c8c65460914fbd1aad0f8d75833e3f9e4ec14
--- /dev/null
+++ b/forecasts/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,230 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: forecasts/models.py:541
+msgid "Language code"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:1
+msgid "Percent"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:2
+msgid "Number"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:3
+msgid "Aggregated day degrees"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:4
+msgid "Degrees Celcius"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:5
+msgid "Hours"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:6
+msgid "Millimeters"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:7
+msgid "Minutes"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:8
+msgid "Minutes/day"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:9
+msgid "Minutes/hour"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:10
+msgid "Time"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:11
+msgid "Watt/square meter"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:12
+msgid "Yes or no"
+msgstr ""
+
+#: forecasts/templates/forecasts/bogus_translation_template.html:13
+msgid "Risk value"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:25
+#: forecasts/templates/forecasts/detail.html:27
+#: forecasts/templates/forecasts/detail_error.html:25
+msgid "Details"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:38
+msgid "Model"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:39
+#: forecasts/templates/forecasts/index.html:63
+#: forecasts/templates/forecasts/index.html:84
+msgid "Location"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/index.html:62
+#: forecasts/templates/forecasts/index.html:83
+msgid "Weather station"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:40
+msgid "Distance to location"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:41
+msgid "Period"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:45
+msgid "Showing latest"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:47
+msgid "Days"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:48
+msgid "Change"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:56
+msgid "Scroll past chart by swiping the dotted line on the right"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:68
+msgid "Timestamp"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:69
+msgid "Warning status"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail.html:89
+msgid "No results for this forecast"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail_error.html:27
+msgid "Error with details"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail_error.html:28
+msgid "Forecast not found"
+msgstr ""
+
+#: forecasts/templates/forecasts/detail_error.html:29
+msgid "To list of available forecasts"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:25
+#: forecasts/templates/forecasts/index.html:27
+msgid "Forecasts"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:45
+msgid "Search"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:59
+#: forecasts/templates/forecasts/index.html:80
+msgid "Crop"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:60
+#: forecasts/templates/forecasts/index.html:81
+msgid "Pest"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:61
+#: forecasts/templates/forecasts/index.html:82
+msgid "Model name"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:64
+#: forecasts/templates/forecasts/index.html:85
+msgid "Date start"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:65
+#: forecasts/templates/forecasts/index.html:86
+msgid "Date end"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:75
+msgid "Private forecasts"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:100
+#: forecasts/templates/forecasts/index.html:139
+msgid "Results"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:155
+msgid "Select crop"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:171
+msgid "Select pest"
+msgstr ""
+
+#: forecasts/templates/forecasts/index.html:187
+msgid "Select model"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:22
+#: forecasts/templates/models/detail_test.html:22
+#: forecasts/templates/models/index.html:22
+#: forecasts/templates/models/index.html:24
+msgid "Models"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:28
+#: forecasts/templates/models/detail_test.html:28
+msgid "Description"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:29
+#: forecasts/templates/models/detail_test.html:29
+msgid "Interpretation of warning status"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:30
+#: forecasts/templates/models/detail_test.html:30
+msgid "Technical usage"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:31
+#: forecasts/templates/models/detail_test.html:31
+msgid "Sample configuration"
+msgstr ""
+
+#: forecasts/templates/models/detail.html:44
+msgid "This is technical info for model and web developers"
+msgstr ""
diff --git a/forecasts/locale/zh_Hans/LC_MESSAGES/django.po b/forecasts/locale/zh_Hans/LC_MESSAGES/django.po
index 96353c194e4f62c20b9f1475d5c8b851fbaafa85..a5371baeaff69cad61a3c30590f3902fd6e2190b 100755
--- a/forecasts/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/forecasts/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: 2018-08-21 16:07+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-05-27 17:31+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,198 +17,214 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: models.py:521
+#: forecasts/models.py:541
msgid "Language code"
msgstr "语言代码"
-#: templates/forecasts/bogus_translation_template.html:1
+#: forecasts/templates/forecasts/bogus_translation_template.html:1
msgid "Percent"
msgstr "百分比"
-#: templates/forecasts/bogus_translation_template.html:2
+#: forecasts/templates/forecasts/bogus_translation_template.html:2
msgid "Number"
msgstr "数量"
-#: templates/forecasts/bogus_translation_template.html:3
+#: forecasts/templates/forecasts/bogus_translation_template.html:3
msgid "Aggregated day degrees"
msgstr "日积温"
-#: templates/forecasts/bogus_translation_template.html:4
+#: forecasts/templates/forecasts/bogus_translation_template.html:4
msgid "Degrees Celcius"
msgstr "温度 (摄氏)"
-#: templates/forecasts/bogus_translation_template.html:5
+#: forecasts/templates/forecasts/bogus_translation_template.html:5
msgid "Hours"
msgstr "小时"
-#: templates/forecasts/bogus_translation_template.html:6
+#: forecasts/templates/forecasts/bogus_translation_template.html:6
msgid "Millimeters"
msgstr "毫米"
-#: templates/forecasts/bogus_translation_template.html:7
+#: forecasts/templates/forecasts/bogus_translation_template.html:7
msgid "Minutes"
msgstr "分钟"
-#: templates/forecasts/bogus_translation_template.html:8
+#: forecasts/templates/forecasts/bogus_translation_template.html:8
msgid "Minutes/day"
msgstr "分钟/天"
-#: templates/forecasts/bogus_translation_template.html:9
+#: forecasts/templates/forecasts/bogus_translation_template.html:9
msgid "Minutes/hour"
msgstr "分钟/小时"
-#: templates/forecasts/bogus_translation_template.html:10
+#: forecasts/templates/forecasts/bogus_translation_template.html:10
msgid "Time"
msgstr "时间"
-#: templates/forecasts/bogus_translation_template.html:11
+#: forecasts/templates/forecasts/bogus_translation_template.html:11
msgid "Watt/square meter"
msgstr "瓦/平方米"
-#: templates/forecasts/bogus_translation_template.html:12
+#: forecasts/templates/forecasts/bogus_translation_template.html:12
msgid "Yes or no"
msgstr "是 或 否"
-#: templates/forecasts/bogus_translation_template.html:13
+#: forecasts/templates/forecasts/bogus_translation_template.html:13
msgid "Risk value"
msgstr ""
-#: templates/forecasts/detail.html:25 templates/forecasts/detail.html.py:27
-#: templates/forecasts/detail_error.html:25
+#: forecasts/templates/forecasts/detail.html:25
+#: forecasts/templates/forecasts/detail.html:27
+#: forecasts/templates/forecasts/detail_error.html:25
msgid "Details"
msgstr "细节"
-#: templates/forecasts/detail.html:38
+#: forecasts/templates/forecasts/detail.html:38
msgid "Model"
msgstr "模型"
-#: templates/forecasts/detail.html:39 templates/forecasts/index.html:63
-#: templates/forecasts/index.html.py:84
+#: forecasts/templates/forecasts/detail.html:39
+#: forecasts/templates/forecasts/index.html:63
+#: forecasts/templates/forecasts/index.html:84
msgid "Location"
msgstr "位置"
-#: templates/forecasts/detail.html:40 templates/forecasts/index.html:62
-#: templates/forecasts/index.html.py:83
+#: forecasts/templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/index.html:62
+#: forecasts/templates/forecasts/index.html:83
msgid "Weather station"
msgstr "气象站"
-#: templates/forecasts/detail.html:40
+#: forecasts/templates/forecasts/detail.html:40
msgid "Distance to location"
msgstr "距离"
-#: templates/forecasts/detail.html:41
+#: forecasts/templates/forecasts/detail.html:41
msgid "Period"
msgstr "时间"
-#: templates/forecasts/detail.html:45
+#: forecasts/templates/forecasts/detail.html:45
msgid "Showing latest"
msgstr "显示最新"
-#: templates/forecasts/detail.html:47
+#: forecasts/templates/forecasts/detail.html:47
msgid "Days"
msgstr "天"
-#: templates/forecasts/detail.html:48
+#: forecasts/templates/forecasts/detail.html:48
msgid "Change"
msgstr "变化"
-#: templates/forecasts/detail.html:56
+#: forecasts/templates/forecasts/detail.html:56
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr "点击右边点状线查看过去图表"
-#: templates/forecasts/detail.html:68
+#: forecasts/templates/forecasts/detail.html:68
msgid "Timestamp"
msgstr "时间戳"
-#: templates/forecasts/detail.html:69
+#: forecasts/templates/forecasts/detail.html:69
msgid "Warning status"
msgstr "预警状态"
-#: templates/forecasts/detail.html:89
+#: forecasts/templates/forecasts/detail.html:89
msgid "No results for this forecast"
msgstr "基于该预报无结果"
-#: templates/forecasts/detail_error.html:27
+#: forecasts/templates/forecasts/detail_error.html:27
msgid "Error with details"
msgstr "错误细节"
-#: templates/forecasts/detail_error.html:28
+#: forecasts/templates/forecasts/detail_error.html:28
msgid "Forecast not found"
msgstr "预报未发现"
-#: templates/forecasts/detail_error.html:29
+#: forecasts/templates/forecasts/detail_error.html:29
msgid "To list of available forecasts"
msgstr "可使用预报的列表"
-#: templates/forecasts/index.html:25 templates/forecasts/index.html.py:27
+#: forecasts/templates/forecasts/index.html:25
+#: forecasts/templates/forecasts/index.html:27
msgid "Forecasts"
msgstr "预报"
-#: templates/forecasts/index.html:45
+#: forecasts/templates/forecasts/index.html:45
msgid "Search"
msgstr "搜索"
-#: templates/forecasts/index.html:59 templates/forecasts/index.html.py:80
+#: forecasts/templates/forecasts/index.html:59
+#: forecasts/templates/forecasts/index.html:80
msgid "Crop"
msgstr "作物"
-#: templates/forecasts/index.html:60 templates/forecasts/index.html.py:81
+#: forecasts/templates/forecasts/index.html:60
+#: forecasts/templates/forecasts/index.html:81
msgid "Pest"
msgstr "病虫害"
-#: templates/forecasts/index.html:61 templates/forecasts/index.html.py:82
+#: forecasts/templates/forecasts/index.html:61
+#: forecasts/templates/forecasts/index.html:82
msgid "Model name"
msgstr "模型名称"
-#: templates/forecasts/index.html:64 templates/forecasts/index.html.py:85
+#: forecasts/templates/forecasts/index.html:64
+#: forecasts/templates/forecasts/index.html:85
msgid "Date start"
msgstr "开始时间"
-#: templates/forecasts/index.html:65 templates/forecasts/index.html.py:86
+#: forecasts/templates/forecasts/index.html:65
+#: forecasts/templates/forecasts/index.html:86
msgid "Date end"
msgstr "结束时间"
-#: templates/forecasts/index.html:75
+#: forecasts/templates/forecasts/index.html:75
msgid "Private forecasts"
msgstr "个人预报"
-#: templates/forecasts/index.html:100 templates/forecasts/index.html.py:139
+#: forecasts/templates/forecasts/index.html:100
+#: forecasts/templates/forecasts/index.html:139
msgid "Results"
msgstr "结果"
-#: templates/forecasts/index.html:155
+#: forecasts/templates/forecasts/index.html:155
msgid "Select crop"
msgstr "选择作物"
-#: templates/forecasts/index.html:171
+#: forecasts/templates/forecasts/index.html:171
msgid "Select pest"
msgstr "选择病虫害"
-#: templates/forecasts/index.html:187
+#: forecasts/templates/forecasts/index.html:187
msgid "Select model"
msgstr "选择模型"
-#: templates/models/detail.html:22 templates/models/detail_test.html:22
-#: templates/models/index.html:22 templates/models/index.html.py:24
+#: forecasts/templates/models/detail.html:22
+#: forecasts/templates/models/detail_test.html:22
+#: forecasts/templates/models/index.html:22
+#: forecasts/templates/models/index.html:24
msgid "Models"
msgstr "模型"
-#: templates/models/detail.html:28 templates/models/detail_test.html:28
+#: forecasts/templates/models/detail.html:28
+#: forecasts/templates/models/detail_test.html:28
msgid "Description"
msgstr "描述"
-#: templates/models/detail.html:29 templates/models/detail_test.html:29
+#: forecasts/templates/models/detail.html:29
+#: forecasts/templates/models/detail_test.html:29
msgid "Interpretation of warning status"
msgstr "解释预警状态"
-#: templates/models/detail.html:30 templates/models/detail_test.html:30
+#: forecasts/templates/models/detail.html:30
+#: forecasts/templates/models/detail_test.html:30
msgid "Technical usage"
msgstr "技术使用"
-#: templates/models/detail.html:31 templates/models/detail_test.html:31
+#: forecasts/templates/models/detail.html:31
+#: forecasts/templates/models/detail_test.html:31
msgid "Sample configuration"
msgstr "样品配置"
-#: templates/models/detail.html:44
+#: forecasts/templates/models/detail.html:44
msgid "This is technical info for model and web developers"
msgstr "对模型和网络开发者的技术信息"
diff --git a/forecasts/migrations/0001_initial.py b/forecasts/migrations/0001_initial.py
new file mode 100644
index 0000000000000000000000000000000000000000..ba9a64cbeefebb0b1b03d5f5f4c88835c52491a6
--- /dev/null
+++ b/forecasts/migrations/0001_initial.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2020-06-04 02:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import forecasts.models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='HighChartsType',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=63)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='MeasurementUnit',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200)),
+ ('abbr', models.CharField(max_length=50)),
+ ('color_hexcode', models.CharField(max_length=7)),
+ ('opposite', models.BooleanField(default=False)),
+ ],
+ options={
+ 'ordering': ['name'],
+ },
+ ),
+ migrations.CreateModel(
+ name='ModelGraphParameter',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('model_id', models.CharField(max_length=10, validators=[forecasts.models.validate_model_id_length])),
+ ('color_hexcode', models.CharField(max_length=6)),
+ ('highcharts_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forecasts.HighChartsType')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='ResultParameter',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('namespace', models.CharField(max_length=50)),
+ ('key', models.CharField(max_length=50)),
+ ('name', models.CharField(max_length=200)),
+ ('description', models.TextField()),
+ ('measurementunit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forecasts.MeasurementUnit')),
+ ],
+ options={
+ 'ordering': ['key'],
+ },
+ ),
+ migrations.CreateModel(
+ name='ResultParameterLocal',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('local_name', models.CharField(max_length=200)),
+ ('language_code', models.CharField(max_length=2, verbose_name='Language code')),
+ ('result_parameter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forecasts.ResultParameter')),
+ ],
+ ),
+ migrations.AddField(
+ model_name='modelgraphparameter',
+ name='resultparameter',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forecasts.ResultParameter'),
+ ),
+ ]
diff --git a/forecasts/migrations/__init__.py b/forecasts/migrations/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/fusarium/locale/bg/LC_MESSAGES/django.mo b/fusarium/locale/bg/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/fusarium/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/fusarium/locale/bg/LC_MESSAGES/django.po b/fusarium/locale/bg/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..20e775167d40137e329c5e43d4ee485bd6cf6def
--- /dev/null
+++ b/fusarium/locale/bg/LC_MESSAGES/django.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: fusarium/templates/fusarium/oat_flowering.html:3
+#: fusarium/templates/fusarium/oat_flowering.html:9
+msgid "Oat flowering model"
+msgstr ""
diff --git a/fusarium/locale/bs/LC_MESSAGES/django.mo b/fusarium/locale/bs/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d2d31a4fd72f68dc53c29f8a8b14d56d933f3e63
Binary files /dev/null and b/fusarium/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/fusarium/locale/bs/LC_MESSAGES/django.po b/fusarium/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..9a7fc34426dbe5cfeb217d6ce69ff948b7e760ac
--- /dev/null
+++ b/fusarium/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: fusarium/templates/fusarium/oat_flowering.html:3
+#: fusarium/templates/fusarium/oat_flowering.html:9
+msgid "Oat flowering model"
+msgstr ""
diff --git a/fusarium/locale/de/LC_MESSAGES/django.po b/fusarium/locale/de/LC_MESSAGES/django.po
index 94c28e4a5ef63925347220eb0d1fea18f3bb1801..d7922f450742ef100e0085db83f69a0407e43621 100755
--- a/fusarium/locale/de/LC_MESSAGES/django.po
+++ b/fusarium/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: 2016-09-28 13:03-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/fusarium/oat_flowering.html:3
-#: templates/fusarium/oat_flowering.html:9
+#: fusarium/templates/fusarium/oat_flowering.html:3
+#: fusarium/templates/fusarium/oat_flowering.html:9
msgid "Oat flowering model"
msgstr ""
diff --git a/fusarium/locale/fi/LC_MESSAGES/django.mo b/fusarium/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/fusarium/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/fusarium/locale/fi/LC_MESSAGES/django.po b/fusarium/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..20e775167d40137e329c5e43d4ee485bd6cf6def
--- /dev/null
+++ b/fusarium/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: fusarium/templates/fusarium/oat_flowering.html:3
+#: fusarium/templates/fusarium/oat_flowering.html:9
+msgid "Oat flowering model"
+msgstr ""
diff --git a/fusarium/locale/nb/LC_MESSAGES/django.po b/fusarium/locale/nb/LC_MESSAGES/django.po
index 6be96eff5dbaf9fd37e425922253d818c3d0e351..c3bb82bf03ed3405dbfea2cc1c768c30cfa1d02a 100755
--- a/fusarium/locale/nb/LC_MESSAGES/django.po
+++ b/fusarium/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-23 15:02+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,8 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/fusarium/oat_flowering.html:3
-#: templates/fusarium/oat_flowering.html:9
+#: fusarium/templates/fusarium/oat_flowering.html:3
+#: fusarium/templates/fusarium/oat_flowering.html:9
msgid "Oat flowering model"
msgstr "Blomstringsmodell for havre"
-
diff --git a/fusarium/locale/vi/LC_MESSAGES/django.mo b/fusarium/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/fusarium/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/fusarium/locale/vi/LC_MESSAGES/django.po b/fusarium/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..016fed15381bc6c6690f5487771e9738e31b17f5
--- /dev/null
+++ b/fusarium/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: fusarium/templates/fusarium/oat_flowering.html:3
+#: fusarium/templates/fusarium/oat_flowering.html:9
+msgid "Oat flowering model"
+msgstr ""
diff --git a/fusarium/locale/zh_Hans/LC_MESSAGES/django.mo b/fusarium/locale/zh_Hans/LC_MESSAGES/django.mo
index 22745fdd3ef3670eac45dfeb5d1c91cd17226fda..bb728e047263c14108c1fe4a67f4a19805eb9786 100644
Binary files a/fusarium/locale/zh_Hans/LC_MESSAGES/django.mo and b/fusarium/locale/zh_Hans/LC_MESSAGES/django.mo differ
diff --git a/fusarium/locale/zh_Hans/LC_MESSAGES/django.po b/fusarium/locale/zh_Hans/LC_MESSAGES/django.po
index 1746d41224923ba46808100465e48613b4f64e8d..9ff506d2c7f34fed6d1a0b37cb83752a18bd6574 100755
--- a/fusarium/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/fusarium/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,18 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-10-27 11:25+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
"Language: zh_Hans\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Last-Translator: \n"
-"Language-Team: \n"
"X-Generator: Poedit 1.8.7\n"
-#: templates/fusarium/oat_flowering.html:3
-#: templates/fusarium/oat_flowering.html:9
+#: fusarium/templates/fusarium/oat_flowering.html:3
+#: fusarium/templates/fusarium/oat_flowering.html:9
msgid "Oat flowering model"
msgstr "燕麦开花病模型"
diff --git a/information/locale/bg/LC_MESSAGES/django.po b/information/locale/bg/LC_MESSAGES/django.po
index 4df56b0e067cc6174dd6b37ef3d723269948a8fd..775f75edc5225f521ffe91a14540d816cbfa1c6f 100755
--- a/information/locale/bg/LC_MESSAGES/django.po
+++ b/information/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: 2016-07-12 10:23+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,47 +18,48 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: models.py:13
+#: information/models.py:13
msgid "Parent information"
msgstr ""
-#: models.py:14
+#: information/models.py:14
msgid "Main illustration"
msgstr ""
-#: models.py:15
+#: information/models.py:15
msgid "Ordering"
msgstr ""
-#: models.py:19
+#: information/models.py:21
msgid "Illustration"
msgstr ""
-#: models.py:23
+#: information/models.py:25
msgid "Attachment"
msgstr ""
-#: models.py:27
+#: information/models.py:29
msgid "Headline"
msgstr ""
-#: models.py:28
+#: information/models.py:30
msgid "Lead paragraph"
msgstr ""
-#: models.py:29
+#: information/models.py:31
msgid "Body text"
msgstr ""
-#: models.py:30
+#: information/models.py:32
msgid "Language code"
msgstr ""
-#: templates/information/index.html:3 templates/information/index.html.py:5
+#: information/templates/information/index.html:3
+#: information/templates/information/index.html:5
msgid "Information"
msgstr ""
-#: templates/information/index.html:6
+#: information/templates/information/index.html:6
msgid ""
"You haven't added any information pages yet. Please do so in the "
"administration GUI."
diff --git a/information/locale/bs/LC_MESSAGES/django.po b/information/locale/bs/LC_MESSAGES/django.po
index b3e644df25e07856d9a6fd9867f8e83ac96b1eff..21d52c5c322ab69872ab89e9365ce28abc20cb1f 100755
--- a/information/locale/bs/LC_MESSAGES/django.po
+++ b/information/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 10:23+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2015-02-13 11:13+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -19,51 +19,52 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: models.py:13
+#: information/models.py:13
#, fuzzy
#| msgid "Information"
msgid "Parent information"
msgstr "Informacija"
-#: models.py:14
+#: information/models.py:14
msgid "Main illustration"
msgstr ""
-#: models.py:15
+#: information/models.py:15
msgid "Ordering"
msgstr ""
-#: models.py:19
+#: information/models.py:21
#, fuzzy
#| msgid "Information"
msgid "Illustration"
msgstr "Informacija"
-#: models.py:23
+#: information/models.py:25
msgid "Attachment"
msgstr ""
-#: models.py:27
+#: information/models.py:29
msgid "Headline"
msgstr ""
-#: models.py:28
+#: information/models.py:30
msgid "Lead paragraph"
msgstr ""
-#: models.py:29
+#: information/models.py:31
msgid "Body text"
msgstr ""
-#: models.py:30
+#: information/models.py:32
msgid "Language code"
msgstr ""
-#: templates/information/index.html:3 templates/information/index.html.py:5
+#: information/templates/information/index.html:3
+#: information/templates/information/index.html:5
msgid "Information"
msgstr "Informacija"
-#: templates/information/index.html:6
+#: information/templates/information/index.html:6
msgid ""
"You haven't added any information pages yet. Please do so in the "
"administration GUI."
diff --git a/information/locale/de/LC_MESSAGES/django.po b/information/locale/de/LC_MESSAGES/django.po
index f9b18bbc2407bc61841edcd904b66d9abedf1867..775f75edc5225f521ffe91a14540d816cbfa1c6f 100755
--- a/information/locale/de/LC_MESSAGES/django.po
+++ b/information/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: 2016-09-28 13:03-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,47 +18,48 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: models.py:13
+#: information/models.py:13
msgid "Parent information"
msgstr ""
-#: models.py:14
+#: information/models.py:14
msgid "Main illustration"
msgstr ""
-#: models.py:15
+#: information/models.py:15
msgid "Ordering"
msgstr ""
-#: models.py:21
+#: information/models.py:21
msgid "Illustration"
msgstr ""
-#: models.py:25
+#: information/models.py:25
msgid "Attachment"
msgstr ""
-#: models.py:29
+#: information/models.py:29
msgid "Headline"
msgstr ""
-#: models.py:30
+#: information/models.py:30
msgid "Lead paragraph"
msgstr ""
-#: models.py:31
+#: information/models.py:31
msgid "Body text"
msgstr ""
-#: models.py:32
+#: information/models.py:32
msgid "Language code"
msgstr ""
-#: templates/information/index.html:3 templates/information/index.html.py:5
+#: information/templates/information/index.html:3
+#: information/templates/information/index.html:5
msgid "Information"
msgstr ""
-#: templates/information/index.html:6
+#: information/templates/information/index.html:6
msgid ""
"You haven't added any information pages yet. Please do so in the "
"administration GUI."
diff --git a/information/locale/fi/LC_MESSAGES/django.mo b/information/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/information/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/information/locale/fi/LC_MESSAGES/django.po b/information/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..c60fe63a5b29765637f81d5ec3c35c635fbbddb6
--- /dev/null
+++ b/information/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: information/models.py:13
+msgid "Parent information"
+msgstr ""
+
+#: information/models.py:14
+msgid "Main illustration"
+msgstr ""
+
+#: information/models.py:15
+msgid "Ordering"
+msgstr ""
+
+#: information/models.py:21
+msgid "Illustration"
+msgstr ""
+
+#: information/models.py:25
+msgid "Attachment"
+msgstr ""
+
+#: information/models.py:29
+msgid "Headline"
+msgstr ""
+
+#: information/models.py:30
+msgid "Lead paragraph"
+msgstr ""
+
+#: information/models.py:31
+msgid "Body text"
+msgstr ""
+
+#: information/models.py:32
+msgid "Language code"
+msgstr ""
+
+#: information/templates/information/index.html:3
+#: information/templates/information/index.html:5
+msgid "Information"
+msgstr ""
+
+#: information/templates/information/index.html:6
+msgid ""
+"You haven't added any information pages yet. Please do so in the "
+"administration GUI."
+msgstr ""
diff --git a/information/locale/nb/LC_MESSAGES/django.po b/information/locale/nb/LC_MESSAGES/django.po
index 68c8d9350264483d416aca3588f7e069e15c7d59..5661e67310b3102f5e9f167b99dab43c879ee73a 100755
--- a/information/locale/nb/LC_MESSAGES/django.po
+++ b/information/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-12 10:23+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,51 +18,51 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: models.py:13
+#: information/models.py:13
msgid "Parent information"
msgstr "Informasjon"
-#: models.py:14
+#: information/models.py:14
msgid "Main illustration"
msgstr "Hovedillustrasjon"
-#: models.py:15
+#: information/models.py:15
msgid "Ordering"
msgstr "Sortering"
-#: models.py:19
+#: information/models.py:21
msgid "Illustration"
msgstr "Illustrasjon"
-#: models.py:23
+#: information/models.py:25
msgid "Attachment"
msgstr "Vedlegg"
-#: models.py:27
+#: information/models.py:29
msgid "Headline"
msgstr "Overskrift"
-#: models.py:28
+#: information/models.py:30
msgid "Lead paragraph"
msgstr "Ingress"
-#: models.py:29
+#: information/models.py:31
msgid "Body text"
msgstr "Brødtekst"
-#: models.py:30
+#: information/models.py:32
msgid "Language code"
msgstr "Språkkode"
-#: templates/information/index.html:3
-#: templates/information/index.html.py:5
+#: information/templates/information/index.html:3
+#: information/templates/information/index.html:5
msgid "Information"
msgstr "Informasjon"
-#: templates/information/index.html:6
+#: information/templates/information/index.html:6
msgid ""
"You haven't added any information pages yet. Please do so in the "
"administration GUI."
-msgstr "Du har ikke lagt til noen informasjonssider ennå. Vennligst gjør dette via "
+msgstr ""
+"Du har ikke lagt til noen informasjonssider ennå. Vennligst gjør dette via "
"administrasjonsgrensesnittet."
-
diff --git a/information/locale/vi/LC_MESSAGES/django.mo b/information/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/information/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/information/locale/vi/LC_MESSAGES/django.po b/information/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..27a527826e9e38eb1606a37b9f5d5d5c4f368a0a
--- /dev/null
+++ b/information/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: information/models.py:13
+msgid "Parent information"
+msgstr ""
+
+#: information/models.py:14
+msgid "Main illustration"
+msgstr ""
+
+#: information/models.py:15
+msgid "Ordering"
+msgstr ""
+
+#: information/models.py:21
+msgid "Illustration"
+msgstr ""
+
+#: information/models.py:25
+msgid "Attachment"
+msgstr ""
+
+#: information/models.py:29
+msgid "Headline"
+msgstr ""
+
+#: information/models.py:30
+msgid "Lead paragraph"
+msgstr ""
+
+#: information/models.py:31
+msgid "Body text"
+msgstr ""
+
+#: information/models.py:32
+msgid "Language code"
+msgstr ""
+
+#: information/templates/information/index.html:3
+#: information/templates/information/index.html:5
+msgid "Information"
+msgstr ""
+
+#: information/templates/information/index.html:6
+msgid ""
+"You haven't added any information pages yet. Please do so in the "
+"administration GUI."
+msgstr ""
diff --git a/information/locale/zh_Hans/LC_MESSAGES/django.po b/information/locale/zh_Hans/LC_MESSAGES/django.po
index 2ee67354a314479fd81a750ac5c142b12d20385b..59af4bc6e634c31cf1b3394399a1e4d52623ce17 100755
--- a/information/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/information/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: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-10-27 11:25+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,47 +17,48 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: models.py:13
+#: information/models.py:13
msgid "Parent information"
msgstr "父信息"
-#: models.py:14
+#: information/models.py:14
msgid "Main illustration"
msgstr "主图"
-#: models.py:15
+#: information/models.py:15
msgid "Ordering"
msgstr "排序"
-#: models.py:21
+#: information/models.py:21
msgid "Illustration"
msgstr "图"
-#: models.py:25
+#: information/models.py:25
msgid "Attachment"
msgstr "附件"
-#: models.py:29
+#: information/models.py:29
msgid "Headline"
msgstr "标题"
-#: models.py:30
+#: information/models.py:30
msgid "Lead paragraph"
msgstr "导向段落"
-#: models.py:31
+#: information/models.py:31
msgid "Body text"
msgstr "正文"
-#: models.py:32
+#: information/models.py:32
msgid "Language code"
msgstr "语言代码"
-#: templates/information/index.html:3 templates/information/index.html.py:5
+#: information/templates/information/index.html:3
+#: information/templates/information/index.html:5
msgid "Information"
msgstr "信息"
-#: templates/information/index.html:6
+#: information/templates/information/index.html:6
msgid ""
"You haven't added any information pages yet. Please do so in the "
"administration GUI."
diff --git a/information/migrations/0003_auto_20200603_1435.py b/information/migrations/0003_auto_20200603_1435.py
new file mode 100644
index 0000000000000000000000000000000000000000..d884b5f078649d8b3b369f0ec1b94a3c31d87636
--- /dev/null
+++ b/information/migrations/0003_auto_20200603_1435.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2020-06-03 12:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import tinymce.models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('information', '0002_information_ordering'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='information',
+ options={'ordering': ['ordering']},
+ ),
+ migrations.AlterField(
+ model_name='information',
+ name='main_illustration',
+ field=models.ImageField(blank=True, upload_to=b'images/information', verbose_name='Main illustration'),
+ ),
+ migrations.AlterField(
+ model_name='information',
+ name='ordering',
+ field=models.IntegerField(default=0, verbose_name='Ordering'),
+ ),
+ migrations.AlterField(
+ model_name='information',
+ name='parent_information',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='information.Information', verbose_name='Parent information'),
+ ),
+ migrations.AlterField(
+ model_name='informationattachment',
+ name='attachment',
+ field=models.FileField(blank=True, upload_to=b'attachments/information', verbose_name='Attachment'),
+ ),
+ migrations.AlterField(
+ model_name='informationillustration',
+ name='illustration',
+ field=models.ImageField(blank=True, upload_to=b'images/information', verbose_name='Illustration'),
+ ),
+ migrations.AlterField(
+ model_name='informationlocale',
+ name='body',
+ field=tinymce.models.HTMLField(verbose_name='Body text'),
+ ),
+ migrations.AlterField(
+ model_name='informationlocale',
+ name='headline',
+ field=models.CharField(max_length=200, verbose_name='Headline'),
+ ),
+ migrations.AlterField(
+ model_name='informationlocale',
+ name='language_code',
+ field=models.CharField(max_length=2, verbose_name='Language code'),
+ ),
+ migrations.AlterField(
+ model_name='informationlocale',
+ name='lead_paragraph',
+ field=models.TextField(verbose_name='Lead paragraph'),
+ ),
+ ]
diff --git a/observations/locale/bg/LC_MESSAGES/django.mo b/observations/locale/bg/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/observations/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/observations/locale/bg/LC_MESSAGES/django.po b/observations/locale/bg/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..ee07a30bda0fc8e7dcdf47aac5f5dc98b191d76b
--- /dev/null
+++ b/observations/locale/bg/LC_MESSAGES/django.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: observations/templates/observations/detail.html:25
+#: observations/templates/observations/detail.html:28
+msgid "Observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:29
+msgid "View all observations"
+msgstr ""
+
+#: observations/templates/observations/detail.html:32
+#: observations/templates/observations/index.html:46
+#: observations/templates/observations/index.html:63
+#: observations/templates/observations/index_old.html:63
+msgid "Organism"
+msgstr ""
+
+#: observations/templates/observations/detail.html:34
+#: observations/templates/observations/index.html:50
+#: observations/templates/observations/index.html:64
+#: observations/templates/observations/index_old.html:64
+msgid "Crop"
+msgstr ""
+
+#: observations/templates/observations/detail.html:36
+#: observations/templates/observations/index.html:62
+#: observations/templates/observations/index_old.html:62
+msgid "Time of observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:40
+msgid "Observation data"
+msgstr ""
+
+#: observations/templates/observations/detail.html:86
+msgid "Observation was not quantified"
+msgstr ""
+
+#: observations/templates/observations/detail.html:115
+msgid "Map view not available"
+msgstr ""
+
+#: observations/templates/observations/index.html:25
+#: observations/templates/observations/index.html:27
+#: observations/templates/observations/index_old.html:25
+#: observations/templates/observations/index_old.html:28
+msgid "Observations"
+msgstr ""
+
+#: observations/templates/observations/index.html:31
+msgid "Current date"
+msgstr ""
+
+#: observations/templates/observations/index.html:54
+msgid "Crop categories"
+msgstr ""
+
+#: observations/templates/observations/index.html:57
+msgid "Filter"
+msgstr ""
+
+#: observations/templates/observations/index.html:65
+#: observations/templates/observations/index_old.html:65
+msgid "Heading"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:33
+msgid "All pests"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:49
+msgid "From"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:53
+msgid "To"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:55
+msgid "Date search"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:96
+msgid "Crops"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:136
+msgid "View details"
+msgstr ""
diff --git a/observations/locale/bs/LC_MESSAGES/django.mo b/observations/locale/bs/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d2d31a4fd72f68dc53c29f8a8b14d56d933f3e63
Binary files /dev/null and b/observations/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/observations/locale/bs/LC_MESSAGES/django.po b/observations/locale/bs/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..8584b1f6554b4ccad0444c49cdda0b949c50ab56
--- /dev/null
+++ b/observations/locale/bs/LC_MESSAGES/django.po
@@ -0,0 +1,108 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: observations/templates/observations/detail.html:25
+#: observations/templates/observations/detail.html:28
+msgid "Observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:29
+msgid "View all observations"
+msgstr ""
+
+#: observations/templates/observations/detail.html:32
+#: observations/templates/observations/index.html:46
+#: observations/templates/observations/index.html:63
+#: observations/templates/observations/index_old.html:63
+msgid "Organism"
+msgstr ""
+
+#: observations/templates/observations/detail.html:34
+#: observations/templates/observations/index.html:50
+#: observations/templates/observations/index.html:64
+#: observations/templates/observations/index_old.html:64
+msgid "Crop"
+msgstr ""
+
+#: observations/templates/observations/detail.html:36
+#: observations/templates/observations/index.html:62
+#: observations/templates/observations/index_old.html:62
+msgid "Time of observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:40
+msgid "Observation data"
+msgstr ""
+
+#: observations/templates/observations/detail.html:86
+msgid "Observation was not quantified"
+msgstr ""
+
+#: observations/templates/observations/detail.html:115
+msgid "Map view not available"
+msgstr ""
+
+#: observations/templates/observations/index.html:25
+#: observations/templates/observations/index.html:27
+#: observations/templates/observations/index_old.html:25
+#: observations/templates/observations/index_old.html:28
+msgid "Observations"
+msgstr ""
+
+#: observations/templates/observations/index.html:31
+msgid "Current date"
+msgstr ""
+
+#: observations/templates/observations/index.html:54
+msgid "Crop categories"
+msgstr ""
+
+#: observations/templates/observations/index.html:57
+msgid "Filter"
+msgstr ""
+
+#: observations/templates/observations/index.html:65
+#: observations/templates/observations/index_old.html:65
+msgid "Heading"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:33
+msgid "All pests"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:49
+msgid "From"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:53
+msgid "To"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:55
+msgid "Date search"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:96
+msgid "Crops"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:136
+msgid "View details"
+msgstr ""
diff --git a/observations/locale/de/LC_MESSAGES/django.po b/observations/locale/de/LC_MESSAGES/django.po
index dfb8ad3e5be956419763611e49102334ae948c6f..5ceaed23814733fd35ba5ecc52531750423ba367 100755
--- a/observations/locale/de/LC_MESSAGES/django.po
+++ b/observations/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: 2018-12-10 12:35+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,89 +18,91 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/observations/detail.html:25 templates/observations/detail.html:28
+#: observations/templates/observations/detail.html:25
+#: observations/templates/observations/detail.html:28
msgid "Observation"
msgstr ""
-#: templates/observations/detail.html:29
+#: observations/templates/observations/detail.html:29
msgid "View all observations"
msgstr ""
-#: templates/observations/detail.html:32 templates/observations/index.html:63
-#: templates/observations/index_new.html:46
-#: templates/observations/index_new.html:63
+#: observations/templates/observations/detail.html:32
+#: observations/templates/observations/index.html:46
+#: observations/templates/observations/index.html:63
+#: observations/templates/observations/index_old.html:63
msgid "Organism"
msgstr ""
-#: templates/observations/detail.html:34 templates/observations/index.html:64
-#: templates/observations/index_new.html:50
-#: templates/observations/index_new.html:64
+#: observations/templates/observations/detail.html:34
+#: observations/templates/observations/index.html:50
+#: observations/templates/observations/index.html:64
+#: observations/templates/observations/index_old.html:64
msgid "Crop"
msgstr ""
-#: templates/observations/detail.html:36 templates/observations/index.html:62
-#: templates/observations/index_new.html:62
+#: observations/templates/observations/detail.html:36
+#: observations/templates/observations/index.html:62
+#: observations/templates/observations/index_old.html:62
msgid "Time of observation"
msgstr ""
-#: templates/observations/detail.html:38
-msgid "Observer"
-msgstr ""
-
-#: templates/observations/detail.html:42
+#: observations/templates/observations/detail.html:40
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:87
+#: observations/templates/observations/detail.html:86
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:116
+#: observations/templates/observations/detail.html:115
msgid "Map view not available"
msgstr ""
-#: templates/observations/index.html:25 templates/observations/index.html:28
-#: templates/observations/index_new.html:25
+#: observations/templates/observations/index.html:25
+#: observations/templates/observations/index.html:27
+#: observations/templates/observations/index_old.html:25
+#: observations/templates/observations/index_old.html:28
msgid "Observations"
msgstr ""
-#: templates/observations/index.html:33
-msgid "All pests"
+#: observations/templates/observations/index.html:31
+msgid "Current date"
msgstr ""
-#: templates/observations/index.html:49
-msgid "From"
+#: observations/templates/observations/index.html:54
+msgid "Crop categories"
msgstr ""
-#: templates/observations/index.html:53
-msgid "To"
+#: observations/templates/observations/index.html:57
+msgid "Filter"
msgstr ""
-#: templates/observations/index.html:55
-msgid "Date search"
+#: observations/templates/observations/index.html:65
+#: observations/templates/observations/index_old.html:65
+msgid "Heading"
msgstr ""
-#: templates/observations/index.html:65
-#: templates/observations/index_new.html:65
-msgid "Heading"
+#: observations/templates/observations/index_old.html:33
+msgid "All pests"
msgstr ""
-#: templates/observations/index.html:96
-msgid "Crops"
+#: observations/templates/observations/index_old.html:49
+msgid "From"
msgstr ""
-#: templates/observations/index.html:136
-msgid "View details"
+#: observations/templates/observations/index_old.html:53
+msgid "To"
msgstr ""
-#: templates/observations/index_new.html:31
-msgid "Current date"
+#: observations/templates/observations/index_old.html:55
+msgid "Date search"
msgstr ""
-#: templates/observations/index_new.html:54
-msgid "Crop categories"
+#: observations/templates/observations/index_old.html:96
+msgid "Crops"
msgstr ""
-#: templates/observations/index_new.html:57
-msgid "Filter"
+#: observations/templates/observations/index_old.html:136
+msgid "View details"
msgstr ""
diff --git a/observations/locale/fi/LC_MESSAGES/django.mo b/observations/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/observations/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/observations/locale/fi/LC_MESSAGES/django.po b/observations/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..ee07a30bda0fc8e7dcdf47aac5f5dc98b191d76b
--- /dev/null
+++ b/observations/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: observations/templates/observations/detail.html:25
+#: observations/templates/observations/detail.html:28
+msgid "Observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:29
+msgid "View all observations"
+msgstr ""
+
+#: observations/templates/observations/detail.html:32
+#: observations/templates/observations/index.html:46
+#: observations/templates/observations/index.html:63
+#: observations/templates/observations/index_old.html:63
+msgid "Organism"
+msgstr ""
+
+#: observations/templates/observations/detail.html:34
+#: observations/templates/observations/index.html:50
+#: observations/templates/observations/index.html:64
+#: observations/templates/observations/index_old.html:64
+msgid "Crop"
+msgstr ""
+
+#: observations/templates/observations/detail.html:36
+#: observations/templates/observations/index.html:62
+#: observations/templates/observations/index_old.html:62
+msgid "Time of observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:40
+msgid "Observation data"
+msgstr ""
+
+#: observations/templates/observations/detail.html:86
+msgid "Observation was not quantified"
+msgstr ""
+
+#: observations/templates/observations/detail.html:115
+msgid "Map view not available"
+msgstr ""
+
+#: observations/templates/observations/index.html:25
+#: observations/templates/observations/index.html:27
+#: observations/templates/observations/index_old.html:25
+#: observations/templates/observations/index_old.html:28
+msgid "Observations"
+msgstr ""
+
+#: observations/templates/observations/index.html:31
+msgid "Current date"
+msgstr ""
+
+#: observations/templates/observations/index.html:54
+msgid "Crop categories"
+msgstr ""
+
+#: observations/templates/observations/index.html:57
+msgid "Filter"
+msgstr ""
+
+#: observations/templates/observations/index.html:65
+#: observations/templates/observations/index_old.html:65
+msgid "Heading"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:33
+msgid "All pests"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:49
+msgid "From"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:53
+msgid "To"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:55
+msgid "Date search"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:96
+msgid "Crops"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:136
+msgid "View details"
+msgstr ""
diff --git a/observations/locale/nb/LC_MESSAGES/django.mo b/observations/locale/nb/LC_MESSAGES/django.mo
index 6a62268e9810a07d3b2fff93101609b92ec14374..38b8e3b39a4119bde90093a1c7235812ef6cd232 100755
Binary files a/observations/locale/nb/LC_MESSAGES/django.mo and b/observations/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/observations/locale/nb/LC_MESSAGES/django.po b/observations/locale/nb/LC_MESSAGES/django.po
index 1a2d035813cab91f5e1d590177174aa4b59f5eee..dd8dca23cd25026a8d33566b3d5c4536b3b9b986 100755
--- a/observations/locale/nb/LC_MESSAGES/django.po
+++ b/observations/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-10 12:35+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,96 +18,95 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/observations/detail.html:25
-#: templates/observations/detail.html:28
+#: observations/templates/observations/detail.html:25
+#: observations/templates/observations/detail.html:28
msgid "Observation"
msgstr "Observasjon"
-#: templates/observations/detail.html:29
+#: observations/templates/observations/detail.html:29
msgid "View all observations"
msgstr "Se alle observasjoner"
-#: templates/observations/detail.html:32
-#: templates/observations/index.html:63
-#: templates/observations/index_new.html:46
-#: templates/observations/index_new.html:63
+#: observations/templates/observations/detail.html:32
+#: observations/templates/observations/index.html:46
+#: observations/templates/observations/index.html:63
+#: observations/templates/observations/index_old.html:63
msgid "Organism"
msgstr "Organisme"
-#: templates/observations/detail.html:34
-#: templates/observations/index.html:64
-#: templates/observations/index_new.html:50
-#: templates/observations/index_new.html:64
+#: observations/templates/observations/detail.html:34
+#: observations/templates/observations/index.html:50
+#: observations/templates/observations/index.html:64
+#: observations/templates/observations/index_old.html:64
msgid "Crop"
msgstr "Kultur"
-#: templates/observations/detail.html:36
-#: templates/observations/index.html:62
-#: templates/observations/index_new.html:62
+#: observations/templates/observations/detail.html:36
+#: observations/templates/observations/index.html:62
+#: observations/templates/observations/index_old.html:62
msgid "Time of observation"
msgstr "Observasjonstidspunkt"
-#: templates/observations/detail.html:38
-msgid "Observer"
-msgstr "Observatør"
-
-#: templates/observations/detail.html:42
+#: observations/templates/observations/detail.html:40
msgid "Observation data"
msgstr "Observasjonsdata"
-#: templates/observations/detail.html:87
+#: observations/templates/observations/detail.html:86
msgid "Observation was not quantified"
msgstr "Observasjonen ble ikke kvantifisert"
-#: templates/observations/detail.html:116
+#: observations/templates/observations/detail.html:115
msgid "Map view not available"
msgstr "Kartvisning ikke tilgjengelig"
-#: templates/observations/index.html:25
-#: templates/observations/index.html:28
-#: templates/observations/index_new.html:25
+#: observations/templates/observations/index.html:25
+#: observations/templates/observations/index.html:27
+#: observations/templates/observations/index_old.html:25
+#: observations/templates/observations/index_old.html:28
msgid "Observations"
msgstr "Observasjoner"
-#: templates/observations/index.html:33
+#: observations/templates/observations/index.html:31
+msgid "Current date"
+msgstr "Gjeldende dato"
+
+#: observations/templates/observations/index.html:54
+msgid "Crop categories"
+msgstr "Kulturkategorier"
+
+#: observations/templates/observations/index.html:57
+msgid "Filter"
+msgstr "Gjør utvalg"
+
+#: observations/templates/observations/index.html:65
+#: observations/templates/observations/index_old.html:65
+msgid "Heading"
+msgstr "Overskrift"
+
+#: observations/templates/observations/index_old.html:33
msgid "All pests"
msgstr "Alle organismer"
-#: templates/observations/index.html:49
+#: observations/templates/observations/index_old.html:49
msgid "From"
msgstr "Fra"
-#: templates/observations/index.html:53
+#: observations/templates/observations/index_old.html:53
msgid "To"
msgstr "Til"
-#: templates/observations/index.html:55
+#: observations/templates/observations/index_old.html:55
msgid "Date search"
msgstr "Datosøk"
-#: templates/observations/index.html:65
-#: templates/observations/index_new.html:65
-msgid "Heading"
-msgstr "Overskrift"
-
-#: templates/observations/index.html:96
+#: observations/templates/observations/index_old.html:96
#, fuzzy
msgid "Crops"
msgstr "Kultur"
-#: templates/observations/index.html:136
+#: observations/templates/observations/index_old.html:136
msgid "View details"
msgstr "Se detaljer"
-#: templates/observations/index_new.html:31
-msgid "Current date"
-msgstr "Gjeldende dato"
-
-#: templates/observations/index_new.html:54
-msgid "Crop categories"
-msgstr "Kulturkategorier"
-
-#: templates/observations/index_new.html:57
-msgid "Filter"
-msgstr "Gjør utvalg"
-
+#~ msgid "Observer"
+#~ msgstr "Observatør"
diff --git a/observations/locale/vi/LC_MESSAGES/django.mo b/observations/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/observations/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/observations/locale/vi/LC_MESSAGES/django.po b/observations/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..111164eebacd773229b2b9068237d4dd8e0e41bc
--- /dev/null
+++ b/observations/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: observations/templates/observations/detail.html:25
+#: observations/templates/observations/detail.html:28
+msgid "Observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:29
+msgid "View all observations"
+msgstr ""
+
+#: observations/templates/observations/detail.html:32
+#: observations/templates/observations/index.html:46
+#: observations/templates/observations/index.html:63
+#: observations/templates/observations/index_old.html:63
+msgid "Organism"
+msgstr ""
+
+#: observations/templates/observations/detail.html:34
+#: observations/templates/observations/index.html:50
+#: observations/templates/observations/index.html:64
+#: observations/templates/observations/index_old.html:64
+msgid "Crop"
+msgstr ""
+
+#: observations/templates/observations/detail.html:36
+#: observations/templates/observations/index.html:62
+#: observations/templates/observations/index_old.html:62
+msgid "Time of observation"
+msgstr ""
+
+#: observations/templates/observations/detail.html:40
+msgid "Observation data"
+msgstr ""
+
+#: observations/templates/observations/detail.html:86
+msgid "Observation was not quantified"
+msgstr ""
+
+#: observations/templates/observations/detail.html:115
+msgid "Map view not available"
+msgstr ""
+
+#: observations/templates/observations/index.html:25
+#: observations/templates/observations/index.html:27
+#: observations/templates/observations/index_old.html:25
+#: observations/templates/observations/index_old.html:28
+msgid "Observations"
+msgstr ""
+
+#: observations/templates/observations/index.html:31
+msgid "Current date"
+msgstr ""
+
+#: observations/templates/observations/index.html:54
+msgid "Crop categories"
+msgstr ""
+
+#: observations/templates/observations/index.html:57
+msgid "Filter"
+msgstr ""
+
+#: observations/templates/observations/index.html:65
+#: observations/templates/observations/index_old.html:65
+msgid "Heading"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:33
+msgid "All pests"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:49
+msgid "From"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:53
+msgid "To"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:55
+msgid "Date search"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:96
+msgid "Crops"
+msgstr ""
+
+#: observations/templates/observations/index_old.html:136
+msgid "View details"
+msgstr ""
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/django.mo b/observations/locale/zh_Hans/LC_MESSAGES/django.mo
index d3ba805212a616f1f21c0e0d2a8d35577562cb1c..dd5cef254fb3a3969da7110a7b55553ee9f2425d 100644
Binary files a/observations/locale/zh_Hans/LC_MESSAGES/django.mo and b/observations/locale/zh_Hans/LC_MESSAGES/django.mo differ
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/django.po b/observations/locale/zh_Hans/LC_MESSAGES/django.po
index 0cb1c649cf83d18e3d437a339f9902c55628986a..88d0d37c74b07f727c2f7f950346a0c5b5615e3d 100755
--- a/observations/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/observations/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: 2018-12-10 12:35+0100\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-10-27 11:26+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,91 +17,96 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: templates/observations/detail.html:25 templates/observations/detail.html:28
+#: observations/templates/observations/detail.html:25
+#: observations/templates/observations/detail.html:28
msgid "Observation"
msgstr "观测"
-#: templates/observations/detail.html:29
+#: observations/templates/observations/detail.html:29
msgid "View all observations"
msgstr "查看所有观测"
-#: templates/observations/detail.html:32 templates/observations/index.html:63
-#: templates/observations/index_new.html:46
-#: templates/observations/index_new.html:63
+#: observations/templates/observations/detail.html:32
+#: observations/templates/observations/index.html:46
+#: observations/templates/observations/index.html:63
+#: observations/templates/observations/index_old.html:63
msgid "Organism"
msgstr "生物"
-#: templates/observations/detail.html:34 templates/observations/index.html:64
-#: templates/observations/index_new.html:50
-#: templates/observations/index_new.html:64
+#: observations/templates/observations/detail.html:34
+#: observations/templates/observations/index.html:50
+#: observations/templates/observations/index.html:64
+#: observations/templates/observations/index_old.html:64
msgid "Crop"
msgstr "作物"
-#: templates/observations/detail.html:36 templates/observations/index.html:62
-#: templates/observations/index_new.html:62
+#: observations/templates/observations/detail.html:36
+#: observations/templates/observations/index.html:62
+#: observations/templates/observations/index_old.html:62
msgid "Time of observation"
msgstr "观测时间"
-#: templates/observations/detail.html:38
-msgid "Observer"
-msgstr "观测者"
-
-#: templates/observations/detail.html:42
+#: observations/templates/observations/detail.html:40
msgid "Observation data"
msgstr "观测数据"
-#: templates/observations/detail.html:87
+#: observations/templates/observations/detail.html:86
msgid "Observation was not quantified"
msgstr "观测没有定量化"
-#: templates/observations/detail.html:116
+#: observations/templates/observations/detail.html:115
msgid "Map view not available"
msgstr ""
-#: templates/observations/index.html:25 templates/observations/index.html:28
-#: templates/observations/index_new.html:25
+#: observations/templates/observations/index.html:25
+#: observations/templates/observations/index.html:27
+#: observations/templates/observations/index_old.html:25
+#: observations/templates/observations/index_old.html:28
msgid "Observations"
msgstr "观测"
-#: templates/observations/index.html:33
+#: observations/templates/observations/index.html:31
+msgid "Current date"
+msgstr ""
+
+#: observations/templates/observations/index.html:54
+msgid "Crop categories"
+msgstr ""
+
+#: observations/templates/observations/index.html:57
+msgid "Filter"
+msgstr ""
+
+#: observations/templates/observations/index.html:65
+#: observations/templates/observations/index_old.html:65
+msgid "Heading"
+msgstr "标题"
+
+#: observations/templates/observations/index_old.html:33
msgid "All pests"
msgstr "所有病虫害"
-#: templates/observations/index.html:49
+#: observations/templates/observations/index_old.html:49
msgid "From"
msgstr ""
-#: templates/observations/index.html:53
+#: observations/templates/observations/index_old.html:53
msgid "To"
msgstr ""
-#: templates/observations/index.html:55
+#: observations/templates/observations/index_old.html:55
msgid "Date search"
msgstr ""
-#: templates/observations/index.html:65
-#: templates/observations/index_new.html:65
-msgid "Heading"
-msgstr "标题"
-
-#: templates/observations/index.html:96
+#: observations/templates/observations/index_old.html:96
#, fuzzy
#| msgid "Crop"
msgid "Crops"
msgstr "作物"
-#: templates/observations/index.html:136
+#: observations/templates/observations/index_old.html:136
msgid "View details"
msgstr "看细节"
-#: templates/observations/index_new.html:31
-msgid "Current date"
-msgstr ""
-
-#: templates/observations/index_new.html:54
-msgid "Crop categories"
-msgstr ""
-
-#: templates/observations/index_new.html:57
-msgid "Filter"
-msgstr ""
+#~ msgid "Observer"
+#~ msgstr "观测者"
diff --git a/organisms/locale/bg/LC_MESSAGES/django.mo b/organisms/locale/bg/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/organisms/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/organisms/locale/bg/LC_MESSAGES/django.po b/organisms/locale/bg/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..4487a44ff61d04e61944eb676778229f19c647ef
--- /dev/null
+++ b/organisms/locale/bg/LC_MESSAGES/django.po
@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: organisms/templates/organisms/index.html:3
+#: organisms/templates/organisms/index.html:5
+msgid "Organisms"
+msgstr ""
+
+#: organisms/templates/organisms/index.html:5
+msgid "Crops"
+msgstr ""
+
+#: organisms/templates/organisms/index.html:6
+msgid "Crop"
+msgstr ""
diff --git a/organisms/locale/bs/LC_MESSAGES/django.po b/organisms/locale/bs/LC_MESSAGES/django.po
index 800ee23531bc627115b4b42d42473bb44e7319ba..d24f265999bb0c9dadad176297155db69b3f6177 100755
--- a/organisms/locale/bs/LC_MESSAGES/django.po
+++ b/organisms/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-06 15:21+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2015-02-13 11:14+0100\n"
"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
"Language-Team: \n"
@@ -19,14 +19,15 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: templates/organisms/index.html:3 templates/organisms/index.html.py:5
+#: organisms/templates/organisms/index.html:3
+#: organisms/templates/organisms/index.html:5
msgid "Organisms"
msgstr "Organizama"
-#: templates/organisms/index.html:5
+#: organisms/templates/organisms/index.html:5
msgid "Crops"
msgstr "Usjevi "
-#: templates/organisms/index.html:6
+#: organisms/templates/organisms/index.html:6
msgid "Crop"
msgstr "Usjevi "
diff --git a/organisms/locale/de/LC_MESSAGES/django.po b/organisms/locale/de/LC_MESSAGES/django.po
index b51a7d89b8549b7fd4b5401c2cab545cc811685e..36605681eb6b444b5d5db5556ecdcd8bb97bc8b3 100755
--- a/organisms/locale/de/LC_MESSAGES/django.po
+++ b/organisms/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: 2016-09-28 13:03-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,14 +18,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/organisms/index.html:3 templates/organisms/index.html.py:5
+#: organisms/templates/organisms/index.html:3
+#: organisms/templates/organisms/index.html:5
msgid "Organisms"
msgstr ""
-#: templates/organisms/index.html:5
+#: organisms/templates/organisms/index.html:5
msgid "Crops"
msgstr ""
-#: templates/organisms/index.html:6
+#: organisms/templates/organisms/index.html:6
msgid "Crop"
msgstr ""
diff --git a/organisms/locale/fi/LC_MESSAGES/django.mo b/organisms/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/organisms/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/organisms/locale/fi/LC_MESSAGES/django.po b/organisms/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..4487a44ff61d04e61944eb676778229f19c647ef
--- /dev/null
+++ b/organisms/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: organisms/templates/organisms/index.html:3
+#: organisms/templates/organisms/index.html:5
+msgid "Organisms"
+msgstr ""
+
+#: organisms/templates/organisms/index.html:5
+msgid "Crops"
+msgstr ""
+
+#: organisms/templates/organisms/index.html:6
+msgid "Crop"
+msgstr ""
diff --git a/organisms/locale/nb/LC_MESSAGES/django.po b/organisms/locale/nb/LC_MESSAGES/django.po
index b16bded9476761f8c8d078d39ba5d5340c39c7bd..4f648c802ff27574a6c432c84e8c64c59233d164 100755
--- a/organisms/locale/nb/LC_MESSAGES/django.po
+++ b/organisms/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-06 15:21+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,16 +18,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/organisms/index.html:3
-#: templates/organisms/index.html.py:5
+#: organisms/templates/organisms/index.html:3
+#: organisms/templates/organisms/index.html:5
msgid "Organisms"
msgstr "Organismer"
-#: templates/organisms/index.html:5
+#: organisms/templates/organisms/index.html:5
msgid "Crops"
msgstr "Kulturer"
-#: templates/organisms/index.html:6
+#: organisms/templates/organisms/index.html:6
msgid "Crop"
msgstr "Kultur"
-
diff --git a/organisms/locale/vi/LC_MESSAGES/django.mo b/organisms/locale/vi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..314bedb17d5caa2d590b5786ba725a4f8d4dab37
Binary files /dev/null and b/organisms/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/organisms/locale/vi/LC_MESSAGES/django.po b/organisms/locale/vi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..9a34c712721d7cf9a7fb589ceb22276ba4afea64
--- /dev/null
+++ b/organisms/locale/vi/LC_MESSAGES/django.po
@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+#: organisms/templates/organisms/index.html:3
+#: organisms/templates/organisms/index.html:5
+msgid "Organisms"
+msgstr ""
+
+#: organisms/templates/organisms/index.html:5
+msgid "Crops"
+msgstr ""
+
+#: organisms/templates/organisms/index.html:6
+msgid "Crop"
+msgstr ""
diff --git a/organisms/locale/zh_Hans/LC_MESSAGES/django.po b/organisms/locale/zh_Hans/LC_MESSAGES/django.po
index 1e3174734d953ca4dfc084291328aa906eb3509f..d2479ac17c66a248ba06250039136551fef29242 100755
--- a/organisms/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/organisms/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: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-06-01 11:48+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,14 +17,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: templates/organisms/index.html:3 templates/organisms/index.html.py:5
+#: organisms/templates/organisms/index.html:3
+#: organisms/templates/organisms/index.html:5
msgid "Organisms"
msgstr "生物"
-#: templates/organisms/index.html:5
+#: organisms/templates/organisms/index.html:5
msgid "Crops"
msgstr "作物"
-#: templates/organisms/index.html:6
+#: organisms/templates/organisms/index.html:6
msgid "Crop"
msgstr "作物"
diff --git a/roughage/locale/nb/LC_MESSAGES/django.po b/roughage/locale/nb/LC_MESSAGES/django.po
index bbd5b71854973e91c8cf0cc436d5b5f0c302b574..37293b6264d300e42d4da17c928c69c9f5b3364c 100755
--- a/roughage/locale/nb/LC_MESSAGES/django.po
+++ b/roughage/locale/nb/LC_MESSAGES/django.po
@@ -7,8 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
"POT-Creation-Date: 2020-09-17 12:45+0200\n"
"PO-Revision-Date: 2020-09-17 12:46+0200\n"
+=======
+"POT-Creation-Date: 2020-09-30 10:36+0200\n"
+"PO-Revision-Date: 2020-06-09 13:01+0200\n"
+>>>>>>> epleviklerNewFeatures
"Last-Translator: \n"
"Language-Team: \n"
"Language: nb\n"
@@ -16,7 +21,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+<<<<<<< HEAD
"X-Generator: Poedit 2.3\n"
+=======
+"X-Generator: Poedit 2.0.6\n"
+>>>>>>> epleviklerNewFeatures
#: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27
#: templates/roughage/nutrition_calibration.html:23
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/django.mo b/roughage/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100755
index 42a4bc543dff457af62e3c1de4ecc1cbb7d7d3fa..0000000000000000000000000000000000000000
Binary files a/roughage/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/djangojs.mo b/roughage/locale/zh_CN/LC_MESSAGES/djangojs.mo
deleted file mode 100755
index e2bcfb9fe4d17f888bd06e80e083633367a19bc1..0000000000000000000000000000000000000000
Binary files a/roughage/locale/zh_CN/LC_MESSAGES/djangojs.mo and /dev/null differ
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/djangojs.po b/roughage/locale/zh_CN/LC_MESSAGES/djangojs.po
deleted file mode 100755
index 9c3710432fcb05a81ec2cc42b6e992070c071100..0000000000000000000000000000000000000000
--- a/roughage/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:04-0700\n"
-"PO-Revision-Date: 2016-11-03 14:00+0100\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.8.7\n"
-
-#: static/roughage/js/nutrition.js:212
-msgid "Select weather station"
-msgstr "选择气象站"
-
-#: static/roughage/js/nutrition.js:241
-msgid "Don't use normaldata"
-msgstr "不使用正常数据"
-
-#: static/roughage/js/nutrition.js:287
-msgid "Watering amount"
-msgstr "加水量"
-
-#: static/roughage/js/nutrition.js:321
-msgid "Date"
-msgstr "日期"
diff --git a/roughage/locale/zh_Hans/LC_MESSAGES/django.mo b/roughage/locale/zh_Hans/LC_MESSAGES/django.mo
deleted file mode 100644
index e80e28d77ce431a4d3574a4b2c549d2f608b2957..0000000000000000000000000000000000000000
Binary files a/roughage/locale/zh_Hans/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/roughage/locale/zh_Hans/LC_MESSAGES/djangojs.mo b/roughage/locale/zh_Hans/LC_MESSAGES/djangojs.mo
deleted file mode 100644
index b966c6ef1542eaaa45d2b44bc5b8aea5bf815c91..0000000000000000000000000000000000000000
Binary files a/roughage/locale/zh_Hans/LC_MESSAGES/djangojs.mo and /dev/null differ
diff --git a/roughage/locale/zh_Hans/LC_MESSAGES/djangojs.po b/roughage/locale/zh_Hans/LC_MESSAGES/djangojs.po
deleted file mode 100755
index 018f82cf00b046a182b7ed098d6dee700987a2c8..0000000000000000000000000000000000000000
--- a/roughage/locale/zh_Hans/LC_MESSAGES/djangojs.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-28 13:04-0700\n"
-"PO-Revision-Date: 2016-11-03 14:00+0100\n"
-"Language: zh_Hans\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.8.7\n"
-
-#: static/roughage/js/nutrition.js:212
-msgid "Select weather station"
-msgstr "选择气象站"
-
-#: static/roughage/js/nutrition.js:241
-msgid "Don't use normaldata"
-msgstr "不使用正常数据"
-
-#: static/roughage/js/nutrition.js:287
-msgid "Watering amount"
-msgstr "加水量"
-
-#: static/roughage/js/nutrition.js:321
-msgid "Date"
-msgstr "日期"
diff --git a/vips_messages/locale/bg/LC_MESSAGES/django.po b/vips_messages/locale/bg/LC_MESSAGES/django.po
index 89366d94ce1a35c45d9b67644b53fa53d3b3fb04..cd9610ce1d966647528b69679ea8b21e9c7f091b 100755
--- a/vips_messages/locale/bg/LC_MESSAGES/django.po
+++ b/vips_messages/locale/bg/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-06 15:22+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2014-05-14 09:25+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,55 +18,56 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.5\n"
-#: models.py:196 templates/messages/index.html:49
+#: vips_messages/models.py:196 vips_messages/templates/messages/index.html:50
msgid "Headline"
msgstr "Заглавие"
-#: models.py:198
+#: vips_messages/models.py:198
msgid "Date published"
msgstr ""
-#: models.py:199
+#: vips_messages/models.py:199
msgid "Date expired"
msgstr ""
-#: models.py:200
+#: vips_messages/models.py:200
msgid "Illustration"
msgstr ""
-#: templates/messages/index.html:3 templates/messages/index.html.py:9
+#: vips_messages/templates/messages/index.html:3
+#: vips_messages/templates/messages/index.html:10
msgid "Messages"
msgstr "Съобщения"
-#: templates/messages/index.html:14
+#: vips_messages/templates/messages/index.html:15
msgid "Text search"
msgstr ""
-#: templates/messages/index.html:20
+#: vips_messages/templates/messages/index.html:21
msgid "All crop categories"
msgstr ""
-#: templates/messages/index.html:31
+#: vips_messages/templates/messages/index.html:32
msgid "From"
msgstr ""
-#: templates/messages/index.html:36
+#: vips_messages/templates/messages/index.html:37
msgid "To"
msgstr ""
-#: templates/messages/index.html:38
+#: vips_messages/templates/messages/index.html:39
msgid "Date search"
msgstr ""
-#: templates/messages/index.html:47
+#: vips_messages/templates/messages/index.html:48
msgid "Publish date"
msgstr "Дата на издаване"
-#: templates/messages/index.html:48
+#: vips_messages/templates/messages/index.html:49
msgid "Crop group(s)"
msgstr ""
-#: templates/messages/index.html:50
+#: vips_messages/templates/messages/index.html:51
msgid "Author"
msgstr "Автор"
diff --git a/vips_messages/locale/bs/LC_MESSAGES/django.po b/vips_messages/locale/bs/LC_MESSAGES/django.po
index 93183b4ab2f93e04a635725c6f84213937f9c58a..db5451c4aaab9bed2339c9a2b4d62218a92d38f6 100755
--- a/vips_messages/locale/bs/LC_MESSAGES/django.po
+++ b/vips_messages/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-06 15:22+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2015-02-13 11:13+0100\n"
"Last-Translator: Vjekoslav vujica <wvjeko@gmail.com>\n"
"Language-Team: \n"
@@ -19,55 +19,56 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.7.4\n"
-#: models.py:196 templates/messages/index.html:49
+#: vips_messages/models.py:196 vips_messages/templates/messages/index.html:50
msgid "Headline"
msgstr "Naslov "
-#: models.py:198
+#: vips_messages/models.py:198
msgid "Date published"
msgstr ""
-#: models.py:199
+#: vips_messages/models.py:199
msgid "Date expired"
msgstr ""
-#: models.py:200
+#: vips_messages/models.py:200
msgid "Illustration"
msgstr ""
-#: templates/messages/index.html:3 templates/messages/index.html.py:9
+#: vips_messages/templates/messages/index.html:3
+#: vips_messages/templates/messages/index.html:10
msgid "Messages"
msgstr "Poruke "
-#: templates/messages/index.html:14
+#: vips_messages/templates/messages/index.html:15
msgid "Text search"
msgstr ""
-#: templates/messages/index.html:20
+#: vips_messages/templates/messages/index.html:21
msgid "All crop categories"
msgstr ""
-#: templates/messages/index.html:31
+#: vips_messages/templates/messages/index.html:32
msgid "From"
msgstr ""
-#: templates/messages/index.html:36
+#: vips_messages/templates/messages/index.html:37
msgid "To"
msgstr ""
-#: templates/messages/index.html:38
+#: vips_messages/templates/messages/index.html:39
msgid "Date search"
msgstr ""
-#: templates/messages/index.html:47
+#: vips_messages/templates/messages/index.html:48
msgid "Publish date"
msgstr "Datum objave "
-#: templates/messages/index.html:48
+#: vips_messages/templates/messages/index.html:49
msgid "Crop group(s)"
msgstr ""
-#: templates/messages/index.html:50
+#: vips_messages/templates/messages/index.html:51
msgid "Author"
msgstr "Autor "
diff --git a/vips_messages/locale/de/LC_MESSAGES/django.po b/vips_messages/locale/de/LC_MESSAGES/django.po
index 95b9ab26c78a893369d06c9d923a0fdc20963c97..789539a67b4d02b60ce72041afc17c30f864be39 100755
--- a/vips_messages/locale/de/LC_MESSAGES/django.po
+++ b/vips_messages/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: 2016-09-28 13:03-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,54 +18,55 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: models.py:196 templates/messages/index.html:49
+#: vips_messages/models.py:196 vips_messages/templates/messages/index.html:50
msgid "Headline"
msgstr ""
-#: models.py:198
+#: vips_messages/models.py:198
msgid "Date published"
msgstr ""
-#: models.py:199
+#: vips_messages/models.py:199
msgid "Date expired"
msgstr ""
-#: models.py:200
+#: vips_messages/models.py:200
msgid "Illustration"
msgstr ""
-#: templates/messages/index.html:3 templates/messages/index.html.py:9
+#: vips_messages/templates/messages/index.html:3
+#: vips_messages/templates/messages/index.html:10
msgid "Messages"
msgstr ""
-#: templates/messages/index.html:14
+#: vips_messages/templates/messages/index.html:15
msgid "Text search"
msgstr ""
-#: templates/messages/index.html:20
+#: vips_messages/templates/messages/index.html:21
msgid "All crop categories"
msgstr ""
-#: templates/messages/index.html:31
+#: vips_messages/templates/messages/index.html:32
msgid "From"
msgstr ""
-#: templates/messages/index.html:36
+#: vips_messages/templates/messages/index.html:37
msgid "To"
msgstr ""
-#: templates/messages/index.html:38
+#: vips_messages/templates/messages/index.html:39
msgid "Date search"
msgstr ""
-#: templates/messages/index.html:47
+#: vips_messages/templates/messages/index.html:48
msgid "Publish date"
msgstr ""
-#: templates/messages/index.html:48
+#: vips_messages/templates/messages/index.html:49
msgid "Crop group(s)"
msgstr ""
-#: templates/messages/index.html:50
+#: vips_messages/templates/messages/index.html:51
msgid "Author"
msgstr ""
diff --git a/vips_messages/locale/fi/LC_MESSAGES/django.mo b/vips_messages/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845
Binary files /dev/null and b/vips_messages/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/vips_messages/locale/fi/LC_MESSAGES/django.po b/vips_messages/locale/fi/LC_MESSAGES/django.po
new file mode 100644
index 0000000000000000000000000000000000000000..0470e2917fbddd7fd089dbb46ca9ca389735fb2a
--- /dev/null
+++ b/vips_messages/locale/fi/LC_MESSAGES/django.po
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: vips_messages/models.py:196 vips_messages/templates/messages/index.html:50
+msgid "Headline"
+msgstr ""
+
+#: vips_messages/models.py:198
+msgid "Date published"
+msgstr ""
+
+#: vips_messages/models.py:199
+msgid "Date expired"
+msgstr ""
+
+#: vips_messages/models.py:200
+msgid "Illustration"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:3
+#: vips_messages/templates/messages/index.html:10
+msgid "Messages"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:15
+msgid "Text search"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:21
+msgid "All crop categories"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:32
+msgid "From"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:37
+msgid "To"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:39
+msgid "Date search"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:48
+msgid "Publish date"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:49
+msgid "Crop group(s)"
+msgstr ""
+
+#: vips_messages/templates/messages/index.html:51
+msgid "Author"
+msgstr ""
diff --git a/vips_messages/locale/nb/LC_MESSAGES/django.po b/vips_messages/locale/nb/LC_MESSAGES/django.po
index 5034db9fe821bce3789bc2d6292a21b14dc03ada..6e6bb2ac0216fb06654e015f4663e707627512b2 100755
--- a/vips_messages/locale/nb/LC_MESSAGES/django.po
+++ b/vips_messages/locale/nb/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-06 15:22+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,57 +30,55 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: models.py:196
-#: templates/messages/index.html:49
+#: vips_messages/models.py:196 vips_messages/templates/messages/index.html:50
msgid "Headline"
msgstr "Overskrift"
-#: models.py:198
+#: vips_messages/models.py:198
msgid "Date published"
msgstr "Dato publisert"
-#: models.py:199
+#: vips_messages/models.py:199
msgid "Date expired"
msgstr "Dato utløpt"
-#: models.py:200
+#: vips_messages/models.py:200
msgid "Illustration"
msgstr "Illustrasjon"
-#: templates/messages/index.html:3
-#: templates/messages/index.html.py:9
+#: vips_messages/templates/messages/index.html:3
+#: vips_messages/templates/messages/index.html:10
msgid "Messages"
msgstr "Meldinger"
-#: templates/messages/index.html:14
+#: vips_messages/templates/messages/index.html:15
msgid "Text search"
msgstr "Fritekstsøk"
-#: templates/messages/index.html:20
+#: vips_messages/templates/messages/index.html:21
msgid "All crop categories"
msgstr "Alle kulturgrupper"
-#: templates/messages/index.html:31
+#: vips_messages/templates/messages/index.html:32
msgid "From"
msgstr "Fra"
-#: templates/messages/index.html:36
+#: vips_messages/templates/messages/index.html:37
msgid "To"
msgstr "Til"
-#: templates/messages/index.html:38
+#: vips_messages/templates/messages/index.html:39
msgid "Date search"
msgstr "Datosøk"
-#: templates/messages/index.html:47
+#: vips_messages/templates/messages/index.html:48
msgid "Publish date"
msgstr "Publiseringsdato"
-#: templates/messages/index.html:48
+#: vips_messages/templates/messages/index.html:49
msgid "Crop group(s)"
msgstr "Kulturgruppe(r)"
-#: templates/messages/index.html:50
+#: vips_messages/templates/messages/index.html:51
msgid "Author"
msgstr "Forfatter"
-
diff --git a/vips_messages/locale/vi/LC_MESSAGES/django.po b/vips_messages/locale/vi/LC_MESSAGES/django.po
index bd37c6166017451bbe3f4d748ae3b45c2f82e7bb..b531b16947f00f0dcfe3ad98ae07e1d2e4fc6c80 100755
--- a/vips_messages/locale/vi/LC_MESSAGES/django.po
+++ b/vips_messages/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: 2016-07-06 15:22+0200\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,54 +18,55 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: models.py:196 templates/messages/index.html:49
+#: vips_messages/models.py:196 vips_messages/templates/messages/index.html:50
msgid "Headline"
msgstr ""
-#: models.py:198
+#: vips_messages/models.py:198
msgid "Date published"
msgstr ""
-#: models.py:199
+#: vips_messages/models.py:199
msgid "Date expired"
msgstr ""
-#: models.py:200
+#: vips_messages/models.py:200
msgid "Illustration"
msgstr ""
-#: templates/messages/index.html:3 templates/messages/index.html.py:9
+#: vips_messages/templates/messages/index.html:3
+#: vips_messages/templates/messages/index.html:10
msgid "Messages"
msgstr ""
-#: templates/messages/index.html:14
+#: vips_messages/templates/messages/index.html:15
msgid "Text search"
msgstr ""
-#: templates/messages/index.html:20
+#: vips_messages/templates/messages/index.html:21
msgid "All crop categories"
msgstr ""
-#: templates/messages/index.html:31
+#: vips_messages/templates/messages/index.html:32
msgid "From"
msgstr ""
-#: templates/messages/index.html:36
+#: vips_messages/templates/messages/index.html:37
msgid "To"
msgstr ""
-#: templates/messages/index.html:38
+#: vips_messages/templates/messages/index.html:39
msgid "Date search"
msgstr ""
-#: templates/messages/index.html:47
+#: vips_messages/templates/messages/index.html:48
msgid "Publish date"
msgstr ""
-#: templates/messages/index.html:48
+#: vips_messages/templates/messages/index.html:49
msgid "Crop group(s)"
msgstr ""
-#: templates/messages/index.html:50
+#: vips_messages/templates/messages/index.html:51
msgid "Author"
msgstr ""
diff --git a/vips_messages/locale/zh_Hans/LC_MESSAGES/django.po b/vips_messages/locale/zh_Hans/LC_MESSAGES/django.po
index 6fea5e3f6b89e084cadc85a7417b47dae22edae6..349e77658cd512e000d0790134334891233b12d7 100755
--- a/vips_messages/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/vips_messages/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: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2020-08-24 15:02+0200\n"
"PO-Revision-Date: 2016-10-27 11:42+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,54 +17,55 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: models.py:196 templates/messages/index.html:49
+#: vips_messages/models.py:196 vips_messages/templates/messages/index.html:50
msgid "Headline"
msgstr "标题"
-#: models.py:198
+#: vips_messages/models.py:198
msgid "Date published"
msgstr "发布日期"
-#: models.py:199
+#: vips_messages/models.py:199
msgid "Date expired"
msgstr "过期日期"
-#: models.py:200
+#: vips_messages/models.py:200
msgid "Illustration"
msgstr "图"
-#: templates/messages/index.html:3 templates/messages/index.html.py:9
+#: vips_messages/templates/messages/index.html:3
+#: vips_messages/templates/messages/index.html:10
msgid "Messages"
msgstr "信息"
-#: templates/messages/index.html:14
+#: vips_messages/templates/messages/index.html:15
msgid "Text search"
msgstr "搜索文本"
-#: templates/messages/index.html:20
+#: vips_messages/templates/messages/index.html:21
msgid "All crop categories"
msgstr "所有作物类型"
-#: templates/messages/index.html:31
+#: vips_messages/templates/messages/index.html:32
msgid "From"
msgstr "从"
-#: templates/messages/index.html:36
+#: vips_messages/templates/messages/index.html:37
msgid "To"
msgstr "到"
-#: templates/messages/index.html:38
+#: vips_messages/templates/messages/index.html:39
msgid "Date search"
msgstr "搜索日期"
-#: templates/messages/index.html:47
+#: vips_messages/templates/messages/index.html:48
msgid "Publish date"
msgstr "发布日期"
-#: templates/messages/index.html:48
+#: vips_messages/templates/messages/index.html:49
msgid "Crop group(s)"
msgstr "作物组"
-#: templates/messages/index.html:50
+#: vips_messages/templates/messages/index.html:51
msgid "Author"
msgstr "作者"
diff --git a/vips_messages/migrations/0005_auto_20200603_1435.py b/vips_messages/migrations/0005_auto_20200603_1435.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a1ad845f64852afbd40762f2eac84d2801c88fc
--- /dev/null
+++ b/vips_messages/migrations/0005_auto_20200603_1435.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2020-06-03 12:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('vips_messages', '0004_auto_20160712_1001'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='advertisement',
+ name='ad_heading',
+ field=models.CharField(max_length=200, verbose_name='Headline'),
+ ),
+ migrations.AlterField(
+ model_name='advertisement',
+ name='exp_date',
+ field=models.DateField(verbose_name='Date expired'),
+ ),
+ migrations.AlterField(
+ model_name='advertisement',
+ name='illustration',
+ field=models.ImageField(blank=True, upload_to=b'images/advertisement', verbose_name='Illustration'),
+ ),
+ migrations.AlterField(
+ model_name='advertisement',
+ name='pub_date',
+ field=models.DateField(verbose_name='Date published'),
+ ),
+ ]