Merge pull request #1535 from ofgeek/patch-1

Update client.zh_CN.yml

config/locales/client.zh_CN.yml

@@ -84,10 +84,11 @@ zh_CN:
     yes_value: "是"
     of_value: "/"
     generic_error: "抱歉，发生了一个错误。"
-    generic_error_with_reason: "发生一个错误：%{error}"
+    generic_error_with_reason: "发生了一个错误：%{error}"
     log_in: "登录"
     age: "时间"
     last_post: "最后一帖"
+    joined: "加入时间："
     admin_title: "管理员"
     flags_title: "报告"
     show_more: "显示更多"
@@ -482,8 +483,8 @@ zh_CN:
       link_optional_text: "可选标题"
       quote_title: "引用"
       quote_text: "引用"
-      code_title: "代码"
-      code_text: "在此输入代码"
+      code_title: "预格式化文本"
+      code_text: "在此输入预格式化文本"
       upload_title: "图片"
       upload_description: "在此输入图片描述"
       olist_title: "数字列表"