Skip to content
Snippets Groups Projects
Commit b00ff67c authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Merge branch 'develop' of gitlab.nibio.no:VIPS/VIPSWeb into develop

parents 9df032ac f3816352
Branches
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ msgid "" ...@@ -19,7 +19,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-16 11:04+0100\n" "POT-Creation-Date: 2023-11-17 14:47+0100\n"
"PO-Revision-Date: 2014-05-14 09:31+0200\n" "PO-Revision-Date: 2014-05-14 09:31+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -42,19 +42,23 @@ msgstr "" ...@@ -42,19 +42,23 @@ msgstr ""
msgid "Septoria reference humidity model" msgid "Septoria reference humidity model"
msgstr "" msgstr ""
#: local_settings.py:210 #: local_settings.py:203
msgid "Carrot rust fly temperature model"
msgstr ""
#: local_settings.py:214
msgid "Cereals and oilseeds" msgid "Cereals and oilseeds"
msgstr "" msgstr ""
#: local_settings.py:243 #: local_settings.py:247
msgid "Potato and vegetables" msgid "Potato and vegetables"
msgstr "" msgstr ""
#: local_settings.py:253 #: local_settings.py:257
msgid "Fruits and berries" msgid "Fruits and berries"
msgstr "" msgstr ""
#: local_settings.py:268 #: local_settings.py:272
msgid "Other models and services" msgid "Other models and services"
msgstr "" msgstr ""
......
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-16 11:04+0100\n" "POT-Creation-Date: 2023-11-17 14:47+0100\n"
"PO-Revision-Date: 2015-02-13 11:26+0100\n" "PO-Revision-Date: 2015-02-13 11:26+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
...@@ -31,19 +31,23 @@ msgstr "" ...@@ -31,19 +31,23 @@ msgstr ""
msgid "Septoria reference humidity model" msgid "Septoria reference humidity model"
msgstr "" msgstr ""
#: local_settings.py:210 #: local_settings.py:203
msgid "Carrot rust fly temperature model"
msgstr ""
#: local_settings.py:214
msgid "Cereals and oilseeds" msgid "Cereals and oilseeds"
msgstr "" msgstr ""
#: local_settings.py:243 #: local_settings.py:247
msgid "Potato and vegetables" msgid "Potato and vegetables"
msgstr "" msgstr ""
#: local_settings.py:253 #: local_settings.py:257
msgid "Fruits and berries" msgid "Fruits and berries"
msgstr "" msgstr ""
#: local_settings.py:268 #: local_settings.py:272
msgid "Other models and services" msgid "Other models and services"
msgstr "" msgstr ""
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-16 11:04+0100\n" "POT-Creation-Date: 2023-11-17 14:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -30,19 +30,23 @@ msgstr "" ...@@ -30,19 +30,23 @@ msgstr ""
msgid "Septoria reference humidity model" msgid "Septoria reference humidity model"
msgstr "" msgstr ""
#: local_settings.py:210 #: local_settings.py:203
msgid "Carrot rust fly temperature model"
msgstr ""
#: local_settings.py:214
msgid "Cereals and oilseeds" msgid "Cereals and oilseeds"
msgstr "" msgstr ""
#: local_settings.py:243 #: local_settings.py:247
msgid "Potato and vegetables" msgid "Potato and vegetables"
msgstr "" msgstr ""
#: local_settings.py:253 #: local_settings.py:257
msgid "Fruits and berries" msgid "Fruits and berries"
msgstr "" msgstr ""
#: local_settings.py:268 #: local_settings.py:272
msgid "Other models and services" msgid "Other models and services"
msgstr "" msgstr ""
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-16 11:04+0100\n" "POT-Creation-Date: 2023-11-17 14:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -30,19 +30,23 @@ msgstr "" ...@@ -30,19 +30,23 @@ msgstr ""
msgid "Septoria reference humidity model" msgid "Septoria reference humidity model"
msgstr "" msgstr ""
#: local_settings.py:210 #: local_settings.py:203
msgid "Carrot rust fly temperature model"
msgstr ""
#: local_settings.py:214
msgid "Cereals and oilseeds" msgid "Cereals and oilseeds"
msgstr "" msgstr ""
#: local_settings.py:243 #: local_settings.py:247
msgid "Potato and vegetables" msgid "Potato and vegetables"
msgstr "" msgstr ""
#: local_settings.py:253 #: local_settings.py:257
msgid "Fruits and berries" msgid "Fruits and berries"
msgstr "" msgstr ""
#: local_settings.py:268 #: local_settings.py:272
msgid "Other models and services" msgid "Other models and services"
msgstr "" msgstr ""
......
No preview for this file type
...@@ -20,7 +20,7 @@ msgid "" ...@@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VIPSWeb\n" "Project-Id-Version: VIPSWeb\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-16 11:04+0100\n" "POT-Creation-Date: 2023-11-17 14:47+0100\n"
"PO-Revision-Date: 2013-11-07 20:18+0200\n" "PO-Revision-Date: 2013-11-07 20:18+0200\n"
"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n" "Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -42,19 +42,23 @@ msgstr "Om grid-varsler" ...@@ -42,19 +42,23 @@ msgstr "Om grid-varsler"
msgid "Septoria reference humidity model" msgid "Septoria reference humidity model"
msgstr "Septoria referansefuktmodell" msgstr "Septoria referansefuktmodell"
#: local_settings.py:210 #: local_settings.py:203
msgid "Carrot rust fly temperature model"
msgstr "Gulrotflue svermetidspunktmodell"
#: local_settings.py:214
msgid "Cereals and oilseeds" msgid "Cereals and oilseeds"
msgstr "Korn og oljevekster" msgstr "Korn og oljevekster"
#: local_settings.py:243 #: local_settings.py:247
msgid "Potato and vegetables" msgid "Potato and vegetables"
msgstr "Poteter og grønnsaker" msgstr "Poteter og grønnsaker"
#: local_settings.py:253 #: local_settings.py:257
msgid "Fruits and berries" msgid "Fruits and berries"
msgstr "Frukt og bær" msgstr "Frukt og bær"
#: local_settings.py:268 #: local_settings.py:272
msgid "Other models and services" msgid "Other models and services"
msgstr "Andre modeller og tjenester" msgstr "Andre modeller og tjenester"
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-16 11:04+0100\n" "POT-Creation-Date: 2023-11-17 14:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -30,19 +30,23 @@ msgstr "" ...@@ -30,19 +30,23 @@ msgstr ""
msgid "Septoria reference humidity model" msgid "Septoria reference humidity model"
msgstr "" msgstr ""
#: local_settings.py:210 #: local_settings.py:203
msgid "Carrot rust fly temperature model"
msgstr ""
#: local_settings.py:214
msgid "Cereals and oilseeds" msgid "Cereals and oilseeds"
msgstr "" msgstr ""
#: local_settings.py:243 #: local_settings.py:247
msgid "Potato and vegetables" msgid "Potato and vegetables"
msgstr "" msgstr ""
#: local_settings.py:253 #: local_settings.py:257
msgid "Fruits and berries" msgid "Fruits and berries"
msgstr "" msgstr ""
#: local_settings.py:268 #: local_settings.py:272
msgid "Other models and services" msgid "Other models and services"
msgstr "" msgstr ""
......
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-16 11:04+0100\n" "POT-Creation-Date: 2023-11-17 14:47+0100\n"
"PO-Revision-Date: 2019-06-24 12:21+0200\n" "PO-Revision-Date: 2019-06-24 12:21+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
...@@ -29,19 +29,23 @@ msgstr "" ...@@ -29,19 +29,23 @@ msgstr ""
msgid "Septoria reference humidity model" msgid "Septoria reference humidity model"
msgstr "" msgstr ""
#: local_settings.py:210 #: local_settings.py:203
msgid "Carrot rust fly temperature model"
msgstr ""
#: local_settings.py:214
msgid "Cereals and oilseeds" msgid "Cereals and oilseeds"
msgstr "谷物和油籽" msgstr "谷物和油籽"
#: local_settings.py:243 #: local_settings.py:247
msgid "Potato and vegetables" msgid "Potato and vegetables"
msgstr "土豆和蔬菜" msgstr "土豆和蔬菜"
#: local_settings.py:253 #: local_settings.py:257
msgid "Fruits and berries" msgid "Fruits and berries"
msgstr "水果和浆果" msgstr "水果和浆果"
#: local_settings.py:268 #: local_settings.py:272
msgid "Other models and services" msgid "Other models and services"
msgstr "其他模型和服务" msgstr "其他模型和服务"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment