app/assets/javascripts/langs/zh_cn.js in wysiwyg-rails-1.1.7 vs app/assets/javascripts/langs/zh_cn.js in wysiwyg-rails-1.2.0

- old
+ new

@@ -1,7 +1,7 @@ /*! - * froala_editor v1.1.7 (http://editor.froala.com) + * froala_editor v1.2.0 (http://editor.froala.com) * Copyright 2014-2014 Froala */ /** * Simplified Chinese spoken in China. @@ -26,10 +26,11 @@ "Heading 2": "\u6807\u98982", "Heading 3": "\u6807\u98983", "Heading 4": "\u6807\u98984", "Heading 5": "\u6807\u98985", "Heading 6": "\u6807\u98986", + "Block Style": "\u5ea7\u5f0f", "Alignment": "\u5bf9\u9f50\u65b9\u5f0f", "Align Left": "\u5de6\u5bf9\u9f50", "Align Center": "\u5c45\u4e2d", "Align Right": "\u53f3\u5bf9\u9f50", "Justify": "\u4e24\u7aef\u5bf9\u9f50", @@ -51,9 +52,10 @@ "Remove Image": "\u5220\u9664\u56fe\u50cf", "Title": "\u6807\u9898", "Insert image": "\u63d2\u5165\u56fe\u7247", "Drop image": "\u56fe\u50cf\u62d6\u653e", "or click": "\u6216\u70b9\u51fb", + "or": "\u6216", "Enter URL": "\u8f93\u5165\u7f51\u5740", "Please wait!": "\u8bf7\u7a0d\u7b49\uff01", "Are you sure? Image will be deleted.": "\u4f60\u786e\u5b9a\u5417\uff1f\u56fe\u50cf\u5c06\u88ab\u5220\u9664\u3002", "UNLINK": "\u5220\u9664\u94fe\u63a5", "Open in new tab": "\u5f00\u542f\u5728\u65b0\u6807\u7b7e\u9875", \ No newline at end of file