Merge branch 'master' into copyright

[rails.git] / vendor / plugins / rails-i18n / locale / zh-CN.yml

diff --git a/vendor/plugins/rails-i18n/locale/zh-CN.yml b/vendor/plugins/rails-i18n/locale/zh-CN.yml
index ee72b08f891b30087d84f761d3629f3b8df26ee6..020bda735eec1fe36b37f35c2d05289c91c6a747 100644 (file)
--- a/vendor/plugins/rails-i18n/locale/zh-CN.yml
+++ b/vendor/plugins/rails-i18n/locale/zh-CN.yml
@@ -109,6 +109,7 @@
           other: "有 {{count}} 个错误发生导致「{{model}}」无法被保存。"
         body: "如下字段出现错误："
       messages:
+        record_invalid: "校验失败: {{errors}}"
         inclusion: "不包含于列表中"
         exclusion: "是保留关键字"
         invalid: "是无效的"
@@ -128,6 +129,3 @@
         less_than_or_equal_to: "必须小于或等于 {{count}}"
         odd: "必须为单数"
         even: "必须为双数"
-  
-
-  
\ No newline at end of file