diff --git a/config/locales/client.zh.yml b/config/locales/client.zh.yml
index 9c6eea03..43e84fcd 100644
--- a/config/locales/client.zh.yml
+++ b/config/locales/client.zh.yml
@@ -1,41 +1,41 @@
-zh-TW:
+zh-CN:
   js:
     wizard:
       complete_custom: "Complete the {{name}}"
-      completed: "You have completed this wizard."
-      not_permitted: "You are not permitted to access this wizard."
+      completed: "您已经完成了此向导。"
+      not_permitted: "您没有权限访问此向导。"
       none: "There is no wizard here."
       return_to_site: "Return to {{siteName}}."
-      requires_login: "You need to be logged in to access this wizard."
+      requires_login: "您需要登录才能访问此向导。"
       reset: "Reset this wizard."
       step_not_permitted: "You're not permitted to view this step."
       incomplete_submission:
-        title: "Continue editing your draft submission from %{date}?"
-        resume: "Continue"
-        restart: "Start over"
+        title: "要从您于 %{date} 留下的填写记录继续吗？"
+        resume: "继续上次填写"
+        restart: "重新开始"
       x_characters:
-        other: "%{count} Characters"
-      quit: "Maybe Later"
-      done_custom: "Done"
-      back: "Back"
-      next: "Next"
-      step: "%{current} of %{total}"
-      upload: "Upload"
-      uploading: "Uploading..."
-      upload_error: "Sorry, there was an error uploading that file. Please try again."
+        other: "已输入 %{count} 个字符"
+      quit: "Exit"
+      done_custom: "完成"
+      back: "上一步"
+      next: "下一步"
+      step: "第 %{current}/%{total} 步"
+      upload: "上传"
+      uploading: "上传中..."
+      upload_error: "抱歉，上传文件时出错。请重试。"
     wizard_composer:
-      show_preview: "Preview Post"
-      hide_preview: "Edit Post"
+      show_preview: "预览效果"
+      hide_preview: "编辑"
       quote_post_title: "Quote whole post"
       bold_label: "B"
-      bold_title: "Strong"
-      bold_text: "strong text"
+      bold_title: "粗体"
+      bold_text: "粗体文本"
       italic_label: "I"
-      italic_title: "Emphasis"
-      italic_text: "emphasized text"
-      link_title: "Hyperlink"
+      italic_title: "强调"
+      italic_text: "强调文本"
+      link_title: "超链接"
       link_description: "enter link description here"
-      link_dialog_title: "Insert Hyperlink"
+      link_dialog_title: "插入超链接"
       link_optional_text: "optional title"
       link_url_placeholder: "http://example.com"
       quote_title: "Blockquote"
@@ -43,123 +43,126 @@ zh-TW:
       blockquote_text: "Blockquote"
       code_title: "Preformatted text"
       code_text: "indent preformatted text by 4 spaces"
-      paste_code_text: "type or paste code here"
-      upload_title: "Upload"
+      paste_code_text: "在此处输入或粘贴代码"
+      upload_title: "上传文件"
       upload_description: "enter upload description here"
-      olist_title: "Numbered List"
+      olist_title: "编号列表"
       ulist_title: "Bulleted List"
-      list_item: "List item"
+      list_item: "列表项"
       toggle_direction: "Toggle Direction"
-      help: "Markdown Editing Help"
-      collapse: "minimize the composer panel"
-      abandon: "close composer and discard draft"
-      modal_ok: "OK"
-      modal_cancel: "Cancel"
-      cant_send_pm: "Sorry, you can't send a message to %{username}."
+      help: "Markdown 编辑帮助"
+      collapse: "收起编辑器"
+      abandon: "关闭编辑器、丢弃草稿"
+      modal_ok: "好的"
+      modal_cancel: "取消"
+      cant_send_pm: "抱歉，您无法给 %{username} 发消息。"
       yourself_confirm:
-        title: "Did you forget to add recipients?"
+        title: "您是不是忘了添加接收人？"
         body: "Right now this message is only being sent to yourself!"
     realtime_validations:
       similar_topics:
-        insufficient_characters: "Type a minimum 5 characters to start looking for similar topics"
-        insufficient_characters_categories: "Type a minimum 5 characters to start looking for similar topics in %{catLinks}"
-        results: "Your topic is similar to..."
-        no_results: "No similar topics."
-        loading: "Looking for similar topics..."
-        show: "show"
+        insufficient_characters: "输入至少 5 个字符来开始寻找相似主题"
+        insufficient_characters_categories: "输入至少 5 个字符来开始在 %{catLinks} 中寻找相似主题"
+        results: "您的主题类似于..."
+        no_results: "没有相似主题。"
+        loading: "正在寻找类似主题..."
+        show: "显示"
   admin_js:
     admin:
       wizard:
-        label: "Wizard"
-        nav_label: "Wizards"
-        select: "Select a wizard"
-        create: "Create Wizard"
+        label: "向导"
+        nav_label: "向导"
+        select: "选择一个向导"
+        create: "创建向导"
         name: "Name"
         name_placeholder: "wizard name"
-        background: "Background"
-        background_placeholder: "#hex"
+        background: "背景"
+        background_placeholder: "#hex 值"
         save_submissions: "Save"
         save_submissions_label: "Save wizard submissions."
-        multiple_submissions: "Multiple"
-        multiple_submissions_label: "Users can submit multiple times."
-        after_signup: "Signup"
-        after_signup_label: "Users directed to wizard after signup."
-        after_time: "Time"
+        multiple_submissions: "多次提交"
+        multiple_submissions_label: "允许用户多次提交"
+        after_signup: "注册即引导"
+        after_signup_label: "用户完成注册即引导至向导"
+        after_time: "定时"
         after_time_label: "Users directed to wizard after start time:"
         after_time_time_label: "Start Time"
         after_time_modal:
           title: "Wizard Start Time"
-          date: "Date"
-          time: "Time"
+          date: "日期"
+          time: "时间"
           done: "Set Time"
           clear: "Clear"
+        after_time_groups:
+          label: Time Groups
+          description: Groups directed to wizard after start time.
         required: "Required"
-        required_label: "Users cannot skip the wizard."
-        prompt_completion: "Prompt"
-        prompt_completion_label: "Prompt user to complete wizard."
-        restart_on_revisit: "Restart"
+        required_label: "用户不能跳过该向导"
+        prompt_completion: "提示"
+        prompt_completion_label: "提示用户完成向导"
+        restart_on_revisit: "重新开始"
         restart_on_revisit_label: "Clear submissions on each visit."
-        resume_on_revisit: "Resume"
-        resume_on_revisit_label: "Ask the user if they want to resume on each visit."
-        theme_id: "Theme"
-        no_theme: "Select a Theme (optional)"
-        save: "Save Changes"
-        remove: "Delete Wizard"
-        add: "Add"
+        resume_on_revisit: "恢复"
+        resume_on_revisit_label: "每次访问都询问用户是否想要恢复上次填写的进度"
+        theme_id: "主题"
+        no_theme: "选择一个主题 (可选)"
+        save: "保存更改"
+        remove: "删除向导"
+        add: "添加"
         url: "Url"
         key: "Key"
-        value: "Value"
-        profile: "profile"
-        type: "Type"
+        value: "值"
+        profile: "个人资料"
+        type: "类型"
         none: "Make a selection"
         submission_key: 'submission key'
         param_key: 'param'
         group: "Group"
         permitted: "Permitted"
-        advanced: "Advanced"
-        undo: "Undo"
-        clear: "Clear"
-        select_type: "Select a type"
-        condition: "Condition"
+        advanced: "高级设置"
+        undo: "撤销"
+        clear: "清除"
+        select_type: "选择一个类型"
+        condition: "条件"
         index: "Index"
         edit_columns: "Edit Columns"
         expand_text: "Read More"
         collapse_text: "Show Less"
         category_settings:
           custom_wizard:
-            title: "Custom Wizard"
+            title: "自定义向导"
             create_topic_wizard: "Select a wizard to replace the new topic composer in this category."
         message:
           wizard:
-            select: "Select a wizard, or create a new one"
-            edit: "You're editing a wizard"
-            create: "You're creating a new wizard"
-            documentation: "Check out the wizard documentation"
-            contact: "Contact the developer"
+            select: "选择或新建一个向导"
+            edit: "您正在编辑一个向导"
+            create: "您正在新建一个向导"
+            documentation: "查阅向导配置文档"
+            contact: "联系开发者"
           field:
-            type: "Select a field type"
-            edit: "You're editing a field"
-            documentation: "Check out the field documentation"
+            type: "选择字段类型"
+            edit: "您正在编辑一个字段"
+            documentation: "查阅字段配置文档"
           action:
-            type: "Select an action type"
-            edit: "You're editing an action"
-            documentation: "Check out the action documentation"
+            type: "选择动作类型"
+            edit: "您正在编辑一个动作"
+            documentation: "查阅动作配置文档"
           custom_fields:
-            create: "View, create, edit and destroy custom fields"
-            saved: "Saved custom field"
+            create: "查看/创建/编辑/销毁自定义字段"
+            saved: "已保存的自定义字段"
             error: "Failed to save: {{messages}}"
-            documentation: Check out the custom field documentation
+            documentation: 查看自定义字段配置文档
           manager:
-            info: "Export, import or destroy wizards"
-            documentation: Check out the manager documentation
-            none_selected: Please select atleast one wizard
-            no_file: Please choose a file to import
-            file_size_error: The file size must be 512kb or less
-            file_format_error: The file must be a .json file
-            importing: Importing wizards...
-            destroying: Destroying wizards...
-            import_complete: Import complete
-            destroy_complete: Destruction complete
+            info: "导出、导入或销毁向导"
+            documentation: 查阅管理器帮助文档
+            none_selected: 请选择至少一个向导
+            no_file: 请选择要导入的文件
+            file_size_error: 文件大小不得超过 512kb
+            file_format_error: 文件必须为 .json 文件
+            importing: 正在导入向导...
+            destroying: 正在销毁向导...
+            import_complete: 导入完成
+            destroy_complete: 销毁完成
           subscription:
             documentation: Check out the subscription documentation
             authorize: "Connect this forum to use your Custom Wizard subscription plan on %{server}."
@@ -181,9 +184,9 @@ zh-TW:
             info: "Plugin status and subscription notices"
             documentation: Check out the notices documentation
         editor:
-          show: "Show"
-          hide: "Hide"
-          preview: "{{action}} Preview"
+          show: "显示"
+          hide: "隐藏"
+          preview: "{{action}} 预览"
           popover: "{{action}} Fields"
         input:
           conditional:
@@ -198,9 +201,9 @@ zh-TW:
         selector:
           label:
             text: "text"
-            wizard_field: "wizard field"
-            wizard_action: "wizard action"
-            user_field: "user field"
+            wizard_field: "向导字段"
+            wizard_action: "向导动作"
+            user_field: "用户字段"
             user_field_options: "user field options"
             user: "user"
             category: "category"
@@ -208,27 +211,27 @@ zh-TW:
             tag: "tag"
             group: "group"
             list: "list"
-            custom_field: "custom field"
-            value: "value"
+            custom_field: "自定义字段"
+            value: "值"
             users: "users"
             guests: "users and guests"
           placeholder:
-            text: "Enter text"
+            text: "输入文本"
             property: "Select property"
-            wizard_field: "Select field"
-            wizard_action: "Select action"
-            user_field: "Select field"
-            user_field_options: "Select field"
-            user: "Select user"
+            wizard_field: "选择字段"
+            wizard_action: "选择动作"
+            user_field: "选择字段"
+            user_field_options: "选择字段"
+            user: "选择用户"
             category: "Select category"
             topic: "Select a topic"
-            tag: "Select tag"
-            group: "Select group"
+            tag: "选择标签"
+            group: "选择群组"
             list: "Enter item"
-            custom_field: "Select field"
+            custom_field: "选择字段"
             value: "Select value"
         error:
-          failed: "failed to save wizard"
+          failed: "向导保存失败"
           required: "{{type}} requires {{property}}"
           invalid: "{{property}} is invalid"
           dependent: "{{property}} is dependent on {{dependent}}"
@@ -238,32 +241,32 @@ zh-TW:
           header: "Steps"
           title: "Title"
           banner: "Banner"
-          description: "Description"
+          description: "描述"
           required_data:
-            label: "Required"
+            label: "Required Data"
             not_permitted_message: "Message shown when required data not present"
           permitted_params:
-            label: "Params"
+            label: "Permitted Params"
           force_final:
-            label: "Conditional Final Step"
+            label: "备选最终步骤"
             description: "Display this step as the final step if conditions on later steps have not passed when the user reaches this step."
         field:
-          header: "Fields"
-          label: "Label"
-          description: "Description"
-          image: "Image"
+          header: "字段"
+          label: "标签"
+          description: "描述"
+          image: "插图"
           image_placeholder: "Image url"
-          required: "Required"
-          required_label: "Field is Required"
-          min_length: "Min Length"
-          min_length_placeholder: "Minimum length in characters"
-          max_length: "Max Length"
+          required: "必填"
+          required_label: "必须填写该字段"
+          min_length: "最短"
+          min_length_placeholder: "最小字符数"
+          max_length: "最大长度"
           max_length_placeholder: "Maximum length in characters"
-          char_counter: "Character Counter"
-          char_counter_placeholder: "Display Character Counter"
-          field_placeholder: "Field Placeholder"
-          file_types: "File Types"
-          preview_template: "Template"
+          char_counter: "Counter"
+          char_counter_placeholder: "显示字符计数"
+          field_placeholder: "Placeholder"
+          file_types: "文件类型"
+          preview_template: "模板"
           limit: "Limit"
           property: "Property"
           prefill: "Prefill"
@@ -277,7 +280,7 @@ zh-TW:
             label: "Format"
             instructions: "<a href='https://momentjs.com/docs/#/displaying/format/' target='_blank'>Moment.js format</a>"
           validations:
-            header: "Realtime Validations"
+            header: "Validations"
             enabled: "Enabled"
             similar_topics: "Similar Topics"
             position: "Position"
@@ -286,29 +289,29 @@ zh-TW:
             categories: "Categories"
             max_topic_age: "Max Topic Age"
             time_units:
-              days: "Days"
-              weeks: "Weeks"
-              months: "Months"
-              years: "Years"
+              days: "天"
+              weeks: "周"
+              months: "月"
+              years: "年"
           type:
-            text: "Text"
-            textarea: Textarea
+            text: "文本"
+            textarea: 文本域
             composer: Composer
             composer_preview: Composer Preview
             text_only: Text Only
-            number: Number
-            checkbox: Checkbox
+            number: 数字
+            checkbox: 勾选框
             url: Url
-            upload: Upload
-            dropdown: Dropdown
-            tag: Tag
-            category: Category
+            upload: 上传文件
+            dropdown: 下拉菜单
+            tag: 标签
+            category: 类别
             topic: Topic
-            group: Group
-            user_selector: User Selector
-            date: Date
-            time: Time
-            date_time: Date & Time
+            group: 群組
+            user_selector: 用户选择器
+            date: 日期
+            time: 时间
+            date_time: 日期和时间
             event: Event (Events Plugin)
         connector:
           and: "and"
@@ -325,7 +328,7 @@ zh-TW:
           association: '→'
           is: 'is'
         action:
-          header: "Actions"
+          header: "动作"
           include: "Include Fields"
           title: "Title"
           post: "Post"
@@ -338,8 +341,8 @@ zh-TW:
           topic_attr: "Topic Attribute"
           interpolate_fields: "Insert wizard fields using the field_id in w{}. Insert user fields using field key in u{}."
           run_after:
-            label: "Run After"
-            wizard_completion: "Wizard Completion"
+            label: "在...后运行"
+            wizard_completion: "完成向导"
           custom_fields:
             label: "Custom"
             key: "field"
@@ -362,11 +365,11 @@ zh-TW:
           open_composer:
             label: "Open Composer"
           update_profile:
-            label: "Update Profile"
+            label: "更新个人资料"
             setting: "Fields"
             key: "field"
           watch_categories:
-            label: "Watch Categories"
+            label: "关注类别"
             categories: "Categories"
             mute_remainder: "Mute Remainder"
           watch_tags:
@@ -387,11 +390,11 @@ zh-TW:
             checkbox: "Post Builder"
             label: "Builder"
             user_properties: "User Properties"
-            wizard_fields: "Wizard Fields"
-            wizard_actions: "Wizard Actions"
+            wizard_fields: "向导字段"
+            wizard_actions: "向导动作"
             placeholder: "Insert wizard fields using the field_id in w{}. Insert user properties using property in u{}."
           add_to_group:
-            label: "Add to Group"
+            label: "添加到群组"
           route_to:
             label: "Route To"
             url: "Url"
@@ -405,15 +408,15 @@ zh-TW:
             body: "Body"
             body_placeholder: "JSON"
           create_category:
-            label: "Create Category"
+            label: "创建类别"
             name: Name
-            slug: Slug
+            slug: 缩略名
             color: Color
             text_color: Text color
-            parent_category: Parent Category
+            parent_category: 父类别
             permissions: Permissions
           create_group:
-            label: Create Group
+            label: 创建群组
             name: Name
             full_name: Full Name
             title: Title
@@ -426,20 +429,20 @@ zh-TW:
             visibility_level: Visibility Level
             members_visibility_level: Members Visibility Level
         custom_field:
-          nav_label: "Custom Fields"
-          add: "Add"
+          nav_label: "自定义字段"
+          add: "添加"
           external:
-            label: "from another plugin"
+            label: "来自另一个插件"
             title: "This custom field has been added by another plugin. You can use it in your wizards but you can't edit the field here."
           name:
             label: "Name"
             select: "underscored_name"
           type:
             label: "Type"
-            select: "Select a type"
-            string: "String"
-            integer: "Integer"
-            boolean: "Boolean"
+            select: "选择一个类型"
+            string: "字符串"
+            integer: "整数"
+            boolean: "布尔值"
             json: "JSON"
           klass:
             label: "Class"
@@ -458,9 +461,9 @@ zh-TW:
             basic_group: "Group"
             post: "Post"
         submissions:
-          nav_label: "Submissions"
+          nav_label: "提交记录"
           title: "{{name}} Submissions"
-          download: "Download"
+          download: "下载"
           group_id: "Group ID"
           category_id: "Category ID"
           topic_id: "Topic ID"
@@ -468,29 +471,29 @@ zh-TW:
         api:
           label: "API"
           nav_label: 'APIs'
-          select: "Select API"
-          create: "Create API"
+          select: "选择 API"
+          create: "创建 API"
           new: 'New API'
           name: "Name (can't be changed)"
           name_placeholder: 'Underscored'
           title: 'Title'
           title_placeholder: 'Display name'
-          remove: 'Delete'
-          save: "Save"
+          remove: '删除'
+          save: "保存"
           auth:
             label: "Authorization"
             btn: 'Authorize'
-            settings: "Settings"
+            settings: "设置"
             status: "Status"
             redirect_uri: "Redirect url"
             type: 'Type'
-            type_none: 'Select a type'
+            type_none: '选择一个类型'
             url: "Authorization url"
             token_url: "Token url"
             client_id: 'Client id'
             client_secret: 'Client secret'
-            username: 'username'
-            password: 'password'
+            username: '用户名'
+            password: '密码'
             params:
               label: 'Params'
               new: 'New param'
@@ -515,21 +518,21 @@ zh-TW:
             label: "Logs"
             clear: clear
         log:
-          nav_label: "Logs"
+          nav_label: "日志"
           title: "{{name}} Logs"
           date: Date
           action: Action
           user: User
           message: Message
         manager:
-          nav_label: Manager
-          title: Manage Wizards
-          export: Export
-          import: Import
-          imported: imported
+          nav_label: 管理器
+          title: 管理向导
+          export: 导出
+          import: 导入
+          imported: 已导入
           upload: Select wizards.json
-          destroy: Destroy
-          destroyed: destroyed
+          destroy: 销毁
+          destroyed: 已销毁的
         subscription:
           title: Subscriber Features
           authorize:
@@ -561,6 +564,12 @@ zh-TW:
             community:
               label: Support
               title: There is a Custom Wizard Community subscription active on this forum.
+        user:
+          label: Wizards
+          redirect:
+            label: Redirect
+            remove_label: Remove
+            remove_title: Remove wizard redirect
   wizard_js:
     group:
       select: "Select a group"
@@ -572,7 +581,7 @@ zh-TW:
         title: "Number and Street"
         desc: "e.g. 42 Wallaby Way"
       postalcode:
-        title: "Postal Code (Zip)"
+        title: "邮政编码 (Zip)"
         desc: "e.g. 2090"
       neighbourhood:
         title: "Neighbourhood"
@@ -580,18 +589,18 @@ zh-TW:
       city:
         title: "City, Town or Village"
         desc: "e.g. Sydney"
-      coordinates: "Coordinates"
+      coordinates: "坐标"
       lat:
-        title: "Latitude"
-        desc: "e.g. -31.9456702"
+        title: "纬度"
+        desc: "例如：-31.9456702"
       lon:
-        title: "Longitude"
-        desc: "e.g. 115.8626477"
+        title: "经度"
+        desc: "例如：-115.8626477"
       country_code:
-        title: "Country"
-        placeholder: "Select a Country"
+        title: "国家/地区"
+        placeholder: "选择国家/地区"
       query:
-        title: "Address"
+        title: "地址"
         desc: "e.g. 42 Wallaby Way, Sydney."
       geo:
         desc: "Locations provided by {{provider}}"
@@ -604,7 +613,7 @@ zh-TW:
         neighbourhood: "Please enter a neighbourhood."
         city: "Please enter a city, town or village."
         street: "Please enter a Number and Street."
-        postalcode: "Please enter a Postal Code (Zip)."
-        countrycode: "Please select a country."
-        coordinates: "Please complete the set of coordinates."
+        postalcode: "请输入邮政编码 (Zip)。"
+        countrycode: "请选择国家/地区。"
+        coordinates: "请完整填写坐标。"
         geo_location: "Search and select a result."