From b2d4332fa19ca2072b4cace81ca2090c3f1c1582 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 24 Mar 2020 15:38:07 +0100
Subject: [PATCH] Norwegian translation updates and opt-in to view advanced
settings in septoria humidity model form
---
.../locale/nb/LC_MESSAGES/django.mo | Bin 5868 -> 6803 bytes
.../locale/nb/LC_MESSAGES/django.po | 400 ++++++++++--------
.../septoriahumiditymodelform.html | 16 +-
3 files changed, 244 insertions(+), 172 deletions(-)
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo
index 5e3c4101e5cb4d4eabc3675667a3e6c2695acc40..2e8387fc6f89a59aacdd355998d1e3f1fee0d400 100755
GIT binary patch
delta 2587
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
J<}%STMgUrKbqD|e
delta 2204
zcmbPi`bM|@o)F7a1_lNOe+C8y83qQ1DNGCu*$fN}Jggv528JDM3=E<S3=BKj7#PGD
z7#Pk&>1S*V49W})41d`e82A|&7!=tV81xw!7!09wB0B?vAOi!#M0N%SSq27%#q10W
zA`A=+2iX}I*cliYuCX&PurM&xGu&fmV31&7V0a9b_`}Y?z{|kEz{0`6z{9}6AjAQ&
zK%Rqv0puoq4h9Bc1_lOG4h9B31_lOC4v0k&91INF3=9le91sUj<6vMAXJBAh!vV4Q
z2nPd$JOcy6O%8}he{wJ|7%|i{Fo<zNT<FQkz#zcDz>v-f@mU3wKZg_I^R=7|44e!M
z3`aO24m`)nz`(}9z;Fl3f6U3iz|FwG@Da-Y3#GZaAnGN#Am*!cK^$hm#lRp~&%nSC
zzy;Bm#0Bwj9!P?LfuWj<fkBRefuWZRV(}U-NJwqtVqmZYMFmtJCpQCw5Ca2)C^y8R
z8r%>I?70~jq!}0(!nqk3q!<_&in$^7^l>vVa4;}1%;IKXsOJL34L8Jv>$o8n?15^y
z$_=sj1JuA@+zbqgpeW&ih@0?0EVSc+h==lk<CLMC2V!vz4<ssP@GvlZWME)e#{-G7
z1-y_bUC+x<4^AZec_C47kr(2S_q+@YPK*o;e|aHs=fDr~K`1}OX9fHW3~CGv3?2Ls
z_3QZ=7}OaU820i*(!f)wxS#+;pFEVd5`Z``Q~(lnQ3CZ4A16WusstcW&<Lgb1RyS+
zEdWV;s{|kp+8_W)bVmgs`mYOs5)%W%2Pj`z5E9omf)Mq-f{?_QBnSzaCMZ3xUXX!7
zfq{Wx7gXVGK?Vj@1_p)?Py@t-AO@%lK`gWpf;h-e2;zfSAxL&g5rSBlBLqncwNQEj
zlwK?Z@%c6(NQmqfg5;w5YeEnozY>DP$#)@0oUsctFlaC^Fvto+<lTfJK_4v4z+lh7
zz>qBrNldGSA?mjaLmYTk7-H~!VMyZrEDVWSArXi}4MZU3S%`o=QqSND6$lYwV9;b>
zU`P~!<j-!X_zDq-0b4~NA$1ul{zU|00i!5{RuE-iU}j)ouos2scNT>>EJ2ikfuE6q
zp-dEFahn)~o-786ih2fy1!9mO-y;S|)sMs&7#JBC7~CNRAh^%~IZTUzfkBA@Vu>D9
z4n~1WKr1K*lrTZr3sgvfau=vD1C@kOX)tBV04ZY}LHXYTECdN&GX_ZB2IW_fuqy)t
zg9)fu1r^B*3=BF93=AF&kkk&62Nk&>8kA-X7#J9I86Y_TR4_S!qK^TRaIF~_7$g}O
z7<?HR82mt4m;n-MAp04-Kqf%Te-P7{fq}t>fq}se#9?4yuw{V69Sf+OXMm&&P+b6$
z_GEx0JR=YXikYA^i~<$YZcvU7D2f;$iJFsv!HGeI0Td6A3J9tOTpz&Lpxj~307+~h
zF((EF1{Vef25(S_$H2hgyt$P9A>-ymPAkUAJGt&op2xj<awgBB$x^%pJn9*xxtS>n
z8Tq9}>YJzVYBNqg#9zQ4;OOk_=<ccz<{A|2>F+n$NI<JT($z6Y*VkXy#Zke--^$lh
zJIdeBmCGlwxI{OkC^4@%C$S{I$V$O2)W=7`&(YUa!N%3s(bLDl(ZwamH8|Lg%O^1}
zy)-dBRW~FxG1p4L$I;I{6l95wkB>u6re1zgIzo+=0++9+ud8lYYEf}!ex8+r;p7bh
zWs@BQ#UlMui%S#^?<h+xDlSP?NXkh}QP3zWRxmc!WH8pllrT2ZWN^&MNma<sN-fGu
zEmBA;&B-ZIC@v`~&CX6OQ7A0|Yd1I5oV--<Eniq_c5z8@Nn%Q7s)DiM<ds5IoArbx
z83jX2$}+QaGV{`l!IGu9ldDC3POcZ7X&;<gP?BGinW&Ifnq88cpOTuB!{DBinUb29
zlB!T#nyaIbR+O5XUzS>=piz>Un_8raB0YJYm@}JWUP)q3&g9o(jy%ByMTd7(mSpCo
erxs227f)kV0BM>$TU-jl+I&^qgK@I1R2l%8&>|E7
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
index 22a84333..2ca8ca7c 100755
--- a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
+++ b/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-24 15:34+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 "% Infected leaves"
msgstr "% 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,19 +329,19 @@ 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)"
@@ -231,147 +349,93 @@ msgstr "Øvre blad (vs 37-39)"
#: 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."
-
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
index 5c7f34ea..47731093 100644
--- a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
+++ b/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
--
GitLab