Merge branch 'develop' into 'spotit_multi_org'

# Conflicts:
#   VIPSWeb/static/js/frontpage.js

observations/locale/zh_Hans/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-10 12:35+0100\n"
+"PO-Revision-Date: 2016-10-27 11:26+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: zh_Hans\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7\n"
+
+#: templates/observations/detail.html:25 templates/observations/detail.html:28
+msgid "Observation"
+msgstr "观测"
+
+#: templates/observations/detail.html:29
+msgid "View all observations"
+msgstr "查看所有观测"
+
+#: templates/observations/detail.html:32 templates/observations/index.html:63
+#: templates/observations/index_new.html:46
+#: templates/observations/index_new.html:63
+msgid "Organism"
+msgstr "生物"
+
+#: templates/observations/detail.html:34 templates/observations/index.html:64
+#: templates/observations/index_new.html:50
+#: templates/observations/index_new.html:64
+msgid "Crop"
+msgstr "作物"
+
+#: templates/observations/detail.html:36 templates/observations/index.html:62
+#: templates/observations/index_new.html:62
+msgid "Time of observation"
+msgstr "观测时间"
+
+#: templates/observations/detail.html:38
+msgid "Observer"
+msgstr "观测者"
+
+#: templates/observations/detail.html:42
+msgid "Observation data"
+msgstr "观测数据"
+
+#: templates/observations/detail.html:87
+msgid "Observation was not quantified"
+msgstr "观测没有定量化"
+
+#: templates/observations/detail.html:116
+msgid "Map view not available"
+msgstr ""
+
+#: templates/observations/index.html:25 templates/observations/index.html:28
+#: templates/observations/index_new.html:25
+msgid "Observations"
+msgstr "观测"
+
+#: templates/observations/index.html:33
+msgid "All pests"
+msgstr "所有病虫害"
+
+#: templates/observations/index.html:49
+msgid "From"
+msgstr ""
+
+#: templates/observations/index.html:53
+msgid "To"
+msgstr ""
+
+#: templates/observations/index.html:55
+msgid "Date search"
+msgstr ""
+
+#: templates/observations/index.html:65
+#: templates/observations/index_new.html:65
+msgid "Heading"
+msgstr "标题"
+
+#: templates/observations/index.html:96
+#, fuzzy
+#| msgid "Crop"
+msgid "Crops"
+msgstr "作物"
+
+#: templates/observations/index.html:136
+msgid "View details"
+msgstr "看细节"
+
+#: templates/observations/index_new.html:31
+msgid "Current date"
+msgstr ""
+
+#: templates/observations/index_new.html:54
+msgid "Crop categories"
+msgstr ""
+
+#: templates/observations/index_new.html:57
+msgid "Filter"
+msgstr ""

observations/locale/zh_Hans/LC_MESSAGES/djangojs.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-10 15:03+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: static/observations/js/observationList.js:165
+msgid "Observation(s) found at location"
+msgstr ""
+
+#: static/observations/js/observationList.js:183
+msgid "in"
+msgstr ""
+
+#: static/observations/js/observationList.js:274
+msgid "Details"
+msgstr ""
+
+#: static/observations/js/observationList.js:505
+msgid "Days since observation"
+msgstr ""
+
+#: static/observations/js/observationList.js:508
+msgid "Days"
+msgstr ""
+
+#: static/observations/js/observationList.js:510
+msgid "Older"
+msgstr ""

organisms/locale/zh_Hans/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-28 13:04-0700\n"
+"PO-Revision-Date: 2016-06-01 11:48+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: zh_Hans\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7\n"
+
+#: templates/organisms/index.html:3 templates/organisms/index.html.py:5
+msgid "Organisms"
+msgstr "生物"
+
+#: templates/organisms/index.html:5
+msgid "Crops"
+msgstr "作物"
+
+#: templates/organisms/index.html:6
+msgid "Crop"
+msgstr "作物"

roughage/locale/de/LC_MESSAGES/django.po → roughage/locale/zh_Hans/LC_MESSAGES/django.po

@@ -3,105 +3,105 @@
 # 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: 2016-09-28 13:03-0700\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: 2016-09-28 13:04-0700\n"
+"PO-Revision-Date: 2016-11-03 13:59+0100\n"
+"Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27
 msgid "Roughage nutrition model"
-msgstr ""
+msgstr "粗粮营养模型"
 
 #: templates/roughage/nutrition.html:60
 msgid "Soil type"
-msgstr ""
+msgstr "土壤类型"
 
 #: templates/roughage/nutrition.html:70
 msgid "Clover share"
-msgstr ""
+msgstr "苜蓿共享"
 
 #: templates/roughage/nutrition.html:80
 msgid "First harvest date"
-msgstr ""
+msgstr "第一次收获日期"
 
 #: templates/roughage/nutrition.html:85
 msgid "Second harvest date"
-msgstr ""
+msgstr "第二次收获日期"
 
 #: templates/roughage/nutrition.html:107
 msgid "Use weather scenarios"
-msgstr ""
+msgstr "使用天气情景"
 
 #: templates/roughage/nutrition.html:110
 msgid "Mean daily temperature"
-msgstr ""
+msgstr "日均温"
 
 #: templates/roughage/nutrition.html:119
 msgid "Daily precipitation"
-msgstr ""
+msgstr "日降水量"
 
 #: templates/roughage/nutrition.html:128
 msgid "Daily global radiation"
-msgstr ""
+msgstr "日全球辐射"
 
 #: templates/roughage/nutrition.html:142
 msgid "Add artificial watering"
-msgstr ""
+msgstr "人工加水"
 
 #: templates/roughage/nutrition.html:197 templates/roughage/nutrition.html:259
 msgid "Time of day"
-msgstr ""
+msgstr "一天中的时间"
 
 #: templates/roughage/nutrition.html:209 templates/roughage/nutrition.html:271
 msgid "Harvest width"
-msgstr ""
+msgstr "收获的宽度"
 
 #: templates/roughage/nutrition.html:216 templates/roughage/nutrition.html:278
 msgid "Estimated harvest"
-msgstr ""
+msgstr "估算的收获"
 
 #: templates/roughage/nutrition.html:225 templates/roughage/nutrition.html:287
 msgid "Conditioning"
-msgstr ""
+msgstr "情形"
 
 #: templates/roughage/nutrition.html:227 templates/roughage/nutrition.html:289
 msgid "Weak"
-msgstr ""
+msgstr "弱"
 
 #: templates/roughage/nutrition.html:228 templates/roughage/nutrition.html:290
 msgid "Strong"
-msgstr ""
+msgstr "强"
 
 #: templates/roughage/nutrition.html:229 templates/roughage/nutrition.html:291
 msgid "Crushed"
-msgstr ""
+msgstr "奔溃"
 
 #: templates/roughage/nutrition.html:236 templates/roughage/nutrition.html:298
 msgid "String width"
-msgstr ""
+msgstr "线宽"
 
 #: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305
 msgid "Estimated dry matter fraction"
-msgstr ""
+msgstr "估算的干物质组成比例"
 
 #: templates/roughage/nutrition.html:317
 msgid "Run model"
-msgstr ""
+msgstr "运行模型"
 
 #: templates/roughage/nutrition.html:321
 msgid "Model is running, please wait"
-msgstr ""
+msgstr "模型在运行中，请等候"
 
 #: templates/roughage/nutrition.html:340
 msgid "Results"
-msgstr ""
+msgstr "结果"

roughage/locale/de/LC_MESSAGES/djangojs.po → roughage/locale/zh_Hans/LC_MESSAGES/djangojs.po

@@ -3,33 +3,33 @@
 # 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: 2016-09-28 13:03-0700\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: 2016-09-28 13:04-0700\n"
+"PO-Revision-Date: 2016-11-03 14:00+0100\n"
+"Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: static/roughage/js/nutrition.js:212
 msgid "Select weather station"
-msgstr ""
+msgstr "选择气象站"
 
 #: static/roughage/js/nutrition.js:241
 msgid "Don't use normaldata"
-msgstr ""
+msgstr "不使用正常数据"
 
 #: static/roughage/js/nutrition.js:287
 msgid "Watering amount"
-msgstr ""
+msgstr "加水量"
 
 #: static/roughage/js/nutrition.js:321
 msgid "Date"
-msgstr ""
+msgstr "日期"