diff --git a/roughage/locale/nb/LC_MESSAGES/django.mo b/roughage/locale/nb/LC_MESSAGES/django.mo index 32924f17be89df7eeec90dcbededabb3c5ae037b..a7c227016ca0b5a9916be40884d742d6a7997737 100755 Binary files a/roughage/locale/nb/LC_MESSAGES/django.mo and b/roughage/locale/nb/LC_MESSAGES/django.mo differ diff --git a/roughage/locale/nb/LC_MESSAGES/django.po b/roughage/locale/nb/LC_MESSAGES/django.po index 37293b6264d300e42d4da17c928c69c9f5b3364c..782d1642a4921de588c633c3d14e47762c824488 100755 --- a/roughage/locale/nb/LC_MESSAGES/django.po +++ b/roughage/locale/nb/LC_MESSAGES/django.po @@ -7,25 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD -"POT-Creation-Date: 2020-09-17 12:45+0200\n" -"PO-Revision-Date: 2020-09-17 12:46+0200\n" -======= -"POT-Creation-Date: 2020-09-30 10:36+0200\n" -"PO-Revision-Date: 2020-06-09 13:01+0200\n" ->>>>>>> epleviklerNewFeatures -"Last-Translator: \n" -"Language-Team: \n" -"Language: nb\n" -"MIME-Version: 1.0\n" +"POT-Creation-Date: 2023-03-17 10:04+0100\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -<<<<<<< HEAD -"X-Generator: Poedit 2.3\n" -======= -"X-Generator: Poedit 2.0.6\n" ->>>>>>> epleviklerNewFeatures #: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27 #: templates/roughage/nutrition_calibration.html:23 @@ -41,82 +24,86 @@ msgid "Clover share" msgstr "Kløverandel" #: templates/roughage/nutrition.html:92 +msgid "Date of growth start calculation" +msgstr "Dato for beregning av vekststart" + +#: templates/roughage/nutrition.html:97 msgid "First harvest date" msgstr "Dato førsteslått" -#: templates/roughage/nutrition.html:97 +#: templates/roughage/nutrition.html:102 msgid "Second harvest date" msgstr "Dato andreslått" -#: templates/roughage/nutrition.html:119 +#: templates/roughage/nutrition.html:124 msgid "Use weather scenarios" msgstr "Bruk værscenarier" -#: templates/roughage/nutrition.html:122 +#: templates/roughage/nutrition.html:127 msgid "Mean daily temperature" msgstr "Middeltemperatur pr. døgn" -#: templates/roughage/nutrition.html:131 +#: templates/roughage/nutrition.html:136 msgid "Daily precipitation" msgstr "Nedbør pr. døgn" -#: templates/roughage/nutrition.html:140 +#: templates/roughage/nutrition.html:145 msgid "Daily global radiation" msgstr "Globalstråling pr. døgn" -#: templates/roughage/nutrition.html:154 +#: templates/roughage/nutrition.html:159 msgid "Add artificial watering" msgstr "Legg til vanning" -#: templates/roughage/nutrition.html:164 +#: templates/roughage/nutrition.html:169 msgid "Delete matrix contents" msgstr "Tøm matrise for kalibreringsverdier" -#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274 +#: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284 msgid "Time of day" msgstr "Klokkeslett" -#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286 +#: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296 msgid "Harvest width" msgstr "Slåttebredde" -#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293 +#: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303 msgid "Estimated harvest" msgstr "Estimert avling" -#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302 +#: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312 msgid "Conditioning" msgstr "Kondisjonering" -#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304 +#: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314 msgid "Weak" msgstr "Svak" -#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305 +#: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315 msgid "Strong" msgstr "Sterk" -#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306 +#: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316 msgid "Crushed" msgstr "Knust" -#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313 +#: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323 msgid "String width" msgstr "Strengbredde" -#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320 +#: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330 msgid "Estimated dry matter fraction" msgstr "Anslått tørrstoffprosent" -#: templates/roughage/nutrition.html:332 +#: templates/roughage/nutrition.html:342 msgid "Run model" msgstr "Kjør modell" -#: templates/roughage/nutrition.html:336 +#: templates/roughage/nutrition.html:346 msgid "Model is running, please wait" msgstr "Modellen kjører, vennligst vent" -#: templates/roughage/nutrition.html:355 +#: templates/roughage/nutrition.html:365 msgid "Results" msgstr "Resultater" diff --git a/roughage/locale/zh_CN/LC_MESSAGES/django.po b/roughage/locale/zh_CN/LC_MESSAGES/django.po index 1cfececd0cf51d4f7d9f050b4b1bb4c0deef9a9f..9497c5783625a4bf55872dde268a4e7352283f47 100755 --- a/roughage/locale/zh_CN/LC_MESSAGES/django.po +++ b/roughage/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: 2020-09-17 12:45+0200\n" +"POT-Creation-Date: 2023-03-17 09:58+0100\n" "PO-Revision-Date: 2016-11-03 13:59+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -32,82 +32,86 @@ msgid "Clover share" msgstr "苜蓿共享" #: templates/roughage/nutrition.html:92 +msgid "Date of growth start calculation" +msgstr "" + +#: templates/roughage/nutrition.html:97 msgid "First harvest date" msgstr "第一次收获日期" -#: templates/roughage/nutrition.html:97 +#: templates/roughage/nutrition.html:102 msgid "Second harvest date" msgstr "第二次收获日期" -#: templates/roughage/nutrition.html:119 +#: templates/roughage/nutrition.html:124 msgid "Use weather scenarios" msgstr "使用天气情景" -#: templates/roughage/nutrition.html:122 +#: templates/roughage/nutrition.html:127 msgid "Mean daily temperature" msgstr "日均温" -#: templates/roughage/nutrition.html:131 +#: templates/roughage/nutrition.html:136 msgid "Daily precipitation" msgstr "日降水量" -#: templates/roughage/nutrition.html:140 +#: templates/roughage/nutrition.html:145 msgid "Daily global radiation" msgstr "日全球辐射" -#: templates/roughage/nutrition.html:154 +#: templates/roughage/nutrition.html:159 msgid "Add artificial watering" msgstr "人工加水" -#: templates/roughage/nutrition.html:164 +#: templates/roughage/nutrition.html:169 msgid "Delete matrix contents" msgstr "" -#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274 +#: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284 msgid "Time of day" msgstr "一天中的时间" -#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286 +#: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296 msgid "Harvest width" msgstr "收获的宽度" -#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293 +#: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303 msgid "Estimated harvest" msgstr "估算的收获" -#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302 +#: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312 msgid "Conditioning" msgstr "情形" -#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304 +#: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314 msgid "Weak" msgstr "弱" -#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305 +#: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315 msgid "Strong" msgstr "强" -#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306 +#: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316 msgid "Crushed" msgstr "奔溃" -#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313 +#: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323 msgid "String width" msgstr "线宽" -#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320 +#: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330 msgid "Estimated dry matter fraction" msgstr "估算的干物质组成比例" -#: templates/roughage/nutrition.html:332 +#: templates/roughage/nutrition.html:342 msgid "Run model" msgstr "运行模型" -#: templates/roughage/nutrition.html:336 +#: templates/roughage/nutrition.html:346 msgid "Model is running, please wait" msgstr "模型在运行中,请等候" -#: templates/roughage/nutrition.html:355 +#: templates/roughage/nutrition.html:365 msgid "Results" msgstr "结果" diff --git a/roughage/locale/zh_Hans/LC_MESSAGES/django.po b/roughage/locale/zh_Hans/LC_MESSAGES/django.po index 5116c46308676a60eb2a910d75faf1886b240e97..a6158c74d1fdf1713e2eae428c14a2406b1e3aa1 100755 --- a/roughage/locale/zh_Hans/LC_MESSAGES/django.po +++ b/roughage/locale/zh_Hans/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-17 12:45+0200\n" +"POT-Creation-Date: 2023-03-17 09:58+0100\n" "PO-Revision-Date: 2016-11-03 13:59+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -32,82 +32,86 @@ msgid "Clover share" msgstr "苜蓿共享" #: templates/roughage/nutrition.html:92 +msgid "Date of growth start calculation" +msgstr "" + +#: templates/roughage/nutrition.html:97 msgid "First harvest date" msgstr "第一次收获日期" -#: templates/roughage/nutrition.html:97 +#: templates/roughage/nutrition.html:102 msgid "Second harvest date" msgstr "第二次收获日期" -#: templates/roughage/nutrition.html:119 +#: templates/roughage/nutrition.html:124 msgid "Use weather scenarios" msgstr "使用天气情景" -#: templates/roughage/nutrition.html:122 +#: templates/roughage/nutrition.html:127 msgid "Mean daily temperature" msgstr "日均温" -#: templates/roughage/nutrition.html:131 +#: templates/roughage/nutrition.html:136 msgid "Daily precipitation" msgstr "日降水量" -#: templates/roughage/nutrition.html:140 +#: templates/roughage/nutrition.html:145 msgid "Daily global radiation" msgstr "日全球辐射" -#: templates/roughage/nutrition.html:154 +#: templates/roughage/nutrition.html:159 msgid "Add artificial watering" msgstr "人工加水" -#: templates/roughage/nutrition.html:164 +#: templates/roughage/nutrition.html:169 msgid "Delete matrix contents" msgstr "" -#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274 +#: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284 msgid "Time of day" msgstr "一天中的时间" -#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286 +#: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296 msgid "Harvest width" msgstr "收获的宽度" -#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293 +#: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303 msgid "Estimated harvest" msgstr "估算的收获" -#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302 +#: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312 msgid "Conditioning" msgstr "情形" -#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304 +#: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314 msgid "Weak" msgstr "弱" -#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305 +#: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315 msgid "Strong" msgstr "强" -#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306 +#: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316 msgid "Crushed" msgstr "奔溃" -#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313 +#: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323 msgid "String width" msgstr "线宽" -#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320 +#: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330 msgid "Estimated dry matter fraction" msgstr "估算的干物质组成比例" -#: templates/roughage/nutrition.html:332 +#: templates/roughage/nutrition.html:342 msgid "Run model" msgstr "运行模型" -#: templates/roughage/nutrition.html:336 +#: templates/roughage/nutrition.html:346 msgid "Model is running, please wait" msgstr "模型在运行中,请等候" -#: templates/roughage/nutrition.html:355 +#: templates/roughage/nutrition.html:365 msgid "Results" msgstr "结果" diff --git a/roughage/templates/roughage/nutrition.html b/roughage/templates/roughage/nutrition.html index c0d8aea87ed005ac40e7a86927849110b8fd48d0..9ef0a67e33e2a38737e78f3599cdf93ff317a6eb 100755 --- a/roughage/templates/roughage/nutrition.html +++ b/roughage/templates/roughage/nutrition.html @@ -88,6 +88,11 @@ </select> <span class="help-block" id="{{ form_id }}_cloverShare_validation"></span> </div> + <div class="form-group"> + <label for="firstPossibleGrowthStartDate">{% trans "Date of growth start calculation" %}</label> + <input type="date" name="firstPossibleGrowthStartDate" class="form-control" value="{% now "Y" %}-03-01"/> + <span class="help-block" id="{{ form_id }}_firstPossibleGrowthStartDate_validation"></span> + </div> <div class="form-group"> <label for="firstHarvest">{% trans "First harvest date" %}</label> <input type="date" name="firstHarvest" class="form-control"/>