Merge branch 'develop' into 'spotit_multi_org'

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

forecasts/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-08-21 16:07+0200\n"
+"PO-Revision-Date: 2016-05-27 17:31+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"
+
+#: models.py:521
+msgid "Language code"
+msgstr "语言代码"
+
+#: templates/forecasts/bogus_translation_template.html:1
+msgid "Percent"
+msgstr "百分比"
+
+#: templates/forecasts/bogus_translation_template.html:2
+msgid "Number"
+msgstr "数量"
+
+#: templates/forecasts/bogus_translation_template.html:3
+msgid "Aggregated day degrees"
+msgstr "日积温"
+
+#: templates/forecasts/bogus_translation_template.html:4
+msgid "Degrees Celcius"
+msgstr "温度 (摄氏)"
+
+#: templates/forecasts/bogus_translation_template.html:5
+msgid "Hours"
+msgstr "小时"
+
+#: templates/forecasts/bogus_translation_template.html:6
+msgid "Millimeters"
+msgstr "毫米"
+
+#: templates/forecasts/bogus_translation_template.html:7
+msgid "Minutes"
+msgstr "分钟"
+
+#: templates/forecasts/bogus_translation_template.html:8
+msgid "Minutes/day"
+msgstr "分钟/天"
+
+#: templates/forecasts/bogus_translation_template.html:9
+msgid "Minutes/hour"
+msgstr "分钟/小时"
+
+#: templates/forecasts/bogus_translation_template.html:10
+msgid "Time"
+msgstr "时间"
+
+#: templates/forecasts/bogus_translation_template.html:11
+msgid "Watt/square meter"
+msgstr "瓦/平方米"
+
+#: templates/forecasts/bogus_translation_template.html:12
+msgid "Yes or no"
+msgstr "是 或 否"
+
+#: templates/forecasts/bogus_translation_template.html:13
+msgid "Risk value"
+msgstr ""
+
+#: templates/forecasts/detail.html:25 templates/forecasts/detail.html.py:27
+#: templates/forecasts/detail_error.html:25
+msgid "Details"
+msgstr "细节"
+
+#: templates/forecasts/detail.html:38
+msgid "Model"
+msgstr "模型"
+
+#: templates/forecasts/detail.html:39 templates/forecasts/index.html:63
+#: templates/forecasts/index.html.py:84
+msgid "Location"
+msgstr "位置"
+
+#: templates/forecasts/detail.html:40 templates/forecasts/index.html:62
+#: templates/forecasts/index.html.py:83
+msgid "Weather station"
+msgstr "气象站"
+
+#: templates/forecasts/detail.html:40
+msgid "Distance to location"
+msgstr "距离"
+
+#: templates/forecasts/detail.html:41
+msgid "Period"
+msgstr "时间"
+
+#: templates/forecasts/detail.html:45
+msgid "Showing latest"
+msgstr "显示最新"
+
+#: templates/forecasts/detail.html:47
+msgid "Days"
+msgstr "天"
+
+#: templates/forecasts/detail.html:48
+msgid "Change"
+msgstr "变化"
+
+#: templates/forecasts/detail.html:56
+msgid "Scroll past chart by swiping the dotted line on the right"
+msgstr "点击右边点状线查看过去图表"
+
+#: templates/forecasts/detail.html:68
+msgid "Timestamp"
+msgstr "时间戳"
+
+#: templates/forecasts/detail.html:69
+msgid "Warning status"
+msgstr "预警状态"
+
+#: templates/forecasts/detail.html:89
+msgid "No results for this forecast"
+msgstr "基于该预报无结果"
+
+#: templates/forecasts/detail_error.html:27
+msgid "Error with details"
+msgstr "错误细节"
+
+#: templates/forecasts/detail_error.html:28
+msgid "Forecast not found"
+msgstr "预报未发现"
+
+#: templates/forecasts/detail_error.html:29
+msgid "To list of available forecasts"
+msgstr "可使用预报的列表"
+
+#: templates/forecasts/index.html:25 templates/forecasts/index.html.py:27
+msgid "Forecasts"
+msgstr "预报"
+
+#: templates/forecasts/index.html:45
+msgid "Search"
+msgstr "搜索"
+
+#: templates/forecasts/index.html:59 templates/forecasts/index.html.py:80
+msgid "Crop"
+msgstr "作物"
+
+#: templates/forecasts/index.html:60 templates/forecasts/index.html.py:81
+msgid "Pest"
+msgstr "病虫害"
+
+#: templates/forecasts/index.html:61 templates/forecasts/index.html.py:82
+msgid "Model name"
+msgstr "模型名称"
+
+#: templates/forecasts/index.html:64 templates/forecasts/index.html.py:85
+msgid "Date start"
+msgstr "开始时间"
+
+#: templates/forecasts/index.html:65 templates/forecasts/index.html.py:86
+msgid "Date end"
+msgstr "结束时间"
+
+#: templates/forecasts/index.html:75
+msgid "Private forecasts"
+msgstr "个人预报"
+
+#: templates/forecasts/index.html:100 templates/forecasts/index.html.py:139
+msgid "Results"
+msgstr "结果"
+
+#: templates/forecasts/index.html:155
+msgid "Select crop"
+msgstr "选择作物"
+
+#: templates/forecasts/index.html:171
+msgid "Select pest"
+msgstr "选择病虫害"
+
+#: templates/forecasts/index.html:187
+msgid "Select model"
+msgstr "选择模型"
+
+#: templates/models/detail.html:22 templates/models/detail_test.html:22
+#: templates/models/index.html:22 templates/models/index.html.py:24
+msgid "Models"
+msgstr "模型"
+
+#: templates/models/detail.html:28 templates/models/detail_test.html:28
+msgid "Description"
+msgstr "描述"
+
+#: templates/models/detail.html:29 templates/models/detail_test.html:29
+msgid "Interpretation of warning status"
+msgstr "解释预警状态"
+
+#: templates/models/detail.html:30 templates/models/detail_test.html:30
+msgid "Technical usage"
+msgstr "技术使用"
+
+#: templates/models/detail.html:31 templates/models/detail_test.html:31
+msgid "Sample configuration"
+msgstr "样品配置"
+
+#: templates/models/detail.html:44
+msgid "This is technical info for model and web developers"
+msgstr "对模型和网络开发者的技术信息"

applefruitmoth/locale/zh_CN/LC_MESSAGES/zh_CN.po → fusarium/locale/zh_Hans/LC_MESSAGES/django.po

@@ -8,41 +8,17 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-28 13:04-0700\n"
-"PO-Revision-Date: 2016-11-03 13:51+0100\n"
+"PO-Revision-Date: 2016-10-27 11:25+0200\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=1; plural=0;\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "X-Generator: Poedit 1.8.7\n"
-"Last-Translator: \n"
-"Language: zh_CN\n"
-
-#: templates/applefruitmoth/index.html:25
-#: templates/applefruitmoth/index.html:27
-msgid "Apple fruit moth forecasting"
-msgstr "苹果小食心虫预报"
-
-#: templates/applefruitmoth/index.html:32
-msgid "Description of apple fruit moth forecasting"
-msgstr "苹果小食心虫预报的描述"
-
-#: templates/applefruitmoth/index.html:33
-msgid "Messages"
-msgstr "信息"
-
-#: templates/applefruitmoth/index.html:59
-msgid "High risk of infection"
-msgstr "感染的高风险"
-
-#: templates/applefruitmoth/index.html:60
-msgid "Medium risk of infection"
-msgstr "感染的中度风险"
-
-#: templates/applefruitmoth/index.html:61
-msgid "No risk of infection"
-msgstr "无感染风险"
 
-#: templates/applefruitmoth/index.html:62
-msgid "Forecast not ready"
-msgstr "预报未准备好"
+#: templates/fusarium/oat_flowering.html:3
+#: templates/fusarium/oat_flowering.html:9
+msgid "Oat flowering model"
+msgstr "燕麦开花病模型"

information/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-10-27 11:25+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"
+
+#: models.py:13
+msgid "Parent information"
+msgstr "父信息"
+
+#: models.py:14
+msgid "Main illustration"
+msgstr "主图"
+
+#: models.py:15
+msgid "Ordering"
+msgstr "排序"
+
+#: models.py:21
+msgid "Illustration"
+msgstr "图"
+
+#: models.py:25
+msgid "Attachment"
+msgstr "附件"
+
+#: models.py:29
+msgid "Headline"
+msgstr "标题"
+
+#: models.py:30
+msgid "Lead paragraph"
+msgstr "导向段落"
+
+#: models.py:31
+msgid "Body text"
+msgstr "正文"
+
+#: models.py:32
+msgid "Language code"
+msgstr "语言代码"
+
+#: templates/information/index.html:3 templates/information/index.html.py:5
+msgid "Information"
+msgstr "信息"
+
+#: templates/information/index.html:6
+msgid ""
+"You haven't added any information pages yet. Please do so in the "
+"administration GUI."
+msgstr "您还没有添加任何信息页面。请在GUI管理区操作。"