Merge branch 'development'

Author: GEROMAX

config/locales/zh.yml

@@ -0,0 +1,6 @@
+# Simplified Chinese strings go here for Rails i18n
+zh:
+  diff_popup_legend_add: "新增"
+  diff_popup_legend_remove: "移除"
+  field_enable_popup_journal_diff: "启用浮动窗口显示问题处理历史记录"
+  field_enable_popup_wiki_diff: "启用浮动浮动窗口显示WIKI历史记录"

init.rb

@@ -18,7 +18,7 @@
   name 'Redmine Diff Popup plugin'
   author 'Ryuta Tobita'
   description 'This plugin provide on pop-up show feature of diff.'
-  version '2.0.0'
+  version '2.1.0'
   url 'https://github.com/GEROMAX/redmine_diff_popup'
   author_url 'https://github.com/GEROMAX'
   permission :wiki_popup, {:wiki_popup => [:wiki_diff]}, :public => true