diff --git a/resources/lang/zh_CN/activities.php b/resources/lang/zh_CN/activities.php
index 6ef10b67f..7198710ef 100644
--- a/resources/lang/zh_CN/activities.php
+++ b/resources/lang/zh_CN/activities.php
@@ -36,6 +36,14 @@ return [
     'book_delete_notification'    => '图书已删除成功',
     'book_sort'                   => '排序了图书',
     'book_sort_notification'      => '图书已重新排序成功',
+    
+    // Bookshelves
+    'bookshelf_create'            => '创建了书架',
+    'bookshelf_create_notification'    => '书架已成功创建',
+    'bookshelf_update'                 => '更新了书架',
+    'bookshelf_update_notification'    => '书架已成功更新',
+    'bookshelf_delete'                 => '删除了书架',
+    'bookshelf_delete_notification'    => '书架已成功删除',
 
     // Other
     'commented_on'                => '评论',
diff --git a/resources/lang/zh_CN/common.php b/resources/lang/zh_CN/common.php
index a6efde672..cf914983e 100644
--- a/resources/lang/zh_CN/common.php
+++ b/resources/lang/zh_CN/common.php
@@ -15,7 +15,7 @@ return [
     /**
      * Form Labels
      */
-    'name' => '姓名',
+    'name' => '名称',
     'description' => '概要',
     'role' => '角色',
     'cover_image' => '封面图片',
@@ -25,12 +25,13 @@ return [
      * Actions
      */
     'actions' => '操作',
-    'view' => '视图',
+    'view' => '浏览',
     'create' => '创建',
     'update' => '更新',
     'edit' => '编辑',
     'sort' => '排序',
     'move' => '移动',
+   'copy' => '复制',
     'reply' => '回复',
     'delete' => '删除',
     'search' => '搜索',
@@ -49,7 +50,10 @@ return [
     'toggle_details' => '显示/隐藏详细信息',
     'toggle_thumbnails' => '显示/隐藏缩略图',
     'details' => '详细信息',
-
+    'grid_view' => '网格视图',
+    'list_view' => '列表视图',
+    'default' => '默认',
+	
     /**
      * Header
      */
diff --git a/resources/lang/zh_CN/components.php b/resources/lang/zh_CN/components.php
index 42857b9e7..e8cad3c30 100644
--- a/resources/lang/zh_CN/components.php
+++ b/resources/lang/zh_CN/components.php
@@ -22,6 +22,7 @@ return [
     'image_upload_success' => '图片上传成功',
     'image_update_success' => '图片详细信息更新成功',
     'image_delete_success' => '图片删除成功',
+    'image_upload_remove' => '去掉',
 
     /**
      * Code editor
@@ -30,4 +31,4 @@ return [
     'code_language' => '编程语言',
     'code_content' => '代码内容',
     'code_save' => '保存代码',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/zh_CN/entities.php b/resources/lang/zh_CN/entities.php
index 734a47a5a..64a205444 100644
--- a/resources/lang/zh_CN/entities.php
+++ b/resources/lang/zh_CN/entities.php
@@ -52,11 +52,13 @@ return [
     'search_content_type' => '种类',
     'search_exact_matches' => '精确匹配',
     'search_tags' => '标签搜索',
+    'search_options' => '选项',
     'search_viewed_by_me' => '我看过的',
     'search_not_viewed_by_me' => '我没看过的',
     'search_permissions_set' => '权限设置',
     'search_created_by_me' => '我创建的',
     'search_updated_by_me' => '我更新的',
+    'search_date_options' => '日期选项',
     'search_updated_before' => '在此之前更新',
     'search_updated_after' => '在此之后更新',
     'search_created_before' => '在此之前创建',
@@ -64,6 +66,38 @@ return [
     'search_set_date' => '设置日期',
     'search_update' => '只显示更新操作',
 
+    /**
+     * Shelves
+     */
+    'shelf' => '书架',
+    'shelves' => '书架',
+    'shelves_long' => '书架',
+    'shelves_empty' => '当前未创建书架',
+    'shelves_create' => '创建新书架',
+    'shelves_popular' => '热门书架',
+    'shelves_new' => '新书架',
+    'shelves_popular_empty' => '最热门的书架',
+    'shelves_new_empty' => '最新创建的书架',
+    'shelves_save' => '保存书架',
+    'shelves_books' => '书籍已在此书架里',
+    'shelves_add_books' => '将书籍加入此书架',
+    'shelves_drag_books' => '拖动图书将其添加到此书架',
+    'shelves_empty_contents' => '这个书架没有分配图书',
+    'shelves_edit_and_assign' => '编辑书架以分配图书',
+    'shelves_edit_named' => '编辑书架 :name',
+    'shelves_edit' => '编辑书架',
+    'shelves_delete' => '删除书架',
+    'shelves_delete_named' => '删除书架 :name',
+    'shelves_delete_explain' => "此操作将删除书架 ':name'。 其中包含的图书不会被删除。",
+    'shelves_delete_confirmation' => '您确定要删除此书架吗?',
+    'shelves_permissions' => '书架权限',
+    'shelves_permissions_updated' => '书架权限已更新',
+    'shelves_permissions_active' => '书架权限激活',
+    'shelves_copy_permissions_to_books' => '将权限复制到图书',
+    'shelves_copy_permissions' => '复制权限',
+    'shelves_copy_permissions_explain' => '这会将此书架的当前权限设置应用于其中包含的所有图书。 在激活之前,请确保已保存对此书架权限的任何更改。',
+    'shelves_copy_permission_success' => '书架权限复制到图书 :count ',
+
     /**
      * Books
      */
@@ -162,9 +196,13 @@ return [
     'pages_md_preview' => '预览',
     'pages_md_insert_image' => '插入图片',
     'pages_md_insert_link' => '插入实体链接',
+	'pages_md_insert_drawing' => '插入图表',
     'pages_not_in_chapter' => '本页面不在某章节中',
     'pages_move' => '移动页面',
     'pages_move_success' => '页面已移动到「:parentName」',
+	'pages_copy' => '复制页面',
+    'pages_copy_desination' => '复制目的地',
+    'pages_copy_success' => '页面复制完成',
     'pages_permissions' => '页面权限',
     'pages_permissions_success' => '页面权限已更新',
     'pages_revision' => '修订',
@@ -195,13 +233,17 @@ return [
         'message' => ':time,:start。注意不要覆盖对方的更新!',
     ],
     'pages_draft_discarded' => '草稿已丢弃,编辑器已更新到当前页面内容。',
+	'pages_specific' => '具体页面',
 
     /**
      * Editor sidebar
      */
     'page_tags' => '页面标签',
+	'chapter_tags' => '章节标签',
+	'book_tags' => '图书标签',
+    'shelf_tags' => '书架标签',
     'tag' => '标签',
-    'tags' =>  '',
+    'tags' =>  '标签',
     'tag_value' => '标签值 (Optional)',
     'tags_explain' => "添加一些标签以更好地对您的内容进行分类。\n您可以为标签分配一个值,以进行更深入的组织。",
     'tags_add' => '添加另一个标签',
@@ -245,6 +287,7 @@ return [
      */
     'comment' => '评论',
     'comments' => '评论',
+	'comment_add' => '添加评论',
     'comment_placeholder' => '在这里评论',
     'comment_count' => '{0} 无评论|[1,*] :count条评论',
     'comment_save' => '保存评论',
diff --git a/resources/lang/zh_CN/errors.php b/resources/lang/zh_CN/errors.php
index 1a5ee4fb6..ebc26d8a0 100644
--- a/resources/lang/zh_CN/errors.php
+++ b/resources/lang/zh_CN/errors.php
@@ -34,11 +34,14 @@ return [
     'path_not_writable' => '无法上传到文件路径“:filePath”,请确保它可写入服务器。',
     'cannot_get_image_from_url' => '无法从 :url 中获取图片',
     'cannot_create_thumbs' => '服务器无法创建缩略图,请检查您是否安装了GD PHP扩展。',
-    'server_upload_limit' => '上传图片时发生错误。',
+    'server_upload_limit' => '服务器不允许上传此大小的文件。 请尝试较小的文件。',
+	'uploaded'  => 'The server does not allow uploads of this size. Please try a smaller file size.',
     'image_upload_error' => '上传图片时发生错误',
+	'image_upload_type_error' => '上传的图像类型无效',
 
     // Attachments
     'attachment_page_mismatch' => '附件更新期间的页面不匹配',
+	'attachment_not_found' => '找不到附件',
 
     // Pages
     'page_draft_autosave_fail' => '无法保存草稿,确保您在保存页面之前已经连接到互联网',
@@ -46,6 +49,7 @@ return [
 
     // Entities
     'entity_not_found' => '未找到实体',
+	'bookshelf_not_found' => '未找到书架',
     'book_not_found' => '未找到图书',
     'page_not_found' => '未找到页面',
     'chapter_not_found' => '未找到章节',
@@ -76,4 +80,4 @@ return [
     'error_occurred' => '出现错误',
     'app_down' => ':appName现在正在关闭',
     'back_soon' => '请耐心等待网站的恢复。',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/zh_CN/settings.php b/resources/lang/zh_CN/settings.php
index 2195bf54d..a6e06d035 100755
--- a/resources/lang/zh_CN/settings.php
+++ b/resources/lang/zh_CN/settings.php
@@ -81,6 +81,7 @@ return [
     'role_details' => '角色详细信息',
     'role_name' => '角色名',
     'role_desc' => '角色简述',
+	'role_external_auth_id' => '外部身份认证ID',
     'role_system' => '系统权限',
     'role_manage_users' => '管理用户',
     'role_manage_roles' => '管理角色与角色权限',
@@ -89,6 +90,7 @@ return [
     'role_manage_settings' => '管理App设置',
     'role_asset' => '资源许可',
     'role_asset_desc' => '对系统内资源的默认访问许可将由这些权限控制。单独设置在书籍,章节和页面上的权限将覆盖这里的权限设定。',
+	'role_asset_admins' => '管理员可自动获得对所有内容的访问权限,但这些选项可能会显示或隐藏UI选项。',
     'role_all' => '全部的',
     'role_own' => '拥有的',
     'role_controlled_by_asset' => '由其所在的资源来控制',
@@ -109,7 +111,6 @@ return [
     'users_external_auth_id' => '外部身份认证ID',
     'users_password_warning' => '如果您想更改密码,请填写以下内容:',
     'users_system_public' => '此用户代表访问您的App的任何访客。它不能用于登录,而是自动分配。',
-    'users_books_view_type' => '图书浏览布局偏好',
     'users_delete' => '删除用户',
     'users_delete_named' => '删除用户 :userName',
     'users_delete_warning' => '这将从系统中完全删除名为 \':userName\' 的用户。',
@@ -127,4 +128,28 @@ return [
     'users_social_disconnect' => '解除绑定账户',
     'users_social_connected' => ':socialAccount 账户已经成功绑定到您的资料。',
     'users_social_disconnected' => ':socialAccount 账户已经成功解除绑定。',
+	
+    // Since these labels are already localized this array does not need to be
+    // translated in the language-specific files.
+    // DELETE BELOW IF COPIED FROM EN
+    ///////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'de' => 'Deutsch',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'fr' => 'Français',
+        'nl' => 'Nederlands',
+        'pt_BR' => 'Português do Brasil',
+        'sk' => 'Slovensky',
+        'sv' => 'Svenska',
+        'ja' => '日本語',
+        'pl' => 'Polski',
+        'it' => 'Italian',
+        'ru' => 'Русский',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文'
+    ]
+    ///////////////////////////////////
 ];