Merge branch '202003_septoriaHUMFormChanges' into 'develop'

202003 septoria hum form changes

See merge request !6

cerealblotchmodels/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-12 15:06+0200\n"
+"POT-Creation-Date: 2020-03-24 15:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,162 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:25
-#: templates/cerealblotchmodels/barleynetblotchform.html:34
-msgid "Barley net blotch"
+#: templates/cerealblotchmodels/PPOmodelform.html:25
+#: templates/cerealblotchmodels/PPOmodelform.html:336
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:443
+msgid "Septoria humidity model"
 msgstr ""
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:42
-msgid "Background data for the barley net blotch model"
+#: templates/cerealblotchmodels/PPOmodelform.html:28
+msgid "Plant Protection Online Model"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:32
+msgid "Input data"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:35
+msgid "Results"
 msgstr ""
 
+#: templates/cerealblotchmodels/PPOmodelform.html:41
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
+msgid "Country"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:43
+#: templates/cerealblotchmodels/PPOmodelform.html:50
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
+msgid "Please select"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:48
 #: templates/cerealblotchmodels/barleynetblotchform.html:49
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
-#: templates/cerealblotchmodels/wheatleafblotchform.html:55
+#: templates/cerealblotchmodels/wheatleafblotchform.html:51
 msgid "Weather station"
 msgstr ""
 
+#: templates/cerealblotchmodels/PPOmodelform.html:56
+#: templates/cerealblotchmodels/wheatleafblotchform.html:46
+msgid "Growth stage"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:61
+msgid "Susceptibility"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:68
+msgid "Severity"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:80
+#: templates/cerealblotchmodels/barleynetblotchform.html:108
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: templates/cerealblotchmodels/wheatleafblotchform.html:136
+msgid "Run model"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:122
+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 Mozilla Firefox, "
+"Microsoft Edge or Google Chrome."
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:224
+#: templates/cerealblotchmodels/barleynetblotchform.html:281
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:312
+#: templates/cerealblotchmodels/wheatleafblotchform.html:344
+msgid "Select weather station"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:248
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:355
+msgid "The model is running, please wait"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:267
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
+msgid "Leaf wetness, hourly"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:268
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
+msgid "Rain, hourly"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:269
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
+msgid "Relative humidity, hourly mean"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:270
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:377
+msgid "Humid hour (yes/no)"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:271
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:378
+msgid "Humid period hour"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:272
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+msgid "Humid hour sum"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:273
+#: templates/cerealblotchmodels/PPOmodelform.html:331
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:438
+msgid "Humid period hour outside protection period"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:280
+#: templates/cerealblotchmodels/barleynetblotchform.html:206
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:387
+#: templates/cerealblotchmodels/wheatleafblotchform.html:265
+msgid "Time"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:287
+#: templates/cerealblotchmodels/barleynetblotchform.html:214
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:394
+#: templates/cerealblotchmodels/wheatleafblotchform.html:275
+msgid "Warning status"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:327
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
+msgid "Hours"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:332
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
+msgid "Threshold humid period"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:333
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+msgid "Spraying protection period"
+msgstr ""
+
+#: templates/cerealblotchmodels/barleynetblotchform.html:25
+#: templates/cerealblotchmodels/barleynetblotchform.html:34
+msgid "Barley net blotch"
+msgstr ""
+
+#: templates/cerealblotchmodels/barleynetblotchform.html:42
+msgid "Background data for the barley net blotch model"
+msgstr ""
+
 #: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:61
+#: templates/cerealblotchmodels/wheatleafblotchform.html:57
 msgid "Sowing date"
 msgstr ""
 
@@ -47,22 +186,22 @@ msgid "Same crop as last season"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
+#: templates/cerealblotchmodels/wheatleafblotchform.html:74
 msgid "Plowed"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:82
+#: templates/cerealblotchmodels/wheatleafblotchform.html:78
 msgid "Observation date"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:87
+#: templates/cerealblotchmodels/wheatleafblotchform.html:83
 msgid "&#37; Infected leaves"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:98
+#: templates/cerealblotchmodels/wheatleafblotchform.html:94
 msgid "Spraying date"
 msgstr ""
 
@@ -71,40 +210,34 @@ msgid "Preparation"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:109
-#: templates/cerealblotchmodels/wheatleafblotchform.html:120
-#: templates/cerealblotchmodels/wheatleafblotchform.html:131
+#: templates/cerealblotchmodels/wheatleafblotchform.html:105
+#: templates/cerealblotchmodels/wheatleafblotchform.html:116
+#: templates/cerealblotchmodels/wheatleafblotchform.html:127
 msgid "Preparation dose"
 msgstr ""
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:108
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:140
-msgid "Run model"
-msgstr ""
-
 #: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:147
+#: templates/cerealblotchmodels/wheatleafblotchform.html:143
 msgid "Model is running, please wait"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:158
+#: templates/cerealblotchmodels/wheatleafblotchform.html:154
 msgid "Scroll past chart by swiping the dotted line on the right"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:184
+#: templates/cerealblotchmodels/wheatleafblotchform.html:180
 msgid "Missing observation information"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:193
+#: templates/cerealblotchmodels/wheatleafblotchform.html:189
 msgid "Missing spraying information"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:260
+#: templates/cerealblotchmodels/wheatleafblotchform.html:256
 msgid "Temperature, daily mean"
 msgstr ""
 
@@ -121,85 +254,62 @@ msgid "Day degrees since sowing"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:198
-#: templates/cerealblotchmodels/barleynetblotchform.html:263
-#: templates/cerealblotchmodels/wheatleafblotchform.html:261
-#: templates/cerealblotchmodels/wheatleafblotchform.html:332
+#: templates/cerealblotchmodels/barleynetblotchform.html:265
+#: templates/cerealblotchmodels/wheatleafblotchform.html:257
+#: templates/cerealblotchmodels/wheatleafblotchform.html:328
 msgid "Threshold"
 msgstr ""
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:199
-#: templates/cerealblotchmodels/barleynetblotchform.html:264
-#: templates/cerealblotchmodels/wheatleafblotchform.html:262
-#: templates/cerealblotchmodels/wheatleafblotchform.html:333
+#: templates/cerealblotchmodels/barleynetblotchform.html:266
+#: templates/cerealblotchmodels/wheatleafblotchform.html:258
+#: templates/cerealblotchmodels/wheatleafblotchform.html:329
 msgid "Disease"
 msgstr ""
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
-#: templates/cerealblotchmodels/wheatleafblotchform.html:269
-msgid "Time"
-msgstr ""
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:390
-#: templates/cerealblotchmodels/wheatleafblotchform.html:279
-msgid "Warning status"
-msgstr ""
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:247
-#: templates/cerealblotchmodels/wheatleafblotchform.html:316
+#: templates/cerealblotchmodels/barleynetblotchform.html:249
+#: templates/cerealblotchmodels/wheatleafblotchform.html:312
 msgid "No data returned"
 msgstr ""
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:260
-#: templates/cerealblotchmodels/wheatleafblotchform.html:329
+#: templates/cerealblotchmodels/barleynetblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:325
 msgid "Disease value"
 msgstr ""
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:267
+#: templates/cerealblotchmodels/barleynetblotchform.html:269
 msgid "Barley net blotch development"
 msgstr ""
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:279
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:308
-#: templates/cerealblotchmodels/wheatleafblotchform.html:348
-msgid "Select weather station"
-msgstr ""
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:305
-#: templates/cerealblotchmodels/wheatleafblotchform.html:377
+#: templates/cerealblotchmodels/barleynetblotchform.html:307
+#: templates/cerealblotchmodels/wheatleafblotchform.html:373
 msgid "Select crop"
 msgstr ""
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:333
-#: templates/cerealblotchmodels/wheatleafblotchform.html:417
+#: templates/cerealblotchmodels/barleynetblotchform.html:335
+#: templates/cerealblotchmodels/wheatleafblotchform.html:413
 msgid "Select preparation"
 msgstr ""
 
+#: templates/cerealblotchmodels/barleynetblotchform.html:364
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:207
+#: templates/cerealblotchmodels/wheatleafblotchform.html:445
+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 ""
+
 #: templates/cerealblotchmodels/index.html:25
 #: templates/cerealblotchmodels/index.html:27
 msgid "Cereal blotch models"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
-msgid "Septoria humidity model"
-msgstr ""
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:32
 msgid "Background data"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
-msgid "Country"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
-msgid "Please select"
-msgstr ""
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:53
 msgid "Sprayings"
 msgstr ""
@@ -233,144 +343,91 @@ msgstr ""
 msgid "All kernels fully developed (gs 75)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:100
-msgid "Threshold values for 'humid hour'"
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+msgid "Show advanced settings"
 msgstr ""
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+msgid "Threshold values for humid hour"
+msgstr ""
+
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:104
 msgid "Relative humidity"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:107
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:109
 msgid "Leaf wetness (min/hour)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:112
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:114
 msgid "Precipitation"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:117
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:119
 msgid "Sliding hours past (hours)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:122
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:124
 msgid "Sliding hours ahead (hours)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:131
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:132
 msgid "Other threshold values"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:133
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:134
 msgid "Number of consecutive 'humid hours'"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:138
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:139
 msgid "Spraying protection days"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:143
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:144
 msgid "Leaf life time (days)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:351
-msgid "The model is running, please wait"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
-msgid "Leaf wetness, hourly"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
-msgid "Rain, hourly"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
-msgid "Relative humidity, hourly mean"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
-msgid "Humid hour (yes/no)"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
-msgid "Humid period hour"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
-msgid "Humid hour sum"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
-msgid "Humid period hour outside protection period"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:430
-msgid "Hours"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
-msgid "Threshold humid period"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:436
-msgid "Spraying protection period"
-msgstr ""
-
 #: templates/cerealblotchmodels/wheatleafblotchform.html:25
 #: templates/cerealblotchmodels/wheatleafblotchform.html:34
 msgid "Wheat leaf blotch"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:43
+#: templates/cerealblotchmodels/wheatleafblotchform.html:39
 msgid "Background data for the wheat leaf blotch model"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:50
-msgid "Growth stage"
-msgstr ""
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:66
+#: templates/cerealblotchmodels/wheatleafblotchform.html:62
 msgid "Wheat variety"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:73
+#: templates/cerealblotchmodels/wheatleafblotchform.html:69
 msgid "Previous crop was wheat"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:96
+#: templates/cerealblotchmodels/wheatleafblotchform.html:92
 msgid "Spraying"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:103
+#: templates/cerealblotchmodels/wheatleafblotchform.html:99
 msgid "Preparation 1"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:114
+#: templates/cerealblotchmodels/wheatleafblotchform.html:110
 msgid "Preparation 2"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:125
+#: templates/cerealblotchmodels/wheatleafblotchform.html:121
 msgid "Preparation 3"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:201
+#: templates/cerealblotchmodels/wheatleafblotchform.html:197
 msgid "Missing spraying information on second preparation"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:212
+#: templates/cerealblotchmodels/wheatleafblotchform.html:208
 msgid "Too early to calculate risk"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:336
+#: templates/cerealblotchmodels/wheatleafblotchform.html:332
 msgid "Wheat leaf blotch development"
 msgstr ""
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:449
-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 ""

cerealblotchmodels/locale/nb/LC_MESSAGES/django.po

@@ -3,20 +3,169 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-12 15:06+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2020-03-24 15:33+0100\n"
+"PO-Revision-Date: 2020-03-25 09:18+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.6\n"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:25
+#: templates/cerealblotchmodels/PPOmodelform.html:336
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:443
+msgid "Septoria humidity model"
+msgstr "Fuktmodell bladflekksjukdommer i hvete"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:28
+msgid "Plant Protection Online Model"
+msgstr "Planteværn Online-modell"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:32
+msgid "Input data"
+msgstr "Input-data"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:35
+msgid "Results"
+msgstr "Resultater"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:41
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
+msgid "Country"
+msgstr "Land"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:43
+#: templates/cerealblotchmodels/PPOmodelform.html:50
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
+msgid "Please select"
+msgstr "Vennligst velg"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:48
+#: templates/cerealblotchmodels/barleynetblotchform.html:49
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
+#: templates/cerealblotchmodels/wheatleafblotchform.html:51
+msgid "Weather station"
+msgstr "Målestasjon"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:56
+#: templates/cerealblotchmodels/wheatleafblotchform.html:46
+msgid "Growth stage"
+msgstr "Vekststadium"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:61
+msgid "Susceptibility"
+msgstr "Mottakelighet"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:68
+msgid "Severity"
+msgstr "Alvorlighetsgrad"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:80
+#: templates/cerealblotchmodels/barleynetblotchform.html:108
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: templates/cerealblotchmodels/wheatleafblotchform.html:136
+msgid "Run model"
+msgstr "Kjør modell"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:122
+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 Mozilla 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/cerealblotchmodels/PPOmodelform.html:224
+#: templates/cerealblotchmodels/barleynetblotchform.html:281
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:312
+#: templates/cerealblotchmodels/wheatleafblotchform.html:344
+msgid "Select weather station"
+msgstr "Velg målestasjon"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:248
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:355
+msgid "The model is running, please wait"
+msgstr "Modellen kjører, vennligst vent"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:267
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
+msgid "Leaf wetness, hourly"
+msgstr "Bladfukt, timesverdi"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:268
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
+msgid "Rain, hourly"
+msgstr "Regn, timeverdi"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:269
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
+msgid "Relative humidity, hourly mean"
+msgstr "Relativ luftfuktighet, timesgjennomsnitt"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:270
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:377
+msgid "Humid hour (yes/no)"
+msgstr "Fuktig time (ja/nei)"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:271
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:378
+msgid "Humid period hour"
+msgstr "Time nr i fuktig periode"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:272
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+msgid "Humid hour sum"
+msgstr "Sum fuktige timer"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:273
+#: templates/cerealblotchmodels/PPOmodelform.html:331
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:438
+msgid "Humid period hour outside protection period"
+msgstr "Time nr x i fuktig periode utenfor sprøyteperiode"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:280
+#: templates/cerealblotchmodels/barleynetblotchform.html:206
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:387
+#: templates/cerealblotchmodels/wheatleafblotchform.html:265
+msgid "Time"
+msgstr "Tid"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:287
+#: templates/cerealblotchmodels/barleynetblotchform.html:214
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:394
+#: templates/cerealblotchmodels/wheatleafblotchform.html:275
+msgid "Warning status"
+msgstr "Varselstatus"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:327
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
+msgid "Hours"
+msgstr "Timer"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:332
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
+msgid "Threshold humid period"
+msgstr "Terskelverdier for fuktighet"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:333
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+msgid "Spraying protection period"
+msgstr "Beskyttelse etter sprøyting"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:25
 #: templates/cerealblotchmodels/barleynetblotchform.html:34
@@ -27,14 +176,8 @@ msgstr "Byggbrunflekk"
 msgid "Background data for the barley net blotch model"
 msgstr "Bakgrunnsdata for byggbrunflekkmodellen"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:49
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
-#: templates/cerealblotchmodels/wheatleafblotchform.html:55
-msgid "Weather station"
-msgstr "Målestasjon"
-
 #: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:61
+#: templates/cerealblotchmodels/wheatleafblotchform.html:57
 msgid "Sowing date"
 msgstr "Sådato"
 
@@ -47,22 +190,22 @@ msgid "Same crop as last season"
 msgstr "Samme kultur som i fjor"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
+#: templates/cerealblotchmodels/wheatleafblotchform.html:74
 msgid "Plowed"
 msgstr "Pløyd"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:82
+#: templates/cerealblotchmodels/wheatleafblotchform.html:78
 msgid "Observation date"
 msgstr "Observasjonsdato"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:87
+#: templates/cerealblotchmodels/wheatleafblotchform.html:83
 msgid "&#37; Infected leaves"
 msgstr "&#37; infiserte blad"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:98
+#: templates/cerealblotchmodels/wheatleafblotchform.html:94
 msgid "Spraying date"
 msgstr "Sprøytedato"
 
@@ -71,40 +214,34 @@ msgid "Preparation"
 msgstr "Plantevernmiddel"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:109
-#: templates/cerealblotchmodels/wheatleafblotchform.html:120
-#: templates/cerealblotchmodels/wheatleafblotchform.html:131
+#: templates/cerealblotchmodels/wheatleafblotchform.html:105
+#: templates/cerealblotchmodels/wheatleafblotchform.html:116
+#: templates/cerealblotchmodels/wheatleafblotchform.html:127
 msgid "Preparation dose"
 msgstr "Dose"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:108
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:140
-msgid "Run model"
-msgstr "Kjør modell"
-
 #: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:147
+#: templates/cerealblotchmodels/wheatleafblotchform.html:143
 msgid "Model is running, please wait"
 msgstr "Modellen kjører, vennligst vent"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:158
+#: templates/cerealblotchmodels/wheatleafblotchform.html:154
 msgid "Scroll past chart by swiping the dotted line on the right"
 msgstr "Rull forbi diagram ved å sveipe den prikkede linjen til høyre"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:184
+#: templates/cerealblotchmodels/wheatleafblotchform.html:180
 msgid "Missing observation information"
 msgstr "Observasjonsinformasjon mangler"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:193
+#: templates/cerealblotchmodels/wheatleafblotchform.html:189
 msgid "Missing spraying information"
 msgstr "Sprøyteinformasjon mangler"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:260
+#: templates/cerealblotchmodels/wheatleafblotchform.html:256
 msgid "Temperature, daily mean"
 msgstr "Temperatur, døgngjennomsnitt"
 
@@ -121,88 +258,69 @@ msgid "Day degrees since sowing"
 msgstr "Døgngrader siden såing"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:198
-#: templates/cerealblotchmodels/barleynetblotchform.html:263
-#: templates/cerealblotchmodels/wheatleafblotchform.html:261
-#: templates/cerealblotchmodels/wheatleafblotchform.html:332
+#: templates/cerealblotchmodels/barleynetblotchform.html:265
+#: templates/cerealblotchmodels/wheatleafblotchform.html:257
+#: templates/cerealblotchmodels/wheatleafblotchform.html:328
 msgid "Threshold"
 msgstr "Terskelverdi"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:199
-#: templates/cerealblotchmodels/barleynetblotchform.html:264
-#: templates/cerealblotchmodels/wheatleafblotchform.html:262
-#: templates/cerealblotchmodels/wheatleafblotchform.html:333
+#: templates/cerealblotchmodels/barleynetblotchform.html:266
+#: templates/cerealblotchmodels/wheatleafblotchform.html:258
+#: templates/cerealblotchmodels/wheatleafblotchform.html:329
 msgid "Disease"
 msgstr "Sykdom"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
-#: templates/cerealblotchmodels/wheatleafblotchform.html:269
-msgid "Time"
-msgstr "Tid"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:390
-#: templates/cerealblotchmodels/wheatleafblotchform.html:279
-msgid "Warning status"
-msgstr "Varselstatus"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:247
-#: templates/cerealblotchmodels/wheatleafblotchform.html:316
+#: templates/cerealblotchmodels/barleynetblotchform.html:249
+#: templates/cerealblotchmodels/wheatleafblotchform.html:312
 msgid "No data returned"
 msgstr "Ingen data returnert"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:260
-#: templates/cerealblotchmodels/wheatleafblotchform.html:329
+#: templates/cerealblotchmodels/barleynetblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:325
 msgid "Disease value"
 msgstr "Sykdomsverdi"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:267
+#: templates/cerealblotchmodels/barleynetblotchform.html:269
 msgid "Barley net blotch development"
 msgstr "Utvikling av byggbrunflekk"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:279
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:308
-#: templates/cerealblotchmodels/wheatleafblotchform.html:348
-msgid "Select weather station"
-msgstr "Velg målestasjon"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:305
-#: templates/cerealblotchmodels/wheatleafblotchform.html:377
+#: templates/cerealblotchmodels/barleynetblotchform.html:307
+#: templates/cerealblotchmodels/wheatleafblotchform.html:373
 msgid "Select crop"
 msgstr "Velg kultur"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:333
-#: templates/cerealblotchmodels/wheatleafblotchform.html:417
+#: templates/cerealblotchmodels/barleynetblotchform.html:335
+#: templates/cerealblotchmodels/wheatleafblotchform.html:413
 msgid "Select preparation"
 msgstr "Velg plantevernmiddel"
 
+#: templates/cerealblotchmodels/barleynetblotchform.html:364
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:207
+#: templates/cerealblotchmodels/wheatleafblotchform.html:445
+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."
+
 #: templates/cerealblotchmodels/index.html:25
 #: templates/cerealblotchmodels/index.html:27
 msgid "Cereal blotch models"
 msgstr "Bladflekksjukdommer i korn"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
-msgid "Septoria humidity model"
-msgstr "Septoria fuktmodell"
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:32
 msgid "Background data"
 msgstr "Bakgrunnsdata"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
-msgid "Country"
-msgstr "Land"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
-msgid "Please select"
-msgstr "Vennligst velg"
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:53
 msgid "Sprayings"
-msgstr "Sprøytinger"
+msgstr "Utførte sprøytinger"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:55
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:60
@@ -211,167 +329,113 @@ msgstr "Sprøytedato 1"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:70
 msgid "Phenology"
-msgstr "Utviklingsstadium"
+msgstr "Dato for utviklingsstadium"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:72
 msgid "Growth stage 31"
-msgstr "Vekststadie 31"
+msgstr "BBCH 31. Beg. strekning"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:77
 msgid "3rd upper leaf (gs 32)"
-msgstr "3. øverste blad (vs32)"
+msgstr "BBCH 32. 2. leddknute synlig"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:82
 msgid "2nd upper leaf (gs 33)"
-msgstr "Nest øverste blad (vs 33)"
+msgstr "BBCH 33. 3. leddknute synlig"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:87
 msgid "Upper leaf (gs 37-39)"
-msgstr "Øvre blad (vs 37-39)"
+msgstr "BBCH 37-39. Flaggblad under utvikling"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:92
 msgid "All kernels fully developed (gs 75)"
-msgstr "Alle kjerner fullt strukket ut (vs 75)"
+msgstr "BBCH 75. Melkemodning"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:100
-msgid "Threshold values for 'humid hour'"
-msgstr "Terskelverdier for fuktig time"
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+msgid "Show advanced settings"
+msgstr "Vis avanserte innstillinger"
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+msgid "Threshold values for humid hour"
+msgstr "Terskelverdier for fuktighet"
+
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:104
 msgid "Relative humidity"
 msgstr "Relativ luftfuktighet"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:107
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:109
 msgid "Leaf wetness (min/hour)"
 msgstr "Bladfukt (min/t)"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:112
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:114
 msgid "Precipitation"
 msgstr "Nedbør"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:117
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:119
 msgid "Sliding hours past (hours)"
-msgstr "Glidende sum, bakover (timer)"
+msgstr "Referanseperiode, bakover (timer)"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:122
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:124
 msgid "Sliding hours ahead (hours)"
-msgstr "Glidende sum, fremover (timer)"
+msgstr "Prognoseperiode, fremover (timer)"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:131
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:132
 msgid "Other threshold values"
 msgstr "Andre terskelverdier"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:133
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:134
 msgid "Number of consecutive 'humid hours'"
 msgstr "Antall sammenhengende \"fuktige timer\""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:138
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:139
 msgid "Spraying protection days"
-msgstr "Antall dager beskyttelse etter sprøyting"
+msgstr "Forv. ant. dager beskyttelse etter sprøyting"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:143
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:144
 msgid "Leaf life time (days)"
 msgstr "Levetid for blad (dager)"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:351
-msgid "The model is running, please wait"
-msgstr "Modellen kjører, vennligst vent"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
-msgid "Leaf wetness, hourly"
-msgstr "Bladfukt, timesverdi"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
-msgid "Rain, hourly"
-msgstr "Regn, timeverdi"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
-msgid "Relative humidity, hourly mean"
-msgstr "Relativ luftfuktighet, timesgjennomsnitt"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
-msgid "Humid hour (yes/no)"
-msgstr "Fuktig time (ja/nei)"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
-msgid "Humid period hour"
-msgstr "Time nr i fuktig periode"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
-msgid "Humid hour sum"
-msgstr "Sum fuktige timer"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
-msgid "Humid period hour outside protection period"
-msgstr "Time nr x i fuktig periode utenfor sprøyteperiode"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:430
-msgid "Hours"
-msgstr "Timer"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
-msgid "Threshold humid period"
-msgstr "Terskelverdier for fuktig time"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:436
-msgid "Spraying protection period"
-msgstr "Beskyttelse etter sprøyting"
-
 #: templates/cerealblotchmodels/wheatleafblotchform.html:25
 #: templates/cerealblotchmodels/wheatleafblotchform.html:34
 msgid "Wheat leaf blotch"
 msgstr "Bladflekksjukdommer i hvete"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:43
+#: templates/cerealblotchmodels/wheatleafblotchform.html:39
 msgid "Background data for the wheat leaf blotch model"
 msgstr "Bakgrunnsdata for bladflekksjukdomsmodellen"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:50
-msgid "Growth stage"
-msgstr "Vekststadium"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:66
+#: templates/cerealblotchmodels/wheatleafblotchform.html:62
 msgid "Wheat variety"
 msgstr "Hvetesort"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:73
+#: templates/cerealblotchmodels/wheatleafblotchform.html:69
 msgid "Previous crop was wheat"
 msgstr "Fjorårets vekst var hvete"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:96
+#: templates/cerealblotchmodels/wheatleafblotchform.html:92
 msgid "Spraying"
 msgstr "Sprøytinger"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:103
+#: templates/cerealblotchmodels/wheatleafblotchform.html:99
 msgid "Preparation 1"
 msgstr "Plantevernmiddel 1"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:114
+#: templates/cerealblotchmodels/wheatleafblotchform.html:110
 msgid "Preparation 2"
 msgstr "Plantevernmiddel 2"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:125
+#: templates/cerealblotchmodels/wheatleafblotchform.html:121
 msgid "Preparation 3"
 msgstr "Plantevernmiddel 3"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:201
+#: templates/cerealblotchmodels/wheatleafblotchform.html:197
 msgid "Missing spraying information on second preparation"
 msgstr "Sprøyteinformasjon mangler"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:212
+#: templates/cerealblotchmodels/wheatleafblotchform.html:208
 msgid "Too early to calculate risk"
 msgstr "For tidlig å beregne risiko"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:336
+#: templates/cerealblotchmodels/wheatleafblotchform.html:332
 msgid "Wheat leaf blotch development"
 msgstr "Utvikling av bladflekksjukdom i hvete"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:449
-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."
-

cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-12 15:06+0200\n"
+"POT-Creation-Date: 2020-03-24 15:33+0100\n"
 "PO-Revision-Date: 2016-10-07 11:05+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,6 +18,155 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.7\n"
 
+#: templates/cerealblotchmodels/PPOmodelform.html:25
+#: templates/cerealblotchmodels/PPOmodelform.html:336
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:443
+msgid "Septoria humidity model"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:28
+msgid "Plant Protection Online Model"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:32
+msgid "Input data"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:35
+msgid "Results"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:41
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
+msgid "Country"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:43
+#: templates/cerealblotchmodels/PPOmodelform.html:50
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
+msgid "Please select"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:48
+#: templates/cerealblotchmodels/barleynetblotchform.html:49
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
+#: templates/cerealblotchmodels/wheatleafblotchform.html:51
+msgid "Weather station"
+msgstr "气象站"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:56
+#: templates/cerealblotchmodels/wheatleafblotchform.html:46
+msgid "Growth stage"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:61
+msgid "Susceptibility"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:68
+msgid "Severity"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:80
+#: templates/cerealblotchmodels/barleynetblotchform.html:108
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: templates/cerealblotchmodels/wheatleafblotchform.html:136
+msgid "Run model"
+msgstr "运行模型"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:122
+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 Mozilla Firefox, "
+"Microsoft Edge or Google Chrome."
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:224
+#: templates/cerealblotchmodels/barleynetblotchform.html:281
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:312
+#: templates/cerealblotchmodels/wheatleafblotchform.html:344
+msgid "Select weather station"
+msgstr "选择气象站"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:248
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:355
+#, fuzzy
+#| msgid "Model is running, please wait"
+msgid "The model is running, please wait"
+msgstr "模型在运行，请等候"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:267
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
+msgid "Leaf wetness, hourly"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:268
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
+#, fuzzy
+#| msgid "Rain, daily"
+msgid "Rain, hourly"
+msgstr "日降雨"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:269
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
+msgid "Relative humidity, hourly mean"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:270
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:377
+msgid "Humid hour (yes/no)"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:271
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:378
+msgid "Humid period hour"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:272
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+msgid "Humid hour sum"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:273
+#: templates/cerealblotchmodels/PPOmodelform.html:331
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:438
+msgid "Humid period hour outside protection period"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:280
+#: templates/cerealblotchmodels/barleynetblotchform.html:206
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:387
+#: templates/cerealblotchmodels/wheatleafblotchform.html:265
+msgid "Time"
+msgstr "时间"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:287
+#: templates/cerealblotchmodels/barleynetblotchform.html:214
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:394
+#: templates/cerealblotchmodels/wheatleafblotchform.html:275
+msgid "Warning status"
+msgstr "预警信息"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:327
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
+msgid "Hours"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:332
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
+msgid "Threshold humid period"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:333
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+msgid "Spraying protection period"
+msgstr ""
+
 #: templates/cerealblotchmodels/barleynetblotchform.html:25
 #: templates/cerealblotchmodels/barleynetblotchform.html:34
 msgid "Barley net blotch"
@@ -27,14 +176,8 @@ msgstr "大麦网斑病"
 msgid "Background data for the barley net blotch model"
 msgstr "大麦网斑病模型的背景数据"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:49
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
-#: templates/cerealblotchmodels/wheatleafblotchform.html:55
-msgid "Weather station"
-msgstr "气象站"
-
 #: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:61
+#: templates/cerealblotchmodels/wheatleafblotchform.html:57
 msgid "Sowing date"
 msgstr "播种日期"
 
@@ -47,22 +190,22 @@ msgid "Same crop as last season"
 msgstr "与上季同样的作物"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
+#: templates/cerealblotchmodels/wheatleafblotchform.html:74
 msgid "Plowed"
 msgstr "犁过的"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:82
+#: templates/cerealblotchmodels/wheatleafblotchform.html:78
 msgid "Observation date"
 msgstr "观测日期"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:87
+#: templates/cerealblotchmodels/wheatleafblotchform.html:83
 msgid "% Infected leaves"
 msgstr "% 感染水平"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:98
+#: templates/cerealblotchmodels/wheatleafblotchform.html:94
 msgid "Spraying date"
 msgstr "喷药日期"
 
@@ -71,40 +214,34 @@ msgid "Preparation"
 msgstr "准备"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:109
-#: templates/cerealblotchmodels/wheatleafblotchform.html:120
-#: templates/cerealblotchmodels/wheatleafblotchform.html:131
+#: templates/cerealblotchmodels/wheatleafblotchform.html:105
+#: templates/cerealblotchmodels/wheatleafblotchform.html:116
+#: templates/cerealblotchmodels/wheatleafblotchform.html:127
 msgid "Preparation dose"
 msgstr "准备剂量"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:108
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:140
-msgid "Run model"
-msgstr "运行模型"
-
 #: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:147
+#: templates/cerealblotchmodels/wheatleafblotchform.html:143
 msgid "Model is running, please wait"
 msgstr "模型在运行，请等候"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:158
+#: templates/cerealblotchmodels/wheatleafblotchform.html:154
 msgid "Scroll past chart by swiping the dotted line on the right"
 msgstr "点击右边点状线看上一幅图"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:184
+#: templates/cerealblotchmodels/wheatleafblotchform.html:180
 msgid "Missing observation information"
 msgstr "遗失的观测信息"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:193
+#: templates/cerealblotchmodels/wheatleafblotchform.html:189
 msgid "Missing spraying information"
 msgstr "遗失的喷药信息"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:260
+#: templates/cerealblotchmodels/wheatleafblotchform.html:256
 msgid "Temperature, daily mean"
 msgstr "日均温"
 
@@ -121,85 +258,62 @@ msgid "Day degrees since sowing"
 msgstr "从撒种开始日温度"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:198
-#: templates/cerealblotchmodels/barleynetblotchform.html:263
-#: templates/cerealblotchmodels/wheatleafblotchform.html:261
-#: templates/cerealblotchmodels/wheatleafblotchform.html:332
+#: templates/cerealblotchmodels/barleynetblotchform.html:265
+#: templates/cerealblotchmodels/wheatleafblotchform.html:257
+#: templates/cerealblotchmodels/wheatleafblotchform.html:328
 msgid "Threshold"
 msgstr "阈值"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:199
-#: templates/cerealblotchmodels/barleynetblotchform.html:264
-#: templates/cerealblotchmodels/wheatleafblotchform.html:262
-#: templates/cerealblotchmodels/wheatleafblotchform.html:333
+#: templates/cerealblotchmodels/barleynetblotchform.html:266
+#: templates/cerealblotchmodels/wheatleafblotchform.html:258
+#: templates/cerealblotchmodels/wheatleafblotchform.html:329
 msgid "Disease"
 msgstr "疾病"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
-#: templates/cerealblotchmodels/wheatleafblotchform.html:269
-msgid "Time"
-msgstr "时间"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:390
-#: templates/cerealblotchmodels/wheatleafblotchform.html:279
-msgid "Warning status"
-msgstr "预警信息"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:247
-#: templates/cerealblotchmodels/wheatleafblotchform.html:316
+#: templates/cerealblotchmodels/barleynetblotchform.html:249
+#: templates/cerealblotchmodels/wheatleafblotchform.html:312
 msgid "No data returned"
 msgstr "无数据返回"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:260
-#: templates/cerealblotchmodels/wheatleafblotchform.html:329
+#: templates/cerealblotchmodels/barleynetblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:325
 msgid "Disease value"
 msgstr "疾病值"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:267
+#: templates/cerealblotchmodels/barleynetblotchform.html:269
 msgid "Barley net blotch development"
 msgstr "大麦网斑病发展"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:279
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:308
-#: templates/cerealblotchmodels/wheatleafblotchform.html:348
-msgid "Select weather station"
-msgstr "选择气象站"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:305
-#: templates/cerealblotchmodels/wheatleafblotchform.html:377
+#: templates/cerealblotchmodels/barleynetblotchform.html:307
+#: templates/cerealblotchmodels/wheatleafblotchform.html:373
 msgid "Select crop"
 msgstr "选择作物"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:333
-#: templates/cerealblotchmodels/wheatleafblotchform.html:417
+#: templates/cerealblotchmodels/barleynetblotchform.html:335
+#: templates/cerealblotchmodels/wheatleafblotchform.html:413
 msgid "Select preparation"
 msgstr "选择准备"
 
+#: templates/cerealblotchmodels/barleynetblotchform.html:364
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:207
+#: templates/cerealblotchmodels/wheatleafblotchform.html:445
+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 ""
+
 #: templates/cerealblotchmodels/index.html:25
 #: templates/cerealblotchmodels/index.html:27
 msgid "Cereal blotch models"
 msgstr "谷物斑点病模型"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
-msgid "Septoria humidity model"
-msgstr ""
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:32
 msgid "Background data"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
-msgid "Country"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
-msgid "Please select"
-msgstr ""
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:53
 #, fuzzy
 #| msgid "Spraying date"
@@ -237,168 +351,111 @@ msgstr ""
 msgid "All kernels fully developed (gs 75)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:100
-msgid "Threshold values for 'humid hour'"
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+msgid "Show advanced settings"
 msgstr ""
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+msgid "Threshold values for humid hour"
+msgstr ""
+
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:104
 msgid "Relative humidity"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:107
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:109
 msgid "Leaf wetness (min/hour)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:112
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:114
 #, fuzzy
 #| msgid "Preparation"
 msgid "Precipitation"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:117
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:119
 msgid "Sliding hours past (hours)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:122
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:124
 msgid "Sliding hours ahead (hours)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:131
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:132
 msgid "Other threshold values"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:133
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:134
 msgid "Number of consecutive 'humid hours'"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:138
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:139
 msgid "Spraying protection days"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:143
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:144
 msgid "Leaf life time (days)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:351
-#, fuzzy
-#| msgid "Model is running, please wait"
-msgid "The model is running, please wait"
-msgstr "模型在运行，请等候"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
-msgid "Leaf wetness, hourly"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
-#, fuzzy
-#| msgid "Rain, daily"
-msgid "Rain, hourly"
-msgstr "日降雨"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
-msgid "Relative humidity, hourly mean"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
-msgid "Humid hour (yes/no)"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
-msgid "Humid period hour"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
-msgid "Humid hour sum"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
-msgid "Humid period hour outside protection period"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:430
-msgid "Hours"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
-msgid "Threshold humid period"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:436
-msgid "Spraying protection period"
-msgstr ""
-
 #: templates/cerealblotchmodels/wheatleafblotchform.html:25
 #: templates/cerealblotchmodels/wheatleafblotchform.html:34
 msgid "Wheat leaf blotch"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:43
+#: templates/cerealblotchmodels/wheatleafblotchform.html:39
 #, fuzzy
 #| msgid "Background data for the barley net blotch model"
 msgid "Background data for the wheat leaf blotch model"
 msgstr "大麦网斑病模型的背景数据"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:50
-msgid "Growth stage"
-msgstr ""
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:66
+#: templates/cerealblotchmodels/wheatleafblotchform.html:62
 msgid "Wheat variety"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:73
+#: templates/cerealblotchmodels/wheatleafblotchform.html:69
 msgid "Previous crop was wheat"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:96
+#: templates/cerealblotchmodels/wheatleafblotchform.html:92
 #, fuzzy
 #| msgid "Spraying date"
 msgid "Spraying"
 msgstr "喷药日期"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:103
+#: templates/cerealblotchmodels/wheatleafblotchform.html:99
 #, fuzzy
 #| msgid "Preparation"
 msgid "Preparation 1"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:114
+#: templates/cerealblotchmodels/wheatleafblotchform.html:110
 #, fuzzy
 #| msgid "Preparation"
 msgid "Preparation 2"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:125
+#: templates/cerealblotchmodels/wheatleafblotchform.html:121
 #, fuzzy
 #| msgid "Preparation"
 msgid "Preparation 3"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:201
+#: templates/cerealblotchmodels/wheatleafblotchform.html:197
 #, fuzzy
 #| msgid "Missing spraying information"
 msgid "Missing spraying information on second preparation"
 msgstr "遗失的喷药信息"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:212
+#: templates/cerealblotchmodels/wheatleafblotchform.html:208
 msgid "Too early to calculate risk"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:336
+#: templates/cerealblotchmodels/wheatleafblotchform.html:332
 #, fuzzy
 #| msgid "Barley net blotch development"
 msgid "Wheat leaf blotch development"
 msgstr "大麦网斑病发展"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:449
-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 ""
-
 #, fuzzy
 #~| msgid "Weather station"
 #~ msgid "WeatherStation"

cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-12 15:06+0200\n"
+"POT-Creation-Date: 2020-03-24 15:33+0100\n"
 "PO-Revision-Date: 2016-10-07 11:05+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,6 +18,155 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.7\n"
 
+#: templates/cerealblotchmodels/PPOmodelform.html:25
+#: templates/cerealblotchmodels/PPOmodelform.html:336
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:443
+msgid "Septoria humidity model"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:28
+msgid "Plant Protection Online Model"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:32
+msgid "Input data"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:35
+msgid "Results"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:41
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
+msgid "Country"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:43
+#: templates/cerealblotchmodels/PPOmodelform.html:50
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
+msgid "Please select"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:48
+#: templates/cerealblotchmodels/barleynetblotchform.html:49
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
+#: templates/cerealblotchmodels/wheatleafblotchform.html:51
+msgid "Weather station"
+msgstr "气象站"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:56
+#: templates/cerealblotchmodels/wheatleafblotchform.html:46
+msgid "Growth stage"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:61
+msgid "Susceptibility"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:68
+msgid "Severity"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:80
+#: templates/cerealblotchmodels/barleynetblotchform.html:108
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:153
+#: templates/cerealblotchmodels/wheatleafblotchform.html:136
+msgid "Run model"
+msgstr "运行模型"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:122
+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 Mozilla Firefox, "
+"Microsoft Edge or Google Chrome."
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:224
+#: templates/cerealblotchmodels/barleynetblotchform.html:281
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:312
+#: templates/cerealblotchmodels/wheatleafblotchform.html:344
+msgid "Select weather station"
+msgstr "选择气象站"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:248
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:355
+#, fuzzy
+#| msgid "Model is running, please wait"
+msgid "The model is running, please wait"
+msgstr "模型在运行，请等候"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:267
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
+msgid "Leaf wetness, hourly"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:268
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
+#, fuzzy
+#| msgid "Rain, daily"
+msgid "Rain, hourly"
+msgstr "日降雨"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:269
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
+msgid "Relative humidity, hourly mean"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:270
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:377
+msgid "Humid hour (yes/no)"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:271
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:378
+msgid "Humid period hour"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:272
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:379
+msgid "Humid hour sum"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:273
+#: templates/cerealblotchmodels/PPOmodelform.html:331
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:380
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:438
+msgid "Humid period hour outside protection period"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:280
+#: templates/cerealblotchmodels/barleynetblotchform.html:206
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:387
+#: templates/cerealblotchmodels/wheatleafblotchform.html:265
+msgid "Time"
+msgstr "时间"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:287
+#: templates/cerealblotchmodels/barleynetblotchform.html:214
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:394
+#: templates/cerealblotchmodels/wheatleafblotchform.html:275
+msgid "Warning status"
+msgstr "预警信息"
+
+#: templates/cerealblotchmodels/PPOmodelform.html:327
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
+msgid "Hours"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:332
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
+msgid "Threshold humid period"
+msgstr ""
+
+#: templates/cerealblotchmodels/PPOmodelform.html:333
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:440
+msgid "Spraying protection period"
+msgstr ""
+
 #: templates/cerealblotchmodels/barleynetblotchform.html:25
 #: templates/cerealblotchmodels/barleynetblotchform.html:34
 msgid "Barley net blotch"
@@ -27,14 +176,8 @@ msgstr "大麦网斑病"
 msgid "Background data for the barley net blotch model"
 msgstr "大麦网斑病模型的背景数据"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:49
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
-#: templates/cerealblotchmodels/wheatleafblotchform.html:55
-msgid "Weather station"
-msgstr "气象站"
-
 #: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:61
+#: templates/cerealblotchmodels/wheatleafblotchform.html:57
 msgid "Sowing date"
 msgstr "播种日期"
 
@@ -47,22 +190,22 @@ msgid "Same crop as last season"
 msgstr "与上季同样的作物"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
+#: templates/cerealblotchmodels/wheatleafblotchform.html:74
 msgid "Plowed"
 msgstr "犁过的"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:82
+#: templates/cerealblotchmodels/wheatleafblotchform.html:78
 msgid "Observation date"
 msgstr "观测日期"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:87
+#: templates/cerealblotchmodels/wheatleafblotchform.html:83
 msgid "% Infected leaves"
 msgstr "% 感染水平"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:98
+#: templates/cerealblotchmodels/wheatleafblotchform.html:94
 msgid "Spraying date"
 msgstr "喷药日期"
 
@@ -71,40 +214,34 @@ msgid "Preparation"
 msgstr "准备"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:109
-#: templates/cerealblotchmodels/wheatleafblotchform.html:120
-#: templates/cerealblotchmodels/wheatleafblotchform.html:131
+#: templates/cerealblotchmodels/wheatleafblotchform.html:105
+#: templates/cerealblotchmodels/wheatleafblotchform.html:116
+#: templates/cerealblotchmodels/wheatleafblotchform.html:127
 msgid "Preparation dose"
 msgstr "准备剂量"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:108
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:140
-msgid "Run model"
-msgstr "运行模型"
-
 #: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:147
+#: templates/cerealblotchmodels/wheatleafblotchform.html:143
 msgid "Model is running, please wait"
 msgstr "模型在运行，请等候"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:158
+#: templates/cerealblotchmodels/wheatleafblotchform.html:154
 msgid "Scroll past chart by swiping the dotted line on the right"
 msgstr "点击右边点状线看上一幅图"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:184
+#: templates/cerealblotchmodels/wheatleafblotchform.html:180
 msgid "Missing observation information"
 msgstr "遗失的观测信息"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:193
+#: templates/cerealblotchmodels/wheatleafblotchform.html:189
 msgid "Missing spraying information"
 msgstr "遗失的喷药信息"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:260
+#: templates/cerealblotchmodels/wheatleafblotchform.html:256
 msgid "Temperature, daily mean"
 msgstr "日均温"
 
@@ -121,85 +258,62 @@ msgid "Day degrees since sowing"
 msgstr "从撒种开始日温度"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:198
-#: templates/cerealblotchmodels/barleynetblotchform.html:263
-#: templates/cerealblotchmodels/wheatleafblotchform.html:261
-#: templates/cerealblotchmodels/wheatleafblotchform.html:332
+#: templates/cerealblotchmodels/barleynetblotchform.html:265
+#: templates/cerealblotchmodels/wheatleafblotchform.html:257
+#: templates/cerealblotchmodels/wheatleafblotchform.html:328
 msgid "Threshold"
 msgstr "阈值"
 
 #: templates/cerealblotchmodels/barleynetblotchform.html:199
-#: templates/cerealblotchmodels/barleynetblotchform.html:264
-#: templates/cerealblotchmodels/wheatleafblotchform.html:262
-#: templates/cerealblotchmodels/wheatleafblotchform.html:333
+#: templates/cerealblotchmodels/barleynetblotchform.html:266
+#: templates/cerealblotchmodels/wheatleafblotchform.html:258
+#: templates/cerealblotchmodels/wheatleafblotchform.html:329
 msgid "Disease"
 msgstr "疾病"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
-#: templates/cerealblotchmodels/wheatleafblotchform.html:269
-msgid "Time"
-msgstr "时间"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:390
-#: templates/cerealblotchmodels/wheatleafblotchform.html:279
-msgid "Warning status"
-msgstr "预警信息"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:247
-#: templates/cerealblotchmodels/wheatleafblotchform.html:316
+#: templates/cerealblotchmodels/barleynetblotchform.html:249
+#: templates/cerealblotchmodels/wheatleafblotchform.html:312
 msgid "No data returned"
 msgstr "无数据返回"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:260
-#: templates/cerealblotchmodels/wheatleafblotchform.html:329
+#: templates/cerealblotchmodels/barleynetblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:325
 msgid "Disease value"
 msgstr "疾病值"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:267
+#: templates/cerealblotchmodels/barleynetblotchform.html:269
 msgid "Barley net blotch development"
 msgstr "大麦网斑病发展"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:279
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:308
-#: templates/cerealblotchmodels/wheatleafblotchform.html:348
-msgid "Select weather station"
-msgstr "选择气象站"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:305
-#: templates/cerealblotchmodels/wheatleafblotchform.html:377
+#: templates/cerealblotchmodels/barleynetblotchform.html:307
+#: templates/cerealblotchmodels/wheatleafblotchform.html:373
 msgid "Select crop"
 msgstr "选择作物"
 
-#: templates/cerealblotchmodels/barleynetblotchform.html:333
-#: templates/cerealblotchmodels/wheatleafblotchform.html:417
+#: templates/cerealblotchmodels/barleynetblotchform.html:335
+#: templates/cerealblotchmodels/wheatleafblotchform.html:413
 msgid "Select preparation"
 msgstr "选择准备"
 
+#: templates/cerealblotchmodels/barleynetblotchform.html:364
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:207
+#: templates/cerealblotchmodels/wheatleafblotchform.html:445
+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 ""
+
 #: templates/cerealblotchmodels/index.html:25
 #: templates/cerealblotchmodels/index.html:27
 msgid "Cereal blotch models"
 msgstr "谷物斑点病模型"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
-msgid "Septoria humidity model"
-msgstr ""
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:32
 msgid "Background data"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:38
-msgid "Country"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:40
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:47
-msgid "Please select"
-msgstr ""
-
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:53
 #, fuzzy
 #| msgid "Spraying date"
@@ -237,168 +351,111 @@ msgstr ""
 msgid "All kernels fully developed (gs 75)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:100
-msgid "Threshold values for 'humid hour'"
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:97
+msgid "Show advanced settings"
 msgstr ""
 
 #: templates/cerealblotchmodels/septoriahumiditymodelform.html:102
+msgid "Threshold values for humid hour"
+msgstr ""
+
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:104
 msgid "Relative humidity"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:107
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:109
 msgid "Leaf wetness (min/hour)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:112
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:114
 #, fuzzy
 #| msgid "Preparation"
 msgid "Precipitation"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:117
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:119
 msgid "Sliding hours past (hours)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:122
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:124
 msgid "Sliding hours ahead (hours)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:131
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:132
 msgid "Other threshold values"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:133
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:134
 msgid "Number of consecutive 'humid hours'"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:138
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:139
 msgid "Spraying protection days"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:143
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:144
 msgid "Leaf life time (days)"
 msgstr ""
 
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:351
-#, fuzzy
-#| msgid "Model is running, please wait"
-msgid "The model is running, please wait"
-msgstr "模型在运行，请等候"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
-msgid "Leaf wetness, hourly"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
-#, fuzzy
-#| msgid "Rain, daily"
-msgid "Rain, hourly"
-msgstr "日降雨"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
-msgid "Relative humidity, hourly mean"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
-msgid "Humid hour (yes/no)"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
-msgid "Humid period hour"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
-msgid "Humid hour sum"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
-msgid "Humid period hour outside protection period"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:430
-msgid "Hours"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
-msgid "Threshold humid period"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:436
-msgid "Spraying protection period"
-msgstr ""
-
 #: templates/cerealblotchmodels/wheatleafblotchform.html:25
 #: templates/cerealblotchmodels/wheatleafblotchform.html:34
 msgid "Wheat leaf blotch"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:43
+#: templates/cerealblotchmodels/wheatleafblotchform.html:39
 #, fuzzy
 #| msgid "Background data for the barley net blotch model"
 msgid "Background data for the wheat leaf blotch model"
 msgstr "大麦网斑病模型的背景数据"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:50
-msgid "Growth stage"
-msgstr ""
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:66
+#: templates/cerealblotchmodels/wheatleafblotchform.html:62
 msgid "Wheat variety"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:73
+#: templates/cerealblotchmodels/wheatleafblotchform.html:69
 msgid "Previous crop was wheat"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:96
+#: templates/cerealblotchmodels/wheatleafblotchform.html:92
 #, fuzzy
 #| msgid "Spraying date"
 msgid "Spraying"
 msgstr "喷药日期"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:103
+#: templates/cerealblotchmodels/wheatleafblotchform.html:99
 #, fuzzy
 #| msgid "Preparation"
 msgid "Preparation 1"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:114
+#: templates/cerealblotchmodels/wheatleafblotchform.html:110
 #, fuzzy
 #| msgid "Preparation"
 msgid "Preparation 2"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:125
+#: templates/cerealblotchmodels/wheatleafblotchform.html:121
 #, fuzzy
 #| msgid "Preparation"
 msgid "Preparation 3"
 msgstr "准备"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:201
+#: templates/cerealblotchmodels/wheatleafblotchform.html:197
 #, fuzzy
 #| msgid "Missing spraying information"
 msgid "Missing spraying information on second preparation"
 msgstr "遗失的喷药信息"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:212
+#: templates/cerealblotchmodels/wheatleafblotchform.html:208
 msgid "Too early to calculate risk"
 msgstr ""
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:336
+#: templates/cerealblotchmodels/wheatleafblotchform.html:332
 #, fuzzy
 #| msgid "Barley net blotch development"
 msgid "Wheat leaf blotch development"
 msgstr "大麦网斑病发展"
 
-#: templates/cerealblotchmodels/wheatleafblotchform.html:449
-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 ""
-
 #, fuzzy
 #~| msgid "Weather station"
 #~ msgid "WeatherStation"

cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html

@@ -94,10 +94,12 @@
 					<span class="help-block" id="{{ form_id }}_dateGs75_validation"></span>
 				</div>
 			</fieldset>
+			{% trans "Show advanced settings" %} <input type="checkbox" onclick="toggleAdvancedColumns(this);" autocomplete="off"/>
 		</div>
 		<div class="col-md-3">
-			<fieldset>
-				<legend>{% trans "Threshold values for 'humid hour'" %}</legend>
+			
+			<fieldset id="septoriaHumidityAdvancedColumn1" style="visibility: hidden">
+				<legend>{% trans "Threshold values for humid hour" %}</legend>
 				<div class="form-group">
 					<label for="thresholdRelativeHumidity">{% trans "Relative humidity" %} (%)</label>
 					<input type="number" name="thresholdRelativeHumidity" class="form-control" value="85"/>
@@ -126,8 +128,7 @@
 			</fieldset>
 		</div>
 		<div class="col-md-3">
-			
-			<fieldset>
+			<fieldset id="septoriaHumidityAdvancedColumn2" style="visibility: hidden">
 				<legend>{% trans "Other threshold values" %}</legend>
 				<div class="form-group">
 					<label for="thresholdHumidPeriodHours">{% trans "Number of consecutive 'humid hours'" %}</label>
@@ -487,5 +488,12 @@
 		}
 		storeLocalSettings(settingsDict);
 	};
+	
+	var toggleAdvancedColumns = function(theCheckBox){
+		var col1 = document.getElementById("septoriaHumidityAdvancedColumn1");
+		var col2 = document.getElementById("septoriaHumidityAdvancedColumn2");
+		col1.style.visibility = theCheckBox.checked ? "visible" : "hidden";
+		col2.style.visibility = theCheckBox.checked ? "visible" : "hidden";
+	};
 </script>
 {% endblock %}
\ No newline at end of file